From 2b6d3753f75ca276bcaa32f950eb3bc63a9ec810 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Thu, 14 Aug 2025 21:45:02 -0700 Subject: [PATCH] index_tests: Test 22.0.0git Build llvm-project ``` ninja -C out/stable clang clangFormat clangIndex clangTooling ``` Then build ccls against the just-built llvm-project. ``` cmake -S. -Bout/debug -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=$HOME/Stable/bin/clang++ -DCMAKE_EXPORT_COMPILE_COMMANDS=On -DCMAKE_PREFIX_PATH="$HOME/llvm/out/stable;$HOME/llvm/out/stable/tools/clang" -DCLANG_EXECUTABLE=$HOME/Stable/bin/clang++ ``` Finally, run `ccls -test-index` --- index_tests/_empty_test.cc | 8 +- index_tests/class_forward_declaration.cc | 4 +- index_tests/constructors/constructor.cc | 7 +- index_tests/constructors/destructor.cc | 4 +- .../constructors/implicit_constructor.cc | 7 +- index_tests/constructors/invalid_reference.cc | 18 +- index_tests/constructors/make_functions.cc | 83 +++++- .../declaration_vs_definition/class.cc | 4 +- .../declaration_vs_definition/class_member.cc | 6 +- .../class_member_static.cc | 8 +- index_tests/declaration_vs_definition/func.cc | 2 +- .../func_associated_function_params.cc | 69 ++++- .../declaration_vs_definition/method.cc | 2 +- index_tests/enums/enum_class_decl.cc | 6 +- index_tests/enums/enum_decl.cc | 6 +- index_tests/enums/enum_inherit.cc | 12 +- index_tests/enums/enum_usage.cc | 4 +- index_tests/foobar.cc | 28 +- index_tests/function_declaration.cc | 46 +++- .../function_declaration_definition.cc | 2 +- index_tests/function_definition.cc | 2 +- index_tests/inheritance/class_inherit.cc | 4 +- .../class_inherit_templated_parent.cc | 88 ++++++- .../inheritance/class_multiple_inherit.cc | 8 +- index_tests/inheritance/function_override.cc | 6 +- .../inheritance/interface_pure_virtual.cc | 2 +- .../inheritance/multiple_base_functions.cc | 8 +- index_tests/lambdas/lambda.cc | 28 +- index_tests/macros/complex.cc | 10 +- index_tests/macros/foo.cc | 8 +- index_tests/method_declaration.cc | 2 +- index_tests/method_definition.cc | 2 +- index_tests/method_inline_declaration.cc | 2 +- index_tests/multi_file/funky_enum.cc | 8 +- index_tests/multi_file/impl.cc | 64 +++-- index_tests/multi_file/simple_impl.cc | 2 +- index_tests/multi_file/static.cc | 2 +- .../namespaces/function_declaration.cc | 44 +++- index_tests/namespaces/namespace_alias.cc | 12 +- index_tests/namespaces/namespace_reference.cc | 11 +- index_tests/objective-c/class.m | 247 ++++++++--------- index_tests/operators/operator.cc | 46 +++- .../outline/static_function_in_type.cc | 8 +- index_tests/preprocessor/skipped.cc | 2 +- .../func_specialized_template_param.cc | 22 +- .../implicit_variable_instantiation.cc | 52 +++- .../templates/member_ref_in_template.cc | 29 +- ...ass_template_func_usage_folded_into_one.cc | 40 ++- ...ace_template_type_usage_folded_into_one.cc | 18 +- index_tests/templates/specialization.cc | 249 ++++++++++++++---- .../templates/specialized_func_definition.cc | 37 ++- ...mplate_class_func_usage_folded_into_one.cc | 30 ++- ...ass_template_func_usage_folded_into_one.cc | 46 +++- ...mplate_class_type_usage_folded_into_one.cc | 30 ++- ...emplate_class_var_usage_folded_into_one.cc | 37 ++- .../template_func_usage_folded_into_one.cc | 28 +- .../template_type_usage_folded_into_one.cc | 24 +- .../template_var_usage_folded_into_one.cc | 21 +- index_tests/types/anonymous_struct.cc | 10 +- index_tests/types/typedefs.cc | 2 +- index_tests/unions/union_decl.cc | 10 +- index_tests/unions/union_usage.cc | 14 +- .../usage/func_called_from_constructor.cc | 4 +- .../usage/func_called_from_macro_argument.cc | 46 +++- .../usage/func_called_from_template.cc | 22 +- .../usage/func_called_implicit_ctor.cc | 38 ++- index_tests/usage/func_usage_addr_func.cc | 9 +- index_tests/usage/func_usage_addr_method.cc | 5 +- index_tests/usage/func_usage_call_func.cc | 4 +- index_tests/usage/func_usage_call_method.cc | 4 +- .../usage/func_usage_class_inline_var_def.cc | 8 +- .../usage/func_usage_forward_decl_func.cc | 2 +- .../usage/func_usage_forward_decl_method.cc | 4 +- index_tests/usage/func_usage_template_func.cc | 20 +- .../usage/type_usage_as_template_parameter.cc | 28 +- ...ype_usage_as_template_parameter_complex.cc | 53 +++- ...type_usage_as_template_parameter_simple.cc | 22 +- .../usage/type_usage_declare_extern.cc | 2 +- index_tests/usage/type_usage_declare_field.cc | 4 +- index_tests/usage/type_usage_declare_local.cc | 4 +- index_tests/usage/type_usage_declare_param.cc | 4 +- .../type_usage_declare_param_prototype.cc | 18 +- .../usage/type_usage_declare_param_unnamed.cc | 2 +- .../usage/type_usage_declare_qualifiers.cc | 18 +- .../usage/type_usage_declare_static.cc | 4 +- .../usage/type_usage_on_return_type.cc | 9 +- .../usage/type_usage_typedef_and_using.cc | 16 +- .../type_usage_typedef_and_using_template.cc | 24 +- index_tests/usage/type_usage_various.cc | 2 +- index_tests/usage/usage_inside_of_call.cc | 32 ++- .../usage/usage_inside_of_call_simple.cc | 46 +++- index_tests/usage/var_usage_call_function.cc | 10 +- index_tests/usage/var_usage_class_member.cc | 18 +- .../usage/var_usage_class_member_static.cc | 10 +- index_tests/usage/var_usage_cstyle_cast.cc | 35 +-- index_tests/usage/var_usage_extern.cc | 6 +- index_tests/usage/var_usage_func_parameter.cc | 8 +- index_tests/usage/var_usage_local.cc | 6 +- index_tests/usage/var_usage_shadowed_local.cc | 8 +- .../usage/var_usage_shadowed_parameter.cc | 8 +- index_tests/usage/var_usage_static.cc | 8 +- index_tests/vars/class_member.cc | 2 +- index_tests/vars/class_static_member.cc | 4 +- .../vars/class_static_member_decl_only.cc | 8 +- index_tests/vars/deduce_auto_type.cc | 4 +- index_tests/vars/function_local.cc | 2 +- index_tests/vars/function_param.cc | 2 +- index_tests/vars/function_param_unnamed.cc | 2 +- index_tests/vars/function_shadow_local.cc | 8 +- index_tests/vars/function_shadow_param.cc | 8 +- index_tests/vars/global_variable.cc | 6 +- index_tests/vars/global_variable_decl_only.cc | 4 +- .../vars/type_instance_on_using_type.cc | 6 +- src/test.cc | 16 +- 114 files changed, 1598 insertions(+), 686 deletions(-) diff --git a/index_tests/_empty_test.cc b/index_tests/_empty_test.cc index 228b2674..d1ae7a6c 100644 --- a/index_tests/_empty_test.cc +++ b/index_tests/_empty_test.cc @@ -1,4 +1,10 @@ /* OUTPUT: -{} +{ + "includes": [], + "skipped_ranges": [], + "usr2func": [], + "usr2type": [], + "usr2var": [] +} */ diff --git a/index_tests/class_forward_declaration.cc b/index_tests/class_forward_declaration.cc index 7c5e23a2..9bdca4cd 100644 --- a/index_tests/class_forward_declaration.cc +++ b/index_tests/class_forward_declaration.cc @@ -11,7 +11,7 @@ OUTPUT: "usr2func": [], "usr2type": [{ "usr": 15041163540773201510, - "detailed_name": "class Foo", + "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", "spell": "3:7-3:10|3:1-3:13|2|-1", @@ -21,7 +21,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": ["1:7-1:10|1:1-1:10|1|-1", "2:7-2:10|2:1-2:10|1|-1", "4:7-4:10|4:1-4:10|1|-1"], "derived": [], "instances": [], diff --git a/index_tests/constructors/constructor.cc b/index_tests/constructors/constructor.cc index 7901e0fb..59e55813 100644 --- a/index_tests/constructors/constructor.cc +++ b/index_tests/constructors/constructor.cc @@ -36,9 +36,8 @@ OUTPUT: "spell": "6:6-6:9|6:1-9:2|2|-1", "bases": [], "vars": [10983126130596230582, 17165811951126099095], - "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"], - "kind": 12, - "parent_kind": 0, + "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"], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -56,7 +55,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [10983126130596230582, 17165811951126099095], diff --git a/index_tests/constructors/destructor.cc b/index_tests/constructors/destructor.cc index c8ad82b7..090811c2 100644 --- a/index_tests/constructors/destructor.cc +++ b/index_tests/constructors/destructor.cc @@ -43,7 +43,7 @@ OUTPUT: "vars": [1893354193220338759], "callees": ["8:7-8:8|3385168158331140247|3|16676", "8:7-8:8|3385168158331140247|3|16676"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -76,7 +76,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [1893354193220338759], diff --git a/index_tests/constructors/implicit_constructor.cc b/index_tests/constructors/implicit_constructor.cc index 31c7c8ce..4269934d 100644 --- a/index_tests/constructors/implicit_constructor.cc +++ b/index_tests/constructors/implicit_constructor.cc @@ -20,9 +20,8 @@ OUTPUT: "spell": "5:6-5:10|5:1-8:2|2|-1", "bases": [], "vars": [449111627548814328, 17097499197730163115], - "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"], - "kind": 12, - "parent_kind": 0, + "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"], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -55,7 +54,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [449111627548814328, 17097499197730163115], diff --git a/index_tests/constructors/invalid_reference.cc b/index_tests/constructors/invalid_reference.cc index 3b960a16..2829fe6c 100644 --- a/index_tests/constructors/invalid_reference.cc +++ b/index_tests/constructors/invalid_reference.cc @@ -29,6 +29,22 @@ OUTPUT: "uses": [] }], "usr2type": [{ + "usr": 9174142900507230378, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["3:16-3:17|3:10-3:17|1|-1"], + "derived": [], + "instances": [], + "uses": [] + }, { "usr": 15041163540773201510, "detailed_name": "struct Foo {}", "qual_name_offset": 7, @@ -40,7 +56,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/constructors/make_functions.cc b/index_tests/constructors/make_functions.cc index 5bc5004b..539008b8 100644 --- a/index_tests/constructors/make_functions.cc +++ b/index_tests/constructors/make_functions.cc @@ -101,7 +101,7 @@ OUTPUT: make_functions.h "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -118,7 +118,7 @@ OUTPUT: make_functions.h "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -157,7 +157,7 @@ OUTPUT: make_functions.cc "vars": [3908732770590594660], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -170,9 +170,8 @@ OUTPUT: make_functions.cc "spell": "13:6-13:14|13:1-18:2|2|-1", "bases": [], "vars": [], - "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"], - "kind": 12, - "parent_kind": 0, + "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"], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -215,14 +214,14 @@ OUTPUT: make_functions.cc "vars": [8463700030555379526], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": ["14:3-14:13|16420|-1", "15:3-15:13|16420|-1", "16:3-16:13|16420|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -238,7 +237,7 @@ OUTPUT: make_functions.cc "instances": [180270746871803062], "uses": [] }, { - "usr": 87, + "usr": 488, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -253,6 +252,70 @@ OUTPUT: make_functions.cc "derived": [], "instances": [180270746871803062], "uses": [] + }, { + "usr": 3337128087216004141, + "detailed_name": "Args", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["8:35-8:39|8:23-8:39|1|-1"], + "derived": [], + "instances": [], + "uses": ["9:16-9:20|4|-1"] + }, { + "usr": 9281343527065946499, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["3:20-3:21|3:11-3:21|1|-1"], + "derived": [], + "instances": [], + "uses": ["4:1-4:2|4|-1"] + }, { + "usr": 10771590811355716928, + "detailed_name": "Args", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["3:35-3:39|3:23-3:39|1|-1"], + "derived": [], + "instances": [], + "uses": ["4:15-4:19|4|-1"] + }, { + "usr": 11897454629873246477, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["8:20-8:21|8:11-8:21|1|-1"], + "derived": [], + "instances": [], + "uses": ["9:1-9:2|4|-1"] }, { "usr": 12993848456528750350, "detailed_name": "struct Bar {}", @@ -292,7 +355,7 @@ OUTPUT: make_functions.cc "qual_name_offset": 4, "short_name": "args", "spell": "9:24-9:28|9:16-9:28|1026|-1", - "type": 87, + "type": 488, "kind": 253, "parent_kind": 12, "storage": 0, diff --git a/index_tests/declaration_vs_definition/class.cc b/index_tests/declaration_vs_definition/class.cc index ee90a78b..af0ade31 100644 --- a/index_tests/declaration_vs_definition/class.cc +++ b/index_tests/declaration_vs_definition/class.cc @@ -13,7 +13,7 @@ OUTPUT: "usr2func": [], "usr2type": [{ "usr": 15041163540773201510, - "detailed_name": "class Foo", + "detailed_name": "class Foo {}", "qual_name_offset": 6, "short_name": "Foo", "spell": "3:7-3:10|3:1-3:13|2|-1", @@ -23,7 +23,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": ["1:7-1:10|1:1-1:10|1|-1", "2:7-2:10|2:1-2:10|1|-1", "4:7-4:10|4:1-4:10|1|-1"], "derived": [], "instances": [], diff --git a/index_tests/declaration_vs_definition/class_member.cc b/index_tests/declaration_vs_definition/class_member.cc index 0099e070..86713b5f 100644 --- a/index_tests/declaration_vs_definition/class_member.cc +++ b/index_tests/declaration_vs_definition/class_member.cc @@ -9,7 +9,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -39,7 +39,7 @@ OUTPUT: }], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -51,7 +51,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "foo", "spell": "2:7-2:10|2:3-2:10|1026|-1", - "type": 53, + "type": 452, "kind": 8, "parent_kind": 5, "storage": 0, diff --git a/index_tests/declaration_vs_definition/class_member_static.cc b/index_tests/declaration_vs_definition/class_member_static.cc index 6e7951e9..266967c9 100644 --- a/index_tests/declaration_vs_definition/class_member_static.cc +++ b/index_tests/declaration_vs_definition/class_member_static.cc @@ -11,7 +11,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -38,7 +38,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -50,8 +50,8 @@ OUTPUT: "qual_name_offset": 11, "short_name": "foo", "spell": "5:10-5:13|5:1-5:13|1026|-1", - "type": 53, - "kind": 13, + "type": 452, + "kind": 8, "parent_kind": 5, "storage": 2, "declarations": ["2:14-2:17|2:3-2:17|1025|-1"], diff --git a/index_tests/declaration_vs_definition/func.cc b/index_tests/declaration_vs_definition/func.cc index f1ad3749..576a4aa6 100644 --- a/index_tests/declaration_vs_definition/func.cc +++ b/index_tests/declaration_vs_definition/func.cc @@ -19,7 +19,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": ["1:6-1:9|1:1-1:11|1|-1", "2:6-2:9|2:1-2:11|1|-1", "4:6-4:9|4:1-4:11|1|-1"], "derived": [], diff --git a/index_tests/declaration_vs_definition/func_associated_function_params.cc b/index_tests/declaration_vs_definition/func_associated_function_params.cc index fbf17f3a..fcb36fd7 100644 --- a/index_tests/declaration_vs_definition/func_associated_function_params.cc +++ b/index_tests/declaration_vs_definition/func_associated_function_params.cc @@ -16,17 +16,12 @@ OUTPUT: "short_name": "foo", "spell": "5:5-5:8|5:1-5:36|2|-1", "bases": [], - "vars": [14555488990109936920, 10963664335057337329], - "callees": [], - "kind": 12, - "parent_kind": 0, - "storage": 0, - "declarations": ["1:5-1:8|1:1-1:18|1|-1", "2:5-2:8|2:1-3:16|1|-1", "4:5-4:8|4:1-4:26|1|-1"], - "derived": [], - "uses": [] + "vars": [7892962471424670909, 17130001153697799035, 16879535361702603834, 10198518325066875844, +14555488990109936920, 10963664335057337329], "callees": [], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": +["1:5-1:8|1:1-1:18|1|-1", "2:5-2:8|2:1-3:16|1|-1", "4:5-4:8|4:1-4:26|1|-1"], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -39,16 +34,40 @@ OUTPUT: "parent_kind": 0, "declarations": [], "derived": [], - "instances": [14555488990109936920, 10963664335057337329], - "uses": [] + "instances": [7892962471424670909, 17130001153697799035, 16879535361702603834, 10198518325066875844, +14555488990109936920, 10963664335057337329], "uses": [] }], "usr2var": [{ + "usr": 7892962471424670909, + "detailed_name": "int aa", + "qual_name_offset": 4, + "short_name": "aa", + "spell": "2:13-2:15|2:9-2:15|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { + "usr": 10198518325066875844, + "detailed_name": "int bbb", + "qual_name_offset": 4, + "short_name": "bbb", + "spell": "4:22-4:25|4:18-4:25|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { "usr": 10963664335057337329, "detailed_name": "int b", "qual_name_offset": 4, "short_name": "b", "spell": "5:20-5:21|5:16-5:21|1026|-1", - "type": 53, + "type": 452, "kind": 253, "parent_kind": 12, "storage": 0, @@ -60,7 +79,31 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "5:13-5:14|5:9-5:14|1026|-1", - "type": 53, + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { + "usr": 16879535361702603834, + "detailed_name": "int aaa", + "qual_name_offset": 4, + "short_name": "aaa", + "spell": "4:13-4:16|4:9-4:16|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { + "usr": 17130001153697799035, + "detailed_name": "int bb", + "qual_name_offset": 4, + "short_name": "bb", + "spell": "3:13-3:15|3:9-3:15|1026|-1", + "type": 452, "kind": 253, "parent_kind": 12, "storage": 0, diff --git a/index_tests/declaration_vs_definition/method.cc b/index_tests/declaration_vs_definition/method.cc index ef280fdb..4830c824 100644 --- a/index_tests/declaration_vs_definition/method.cc +++ b/index_tests/declaration_vs_definition/method.cc @@ -67,7 +67,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/enums/enum_class_decl.cc b/index_tests/enums/enum_class_decl.cc index f1b8c10d..e8a823be 100644 --- a/index_tests/enums/enum_class_decl.cc +++ b/index_tests/enums/enum_class_decl.cc @@ -22,11 +22,11 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], - "uses": [] + "uses": ["2:18-2:25|4|-1"] }, { "usr": 16985894625255407295, "detailed_name": "enum class Foo : uint8_t {}", @@ -45,7 +45,7 @@ OUTPUT: }], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/enums/enum_decl.cc b/index_tests/enums/enum_decl.cc index fd84c0b6..b6ba7806 100644 --- a/index_tests/enums/enum_decl.cc +++ b/index_tests/enums/enum_decl.cc @@ -21,7 +21,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -36,7 +36,7 @@ OUTPUT: "spell": "2:3-2:4|2:3-2:4|1026|-1", "type": 16985894625255407295, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -48,7 +48,7 @@ OUTPUT: "spell": "3:3-3:4|3:3-3:9|1026|-1", "type": 16985894625255407295, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/enums/enum_inherit.cc b/index_tests/enums/enum_inherit.cc index 9459dcfe..67e07642 100644 --- a/index_tests/enums/enum_inherit.cc +++ b/index_tests/enums/enum_inherit.cc @@ -34,7 +34,7 @@ OUTPUT: }], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -51,11 +51,11 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], - "uses": [] + "uses": ["8:16-8:23|4|-1"] }, { "usr": 16985894625255407295, "detailed_name": "enum Foo : int {}", @@ -68,7 +68,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -83,7 +83,7 @@ OUTPUT: "spell": "2:3-2:4|2:3-2:4|1026|-1", "type": 16985894625255407295, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -95,7 +95,7 @@ OUTPUT: "spell": "3:3-3:4|3:3-3:9|1026|-1", "type": 16985894625255407295, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/enums/enum_usage.cc b/index_tests/enums/enum_usage.cc index c3a9a641..fe90e02b 100644 --- a/index_tests/enums/enum_usage.cc +++ b/index_tests/enums/enum_usage.cc @@ -29,7 +29,7 @@ OUTPUT: }], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [10677751717622394455], @@ -57,7 +57,7 @@ OUTPUT: "spell": "6:5-6:6|6:1-6:15|2|-1", "type": 16985894625255407295, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/foobar.cc b/index_tests/foobar.cc index 6337f1ef..4e270680 100644 --- a/index_tests/foobar.cc +++ b/index_tests/foobar.cc @@ -26,7 +26,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -39,11 +39,11 @@ OUTPUT: "spell": "5:8-5:11|5:1-7:2|2|-1", "bases": [], "funcs": [], - "types": [13938528237873543349], + "types": [14891869080606636243, 13938528237873543349], "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [12028309045033782423], @@ -60,7 +60,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -82,6 +82,22 @@ OUTPUT: "derived": [], "instances": [16721564935990383768], "uses": ["9:9-9:14|4|-1"] + }, { + "usr": 14891869080606636243, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["4:19-4:20|4:10-4:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }], "usr2var": [{ "usr": 12028309045033782423, @@ -91,7 +107,7 @@ OUTPUT: "spell": "10:8-10:9|10:1-10:9|2|-1", "type": 10528472276654770367, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -103,7 +119,7 @@ OUTPUT: "spell": "9:15-9:16|9:1-9:16|2|-1", "type": 13938528237873543349, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/function_declaration.cc b/index_tests/function_declaration.cc index 49225d2f..9635bb9e 100644 --- a/index_tests/function_declaration.cc +++ b/index_tests/function_declaration.cc @@ -11,7 +11,7 @@ OUTPUT: "qual_name_offset": 5, "short_name": "foo", "bases": [], - "vars": [], + "vars": [8158338140950637730, 17005964293310927058], "callees": [], "kind": 12, "parent_kind": 0, @@ -20,7 +20,47 @@ OUTPUT: "derived": [], "uses": [] }], - "usr2type": [], - "usr2var": [] + "usr2type": [{ + "usr": 452, + "detailed_name": "", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [8158338140950637730, 17005964293310927058], + "uses": [] + }], + "usr2var": [{ + "usr": 8158338140950637730, + "detailed_name": "int a", + "qual_name_offset": 4, + "short_name": "a", + "spell": "1:14-1:15|1:10-1:15|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { + "usr": 17005964293310927058, + "detailed_name": "int b", + "qual_name_offset": 4, + "short_name": "b", + "spell": "1:21-1:22|1:17-1:22|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }] } */ diff --git a/index_tests/function_declaration_definition.cc b/index_tests/function_declaration_definition.cc index 5350dbc2..31df9cfb 100644 --- a/index_tests/function_declaration_definition.cc +++ b/index_tests/function_declaration_definition.cc @@ -17,7 +17,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": ["1:6-1:9|1:1-1:11|1|-1"], "derived": [], diff --git a/index_tests/function_definition.cc b/index_tests/function_definition.cc index 2176a658..b8a134d4 100644 --- a/index_tests/function_definition.cc +++ b/index_tests/function_definition.cc @@ -15,7 +15,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/inheritance/class_inherit.cc b/index_tests/inheritance/class_inherit.cc index 791d9865..42d8134c 100644 --- a/index_tests/inheritance/class_inherit.cc +++ b/index_tests/inheritance/class_inherit.cc @@ -19,7 +19,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [10963370434658308541], "instances": [], @@ -36,7 +36,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/inheritance/class_inherit_templated_parent.cc b/index_tests/inheritance/class_inherit_templated_parent.cc index 4e3f5bde..8c6a7889 100644 --- a/index_tests/inheritance/class_inherit_templated_parent.cc +++ b/index_tests/inheritance/class_inherit_templated_parent.cc @@ -19,6 +19,22 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ + "usr": 444, + "detailed_name": "", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [2713508113307684499, 12990052348105569112], + "uses": [] + }, { "usr": 5863733211528032190, "detailed_name": "class Derived1 : Base1 {}", "qual_name_offset": 6, @@ -30,11 +46,27 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [10963370434658308541], "instances": [], "uses": ["13:43-13:51|2052|-1"] + }, { + "usr": 7916588271848318236, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["10:19-10:20|10:10-10:20|1025|-1"], + "derived": [], + "instances": [], + "uses": ["11:24-11:25|4|-1"] }, { "usr": 10651399730831737929, "detailed_name": "class Derived2 : Base2 {}", @@ -43,11 +75,11 @@ OUTPUT: "spell": "11:7-11:15|11:1-11:29|2|-1", "bases": [11118288764693061434], "funcs": [], - "types": [], + "types": [7916588271848318236], "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [10963370434658308541], "instances": [], @@ -64,11 +96,11 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], - "uses": ["13:33-13:40|2052|-1", "13:65-13:72|2052|-1"] + "uses": ["13:33-13:40|4|-1", "13:65-13:72|4|-1"] }, { "usr": 11118288764693061434, "detailed_name": "class Base2 {}", @@ -77,11 +109,11 @@ OUTPUT: "spell": "5:7-5:12|5:1-5:15|2|-1", "bases": [], "funcs": [], - "types": [], + "types": [11972372958367790157], "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [10651399730831737929, 10963370434658308541], "instances": [], @@ -98,12 +130,50 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [5863733211528032190, 10963370434658308541], "instances": [], "uses": ["8:18-8:23|2052|-1", "13:17-13:22|2052|-1"] + }, { + "usr": 11972372958367790157, + "detailed_name": "C", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["4:19-4:20|4:10-4:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }], - "usr2var": [] + "usr2var": [{ + "usr": 2713508113307684499, + "detailed_name": "unsigned int Base1::C", + "qual_name_offset": 13, + "short_name": "C", + "type": 444, + "kind": 253, + "parent_kind": 5, + "storage": 0, + "declarations": ["1:23-1:24|1:10-1:24|1025|-1"], + "uses": [] + }, { + "usr": 12990052348105569112, + "detailed_name": "unsigned int Derived1::T", + "qual_name_offset": 13, + "short_name": "T", + "type": 444, + "kind": 253, + "parent_kind": 5, + "storage": 0, + "declarations": ["7:23-7:24|7:10-7:24|1025|-1"], + "uses": ["8:24-8:25|4|-1"] + }] } */ diff --git a/index_tests/inheritance/class_multiple_inherit.cc b/index_tests/inheritance/class_multiple_inherit.cc index 49b09501..bfbbb3c8 100644 --- a/index_tests/inheritance/class_multiple_inherit.cc +++ b/index_tests/inheritance/class_multiple_inherit.cc @@ -21,7 +21,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [11863524815063131483, 14022569716337624303], "instances": [], @@ -38,7 +38,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -55,7 +55,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [10963370434658308541], "instances": [], @@ -72,7 +72,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [10963370434658308541], "instances": [], diff --git a/index_tests/inheritance/function_override.cc b/index_tests/inheritance/function_override.cc index 319b4394..0fd252d9 100644 --- a/index_tests/inheritance/function_override.cc +++ b/index_tests/inheritance/function_override.cc @@ -12,7 +12,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [{ "usr": 6666242542855173890, - "detailed_name": "void Derived::foo()", + "detailed_name": "void Derived::foo() override", "qual_name_offset": 5, "short_name": "foo", "spell": "5:8-5:11|5:3-5:25|5186|-1", @@ -52,7 +52,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [10963370434658308541], "instances": [], @@ -69,7 +69,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/inheritance/interface_pure_virtual.cc b/index_tests/inheritance/interface_pure_virtual.cc index fcf9841f..6cc98668 100644 --- a/index_tests/inheritance/interface_pure_virtual.cc +++ b/index_tests/inheritance/interface_pure_virtual.cc @@ -34,7 +34,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/inheritance/multiple_base_functions.cc b/index_tests/inheritance/multiple_base_functions.cc index f4ef3c4a..524b1fa8 100644 --- a/index_tests/inheritance/multiple_base_functions.cc +++ b/index_tests/inheritance/multiple_base_functions.cc @@ -30,7 +30,7 @@ OUTPUT: "uses": [] }, { "usr": 13164726294460837993, - "detailed_name": "Derived::~Derived() noexcept", + "detailed_name": "Derived::~Derived() noexcept override", "qual_name_offset": 0, "short_name": "~Derived", "spell": "8:3-8:11|8:3-8:26|5186|-1", @@ -71,7 +71,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -88,7 +88,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [10963370434658308541], "instances": [], @@ -105,7 +105,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [10963370434658308541], "instances": [], diff --git a/index_tests/lambdas/lambda.cc b/index_tests/lambdas/lambda.cc index 059d148b..ebb786c8 100644 --- a/index_tests/lambdas/lambda.cc +++ b/index_tests/lambdas/lambda.cc @@ -24,20 +24,16 @@ OUTPUT: "spell": "1:6-1:9|1:1-12:2|2|-1", "bases": [], "vars": [12666114896600231317, 2981279427664991319], - "callees": ["9:14-9:15|17926497908620168464|3|16420", "10:14-10:15|17926497908620168464|3|16420", "11:14-11:15|17926497908620168464|3|16420"], - "kind": 12, - "parent_kind": 0, - "storage": 0, - "declarations": [], - "derived": [], - "uses": [] + "callees": ["9:14-9:15|17926497908620168464|3|16420", "10:14-10:15|17926497908620168464|3|16420", +"11:14-11:15|17926497908620168464|3|16420"], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": [], "derived": +[], "uses": [] }, { "usr": 17926497908620168464, - "detailed_name": "inline void foo()::(anon class)::operator()(int y) const", - "qual_name_offset": 12, + "detailed_name": "inline constexpr void foo()::(anon class)::operator()(int y) const", + "qual_name_offset": 22, "short_name": "operator()", "bases": [], - "vars": [], + "vars": [12879188959314906706, 12879188959314906706], "callees": [], "kind": 6, "parent_kind": 0, @@ -47,7 +43,7 @@ OUTPUT: "uses": ["9:14-9:15|16420|-1", "10:14-10:15|16420|-1", "11:14-11:15|16420|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -60,7 +56,7 @@ OUTPUT: "parent_kind": 0, "declarations": [], "derived": [], - "instances": [12666114896600231317], + "instances": [12666114896600231317, 12879188959314906706, 12879188959314906706], "uses": [] }, { "usr": 14635009347499519042, @@ -84,7 +80,7 @@ OUTPUT: "detailed_name": "(lambda) dosomething", "qual_name_offset": 9, "short_name": "dosomething", - "hover": "(lambda) dosomething", + "hover": "(lambda) dosomething = [&x](int y) {\n ++x;\n ++y;\n }", "spell": "4:8-4:19|4:3-7:4|2|-1", "type": 14635009347499519042, "kind": 13, @@ -98,7 +94,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "x", "spell": "2:7-2:8|2:3-2:8|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, @@ -109,8 +105,8 @@ OUTPUT: "detailed_name": "int y", "qual_name_offset": 4, "short_name": "y", - "spell": "4:31-4:32|4:27-4:32|2|-1", - "type": 0, + "spell": "4:31-4:32|4:27-4:32|1026|-1", + "type": 452, "kind": 253, "parent_kind": 6, "storage": 0, diff --git a/index_tests/macros/complex.cc b/index_tests/macros/complex.cc index 55ac9624..194bb29d 100644 --- a/index_tests/macros/complex.cc +++ b/index_tests/macros/complex.cc @@ -26,7 +26,7 @@ OUTPUT: "vars": [], "callees": ["12:5-12:10|14400399977994209582|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": ["12:1-12:20|12:1-12:4|1|-1"], "derived": [], @@ -41,14 +41,14 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": ["12:5-12:10|16420|-1", "12:5-12:10|64|0"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -71,9 +71,9 @@ OUTPUT: "short_name": "make2", "hover": "const int make2 = 5", "spell": "9:11-9:16|9:1-9:20|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": ["12:14-12:19|12|-1", "12:14-12:19|64|0"] diff --git a/index_tests/macros/foo.cc b/index_tests/macros/foo.cc index a7507831..bc64470a 100644 --- a/index_tests/macros/foo.cc +++ b/index_tests/macros/foo.cc @@ -29,7 +29,7 @@ OUTPUT: "uses": ["5:12-5:15|64|0"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -56,7 +56,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -95,9 +95,9 @@ OUTPUT: "short_name": "x", "hover": "int x = A", "spell": "8:5-8:6|8:1-8:10|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/method_declaration.cc b/index_tests/method_declaration.cc index c777fa49..3c93542a 100644 --- a/index_tests/method_declaration.cc +++ b/index_tests/method_declaration.cc @@ -38,7 +38,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/method_definition.cc b/index_tests/method_definition.cc index 94ff8e56..f0dc2d6b 100644 --- a/index_tests/method_definition.cc +++ b/index_tests/method_definition.cc @@ -37,7 +37,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/method_inline_declaration.cc b/index_tests/method_inline_declaration.cc index 774bac0c..cedb46b9 100644 --- a/index_tests/method_inline_declaration.cc +++ b/index_tests/method_inline_declaration.cc @@ -35,7 +35,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/multi_file/funky_enum.cc b/index_tests/multi_file/funky_enum.cc index b30c456d..490de946 100644 --- a/index_tests/multi_file/funky_enum.cc +++ b/index_tests/multi_file/funky_enum.cc @@ -22,7 +22,7 @@ OUTPUT: funky_enum.h "spell": "4:1-4:2|4:1-4:2|1026|-1", "type": 16985894625255407295, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -36,7 +36,7 @@ OUTPUT: funky_enum.h "spell": "6:1-6:2|6:1-6:2|1026|-1", "type": 16985894625255407295, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -50,7 +50,7 @@ OUTPUT: funky_enum.h "spell": "5:1-5:2|5:1-5:2|1026|-1", "type": 16985894625255407295, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -76,7 +76,7 @@ OUTPUT: funky_enum.cc "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/multi_file/impl.cc b/index_tests/multi_file/impl.cc index 9e6e477a..36e7801c 100644 --- a/index_tests/multi_file/impl.cc +++ b/index_tests/multi_file/impl.cc @@ -19,14 +19,14 @@ OUTPUT: header.h "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -49,11 +49,11 @@ OUTPUT: header.h "spell": "13:8-13:12|13:1-13:15|2|-1", "bases": [], "funcs": [], - "types": [], + "types": [873975420211778410], "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -70,11 +70,27 @@ OUTPUT: header.h "vars": [], "alias_of": 16750616846959666305, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], "uses": [] + }, { + "usr": 873975420211778410, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["12:20-12:21|12:11-12:21|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 4481210672785600703, "detailed_name": "enum Foo3 {}", @@ -87,7 +103,7 @@ OUTPUT: header.h "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -104,11 +120,27 @@ OUTPUT: header.h "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [16750616846959666305], "instances": [], "uses": ["5:26-5:30|2052|-1"] + }, { + "usr": 11499613911650781751, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["9:20-9:21|9:11-9:21|1|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 16750616846959666305, "detailed_name": "struct SameFileDerived : Base {}", @@ -121,7 +153,7 @@ OUTPUT: header.h "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -133,9 +165,9 @@ OUTPUT: header.h "qual_name_offset": 4, "short_name": "Foo4", "spell": "17:5-17:9|17:1-17:9|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -148,7 +180,7 @@ OUTPUT: header.h "spell": "15:13-15:14|15:13-15:14|1026|-1", "type": 4481210672785600703, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -161,7 +193,7 @@ OUTPUT: header.h "spell": "15:19-15:20|15:19-15:20|1026|-1", "type": 4481210672785600703, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -171,9 +203,9 @@ OUTPUT: header.h "qual_name_offset": 11, "short_name": "Foo5", "spell": "18:12-18:16|18:1-18:16|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 2, "declarations": [], "uses": [] @@ -186,7 +218,7 @@ OUTPUT: header.h "spell": "15:16-15:17|15:16-15:17|1026|-1", "type": 4481210672785600703, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -209,7 +241,7 @@ OUTPUT: impl.cc "vars": [], "callees": ["4:3-4:7|11650481237659640387|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/multi_file/simple_impl.cc b/index_tests/multi_file/simple_impl.cc index e97af237..ec6b3d2d 100644 --- a/index_tests/multi_file/simple_impl.cc +++ b/index_tests/multi_file/simple_impl.cc @@ -44,7 +44,7 @@ OUTPUT: simple_impl.cc "vars": [], "callees": ["4:3-4:9|16236105532929924676|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/multi_file/static.cc b/index_tests/multi_file/static.cc index d344cb7e..7aba2fa6 100644 --- a/index_tests/multi_file/static.cc +++ b/index_tests/multi_file/static.cc @@ -34,7 +34,7 @@ OUTPUT: static.h "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/namespaces/function_declaration.cc b/index_tests/namespaces/function_declaration.cc index fd16717e..8ec3977f 100644 --- a/index_tests/namespaces/function_declaration.cc +++ b/index_tests/namespaces/function_declaration.cc @@ -13,7 +13,7 @@ OUTPUT: "qual_name_offset": 5, "short_name": "foo", "bases": [], - "vars": [], + "vars": [11261617957951052010, 6927976078246688450], "callees": [], "kind": 12, "parent_kind": 0, @@ -23,6 +23,22 @@ OUTPUT: "uses": [] }], "usr2type": [{ + "usr": 452, + "detailed_name": "", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [11261617957951052010, 6927976078246688450], + "uses": [] + }, { "usr": 2029211996748007610, "detailed_name": "namespace hello {}", "qual_name_offset": 10, @@ -39,6 +55,30 @@ OUTPUT: "instances": [], "uses": [] }], - "usr2var": [] + "usr2var": [{ + "usr": 6927976078246688450, + "detailed_name": "int b", + "qual_name_offset": 4, + "short_name": "b", + "spell": "2:21-2:22|2:17-2:22|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { + "usr": 11261617957951052010, + "detailed_name": "int a", + "qual_name_offset": 4, + "short_name": "a", + "spell": "2:14-2:15|2:10-2:15|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }] } */ diff --git a/index_tests/namespaces/namespace_alias.cc b/index_tests/namespaces/namespace_alias.cc index f74a7c79..2ccf4122 100644 --- a/index_tests/namespaces/namespace_alias.cc +++ b/index_tests/namespaces/namespace_alias.cc @@ -28,14 +28,14 @@ OUTPUT: "vars": [6030927277961448585, 7657277353101371136], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -76,7 +76,7 @@ OUTPUT: "types": [], "vars": [], "alias_of": 14450849931009540802, - "kind": 252, + "kind": 3, "parent_kind": 0, "declarations": ["9:11-9:14|9:1-9:30|1|-1"], "derived": [], @@ -125,7 +125,7 @@ OUTPUT: "short_name": "a", "hover": "int a = foo::bar::baz::qux", "spell": "12:7-12:8|12:3-12:29|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, @@ -138,7 +138,7 @@ OUTPUT: "short_name": "b", "hover": "int b = fbz::qux", "spell": "13:7-13:8|13:3-13:19|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, @@ -151,7 +151,7 @@ OUTPUT: "short_name": "qux", "hover": "int foo::bar::baz::qux = 42", "spell": "4:18-4:21|4:14-4:26|1026|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 3, "storage": 0, diff --git a/index_tests/namespaces/namespace_reference.cc b/index_tests/namespaces/namespace_reference.cc index f90fd4b0..c675cdab 100644 --- a/index_tests/namespaces/namespace_reference.cc +++ b/index_tests/namespaces/namespace_reference.cc @@ -24,7 +24,7 @@ OUTPUT: "vars": [], "callees": ["7:7-7:13|17328473273923617489|3|16420", "9:3-9:9|17328473273923617489|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -46,7 +46,7 @@ OUTPUT: "uses": ["7:7-7:13|16420|-1", "9:3-9:9|16420|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -87,7 +87,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "3:19-3:20|3:15-3:20|1026|-1", - "type": 53, + "type": 452, "kind": 253, "parent_kind": 12, "storage": 0, @@ -99,7 +99,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "Foo", "spell": "2:7-2:10|2:3-2:10|1026|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 3, "storage": 0, @@ -108,6 +108,3 @@ OUTPUT: }] } */ - - - diff --git a/index_tests/objective-c/class.m b/index_tests/objective-c/class.m index 4736cade..85af4f22 100644 --- a/index_tests/objective-c/class.m +++ b/index_tests/objective-c/class.m @@ -20,165 +20,128 @@ int main(void) OUTPUT: { "includes": [], - "skipped_by_preprocessor": [], - "types": [{ - "id": 0, - "usr": 11832280568361305387, - "detailed_name": "AClass", - "short_name": "AClass", - "kind": 7, - "spell": "7:17-7:23|-1|1|2", - "extent": "7:1-10:2|-1|1|0", - "parents": [], - "derived": [], - "types": [], - "funcs": [], - "vars": [], - "instances": [2], - "uses": ["14:3-14:9|-1|1|4", "14:23-14:29|-1|1|4"] - }, { - "id": 1, - "usr": 17, - "detailed_name": "", - "short_name": "", - "kind": 0, - "parents": [], - "derived": [], - "types": [], - "funcs": [], - "vars": [], - "instances": [0, 1], - "uses": [] - }], - "funcs": [{ - "id": 0, - "usr": 12775970426728664910, - "detailed_name": "AClass::test", - "short_name": "test", - "kind": 17, - "storage": 0, - "declarations": [{ - "spelling": "2:11-2:15", - "extent": "2:3-2:16", - "content": "+ (void)test;", - "param_spellings": [] - }], - "spell": "8:9-8:13|-1|1|2", - "extent": "8:1-8:16|-1|1|0", - "base": [], - "derived": [], - "locals": [], - "uses": [], - "callees": [] - }, { - "id": 1, + "skipped_ranges": [], + "usr2func": [{ "usr": 4096877434426330804, - "detailed_name": "AClass::anInstanceMethod", + "detailed_name": "- (void)AClass::anInstanceMethod;", + "qual_name_offset": 2, "short_name": "anInstanceMethod", - "kind": 16, + "spell": "9:9-9:25|9:1-9:28|1090|-1", + "bases": [], + "vars": [], + "callees": [], + "kind": 6, + "parent_kind": 11, "storage": 0, - "declarations": [{ - "spelling": "3:11-3:27", - "extent": "3:3-3:28", - "content": "- (void)anInstanceMethod;", - "param_spellings": [] - }], - "spell": "9:9-9:25|-1|1|2", - "extent": "9:1-9:28|-1|1|0", - "base": [], + "declarations": ["3:11-3:27|3:3-3:28|1089|-1"], "derived": [], - "locals": [], - "uses": ["15:13-15:29|4|3|64"], - "callees": [] + "uses": ["15:13-15:29|24676|-1"] }, { - "id": 2, - "usr": 12774569141855220778, - "detailed_name": "AClass::aProp", - "short_name": "aProp", - "kind": 16, - "storage": 0, - "declarations": [{ - "spelling": "0:0-0:0", - "extent": "4:29-4:34", - "content": "aProp", - "param_spellings": [] - }], - "extent": "4:29-4:34|-1|1|0", - "base": [], - "derived": [], - "locals": [], - "uses": [], - "callees": [] - }, { - "id": 3, - "usr": 17992064398538597892, - "detailed_name": "AClass::setAProp:", - "short_name": "setAProp:", - "kind": 16, - "storage": 0, - "declarations": [{ - "spelling": "0:0-0:0", - "extent": "4:29-4:34", - "content": "aProp", - "param_spellings": ["4:29-4:34"] - }], - "extent": "4:29-4:34|-1|1|0", - "base": [], - "derived": [], - "locals": [], - "uses": ["0:0-0:0|4|3|64"], - "callees": [] - }, { - "id": 4, - "usr": 7033269674615638282, - "detailed_name": "int main()", + "usr": 7924728095432766067, + "detailed_name": "int main(void)", + "qual_name_offset": 4, "short_name": "main", + "spell": "12:5-12:9|12:1-17:2|2|-1", + "bases": [], + "vars": [11068172662702654556], + "callees": ["15:13-15:29|4096877434426330804|3|24676", "16:12-16:17|17992064398538597892|3|24932"], "kind": 12, - "storage": 1, + "parent_kind": 1, + "storage": 0, "declarations": [], - "spell": "12:5-12:9|-1|1|2", - "extent": "12:1-17:2|-1|1|0", - "base": [], "derived": [], - "locals": [], - "uses": [], - "callees": ["15:13-15:29|1|3|64", "0:0-0:0|3|3|64"] - }], - "vars": [{ - "id": 0, - "usr": 14842397373703114213, - "detailed_name": "int AClass::aProp", + "uses": [] + }, { + "usr": 12774569141855220778, + "detailed_name": "- (int)AClass::aProp;", + "qual_name_offset": 2, "short_name": "aProp", - "declarations": ["4:29-4:34|-1|1|1"], - "type": 1, - "uses": ["16:12-16:17|4|3|4"], - "kind": 19, - "storage": 0 + "bases": [], + "vars": [], + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["4:29-4:34|4:29-4:34|1345|-1"], + "derived": [], + "uses": [] }, { - "id": 1, - "usr": 17112602610366149042, - "detailed_name": "int AClass::_aProp", - "short_name": "_aProp", - "declarations": [], - "spell": "4:29-4:34|-1|1|2", - "extent": "4:29-4:34|-1|1|0", - "type": 1, - "uses": [], - "kind": 14, - "storage": 0 + "usr": 12775970426728664910, + "detailed_name": "+ (void)AClass::test;", + "qual_name_offset": 2, + "short_name": "test", + "spell": "8:9-8:13|8:1-8:16|1090|-1", + "bases": [], + "vars": [], + "callees": [], + "kind": 6, + "parent_kind": 11, + "storage": 0, + "declarations": ["2:11-2:15|2:3-2:16|1089|-1"], + "derived": [], + "uses": [] }, { - "id": 2, - "usr": 6849095699869081177, + "usr": 17992064398538597892, + "detailed_name": "- (void)AClass::setAProp:(int)aProp;", + "qual_name_offset": 2, + "short_name": "setAProp:", + "bases": [], + "vars": [], + "callees": [], + "kind": 6, + "parent_kind": 0, + "storage": 0, + "declarations": ["4:29-4:34|4:29-4:34|1345|-1"], + "derived": [], + "uses": ["16:12-16:17|24932|-1"] + }], + "usr2type": [{ + "usr": 11832280568361305387, + "detailed_name": "@implementation AClass\n@end", + "qual_name_offset": 16, + "short_name": "AClass", + "spell": "7:17-7:23|7:1-10:2|2|-1", + "bases": [], + "funcs": [12775970426728664910, 4096877434426330804, 12774569141855220778, 17992064398538597892], + "types": [14842397373703114213], + "vars": [], + "alias_of": 0, + "kind": 11, + "parent_kind": 1, + "declarations": ["1:12-1:18|1:1-5:5|1|-1"], + "derived": [], + "instances": [], + "uses": ["14:3-14:9|4|-1", "14:23-14:29|4|-1"] + }, { + "usr": 14842397373703114213, + "detailed_name": "@property(nonatomic, assign, unsafe_unretained, readwrite) int AClass::aProp;", + "qual_name_offset": 63, + "short_name": "aProp", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 7, + "parent_kind": 0, + "declarations": ["4:29-4:34|4:3-4:34|1025|-1"], + "derived": [], + "instances": [], + "uses": ["16:12-16:17|20|-1"] + }], + "usr2var": [{ + "usr": 11068172662702654556, "detailed_name": "AClass *instance", + "qual_name_offset": 8, "short_name": "instance", "hover": "AClass *instance = [AClass init]", - "declarations": [], - "spell": "14:11-14:19|4|3|2", - "extent": "14:3-14:35|4|3|2", + "spell": "14:11-14:19|14:3-14:35|2|-1", "type": 0, - "uses": ["15:4-15:12|4|3|4", "16:3-16:11|4|3|4"], "kind": 13, - "storage": 1 + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": ["15:4-15:12|12|-1", "16:3-16:11|12|-1"] }] } */ diff --git a/index_tests/operators/operator.cc b/index_tests/operators/operator.cc index 0640a220..cdc6d997 100644 --- a/index_tests/operators/operator.cc +++ b/index_tests/operators/operator.cc @@ -31,7 +31,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "operator()", "bases": [], - "vars": [], + "vars": [18194802024223591994, 3165816734756776484], "callees": [], "kind": 6, "parent_kind": 0, @@ -70,6 +70,22 @@ OUTPUT: "uses": [] }], "usr2type": [{ + "usr": 452, + "detailed_name": "", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [18194802024223591994, 3165816734756776484], + "uses": [] + }, { "usr": 15041163540773201510, "detailed_name": "class Foo {}", "qual_name_offset": 6, @@ -81,12 +97,36 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], "uses": ["7:1-7:4|4|-1", "7:25-7:28|4|-1"] }], - "usr2var": [] + "usr2var": [{ + "usr": 3165816734756776484, + "detailed_name": "int b", + "qual_name_offset": 4, + "short_name": "b", + "spell": "4:29-4:30|4:25-4:30|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 6, + "storage": 0, + "declarations": [], + "uses": [] + }, { + "usr": 18194802024223591994, + "detailed_name": "int a", + "qual_name_offset": 4, + "short_name": "a", + "spell": "4:22-4:23|4:18-4:23|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 6, + "storage": 0, + "declarations": [], + "uses": [] + }] } */ diff --git a/index_tests/outline/static_function_in_type.cc b/index_tests/outline/static_function_in_type.cc index 7120de03..b0f6a200 100644 --- a/index_tests/outline/static_function_in_type.cc +++ b/index_tests/outline/static_function_in_type.cc @@ -13,7 +13,7 @@ OUTPUT: static_function_in_type.h "skipped_ranges": [], "usr2func": [{ "usr": 17019747379608639279, - "detailed_name": "static void ns::Foo::Register(ns::Manager *)", + "detailed_name": "static void ns::Foo::Register(Manager *)", "qual_name_offset": 12, "short_name": "Register", "bases": [], @@ -87,7 +87,7 @@ OUTPUT: static_function_in_type.cc "skipped_ranges": [], "usr2func": [{ "usr": 17019747379608639279, - "detailed_name": "static void ns::Foo::Register(ns::Manager *)", + "detailed_name": "static void ns::Foo::Register(Manager *)", "qual_name_offset": 12, "short_name": "Register", "spell": "5:11-5:19|5:1-6:2|1026|-1", @@ -153,8 +153,8 @@ OUTPUT: static_function_in_type.cc }], "usr2var": [{ "usr": 13569879755236306838, - "detailed_name": "ns::Manager *m", - "qual_name_offset": 13, + "detailed_name": "Manager *m", + "qual_name_offset": 9, "short_name": "m", "spell": "5:29-5:30|5:20-5:30|1026|-1", "type": 1972401196751872203, diff --git a/index_tests/preprocessor/skipped.cc b/index_tests/preprocessor/skipped.cc index 74577e1f..1278482e 100644 --- a/index_tests/preprocessor/skipped.cc +++ b/index_tests/preprocessor/skipped.cc @@ -17,7 +17,7 @@ void hello(); OUTPUT: { "includes": [], - "skipped_ranges": ["2:1-5:1", "6:1-11:1", "12:1-15:1"], + "skipped_ranges": ["2:1-4:7", "6:1-10:7", "12:1-14:7"], "usr2func": [], "usr2type": [], "usr2var": [] diff --git a/index_tests/templates/func_specialized_template_param.cc b/index_tests/templates/func_specialized_template_param.cc index 0cb68a03..776c9046 100644 --- a/index_tests/templates/func_specialized_template_param.cc +++ b/index_tests/templates/func_specialized_template_param.cc @@ -29,6 +29,22 @@ OUTPUT: "uses": [] }], "usr2type": [{ + "usr": 3122724794825267268, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:16-1:17|1:10-1:17|1025|-1"], + "derived": [], + "instances": [], + "uses": [] + }, { "usr": 15041163540773201510, "detailed_name": "struct Foo {}", "qual_name_offset": 7, @@ -40,7 +56,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -53,11 +69,11 @@ OUTPUT: "spell": "2:7-2:15|2:1-2:18|2|-1", "bases": [], "funcs": [], - "types": [], + "types": [3122724794825267268], "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/templates/implicit_variable_instantiation.cc b/index_tests/templates/implicit_variable_instantiation.cc index b0244358..7d47c8b7 100644 --- a/index_tests/templates/implicit_variable_instantiation.cc +++ b/index_tests/templates/implicit_variable_instantiation.cc @@ -21,7 +21,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -53,6 +53,38 @@ OUTPUT: "derived": [], "instances": [4731849186641714451, 4731849186641714451], "uses": ["6:22-6:29|4|-1", "6:44-6:51|4|-1", "10:18-10:25|4|-1"] + }, { + "usr": 2205716167465743256, + "detailed_name": "_", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [], + "uses": ["10:33-10:34|4|-1"] + }, { + "usr": 2743282246975181395, + "detailed_name": "_", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["4:21-4:22|4:12-4:22|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 11072669167287398027, "detailed_name": "namespace ns {}", @@ -83,7 +115,7 @@ OUTPUT: "spell": "5:10-5:16|5:3-7:4|1026|-1", "bases": [], "funcs": [], - "types": [], + "types": [2743282246975181395], "vars": [], "alias_of": 0, "kind": 23, @@ -95,16 +127,16 @@ OUTPUT: }], "usr2var": [{ "usr": 4731849186641714451, - "detailed_name": "static constexpr ns::VarType ns::Holder::static_var", - "qual_name_offset": 29, + "detailed_name": "static constexpr VarType ns::Holder::static_var", + "qual_name_offset": 25, "short_name": "static_var", - "hover": "static constexpr ns::VarType ns::Holder::static_var = (VarType)0x0", - "spell": "10:37-10:47|9:3-10:47|1026|-1", + "hover": "static constexpr VarType ns::Holder::static_var = (VarType)0x0", + "spell": "6:30-6:40|6:5-6:55|1026|-1", "type": 1532099849728741556, - "kind": 13, + "kind": 8, "parent_kind": 23, "storage": 2, - "declarations": ["6:30-6:40|6:5-6:55|1025|-1"], + "declarations": ["10:37-10:47|9:3-10:47|1025|-1"], "uses": ["13:26-13:36|12|-1", "14:27-14:37|12|-1"] }, { "usr": 9008550860229740818, @@ -113,7 +145,7 @@ OUTPUT: "short_name": "Foo2", "hover": "int ns::Foo2 = Holder::static_var", "spell": "14:7-14:11|14:3-14:37|1026|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 3, "storage": 0, @@ -126,7 +158,7 @@ OUTPUT: "short_name": "Foo", "hover": "int ns::Foo = Holder::static_var", "spell": "13:7-13:10|13:3-13:36|1026|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 3, "storage": 0, diff --git a/index_tests/templates/member_ref_in_template.cc b/index_tests/templates/member_ref_in_template.cc index c9cc268e..65fe626c 100644 --- a/index_tests/templates/member_ref_in_template.cc +++ b/index_tests/templates/member_ref_in_template.cc @@ -35,7 +35,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -63,14 +63,14 @@ OUTPUT: "spell": "2:8-2:9|2:1-5:2|2|-1", "bases": [], "funcs": [8905286151237717330], - "types": [], + "types": [14750650276757822712], "vars": [{ "L": 5866801090710377175, "R": -1 }], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -79,18 +79,33 @@ OUTPUT: "usr": 14750650276757822712, "detailed_name": "T", "qual_name_offset": 0, - "short_name": "T", - "spell": "1:17-1:18|1:11-1:18|2|-1", + "short_name": "", "bases": [], "funcs": [], "types": [], "vars": [], "alias_of": 0, "kind": 26, - "parent_kind": 5, - "declarations": [], + "parent_kind": 0, + "declarations": ["1:17-1:18|1:11-1:18|1025|-1"], "derived": [], "instances": [5866801090710377175], + "uses": ["3:3-3:4|4|-1"] + }, { + "usr": 14756043565860085104, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["7:17-7:18|7:11-7:18|1|-1"], + "derived": [], + "instances": [], "uses": [] }], "usr2var": [{ 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 de9c3143..c733204f 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 @@ -33,7 +33,7 @@ OUTPUT: "uses": ["10:21-10:24|36|-1", "11:22-11:25|36|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -48,6 +48,22 @@ OUTPUT: "derived": [], "instances": [15768138241775955040, 3182917058194750998], "uses": [] + }, { + "usr": 404962309137154484, + "detailed_name": "R", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["4:23-4:24|4:14-4:24|1|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 11072669167287398027, "detailed_name": "namespace ns {}", @@ -70,6 +86,22 @@ OUTPUT: "derived": [], "instances": [], "uses": [] + }, { + "usr": 14005287469305211602, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["2:21-2:22|2:12-2:22|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 14042997404480181958, "detailed_name": "struct ns::Foo {}", @@ -78,7 +110,7 @@ OUTPUT: "spell": "3:10-3:13|3:3-8:4|1026|-1", "bases": [], "funcs": [8221803074608342407], - "types": [], + "types": [14005287469305211602], "vars": [], "alias_of": 0, "kind": 23, @@ -95,7 +127,7 @@ OUTPUT: "short_name": "b", "hover": "int ns::b = Foo::foo()", "spell": "11:7-11:8|11:3-11:35|1026|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 3, "storage": 0, @@ -108,7 +140,7 @@ OUTPUT: "short_name": "a", "hover": "int ns::a = Foo::foo()", "spell": "10:7-10:8|10:3-10:33|1026|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 3, "storage": 0, diff --git a/index_tests/templates/namespace_template_type_usage_folded_into_one.cc b/index_tests/templates/namespace_template_type_usage_folded_into_one.cc index e8c8367c..3423dedc 100644 --- a/index_tests/templates/namespace_template_type_usage_folded_into_one.cc +++ b/index_tests/templates/namespace_template_type_usage_folded_into_one.cc @@ -42,7 +42,7 @@ OUTPUT: "spell": "3:9-3:12|3:3-3:15|1026|-1", "bases": [], "funcs": [], - "types": [], + "types": [17234941064111183681], "vars": [], "alias_of": 0, "kind": 5, @@ -51,6 +51,22 @@ OUTPUT: "derived": [], "instances": [15768138241775955040, 3182917058194750998], "uses": ["5:3-5:6|4|-1", "6:3-6:6|4|-1"] + }, { + "usr": 17234941064111183681, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["2:21-2:22|2:12-2:22|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }], "usr2var": [{ "usr": 3182917058194750998, diff --git a/index_tests/templates/specialization.cc b/index_tests/templates/specialization.cc index b943c207..92b6aed1 100644 --- a/index_tests/templates/specialization.cc +++ b/index_tests/templates/specialization.cc @@ -53,7 +53,7 @@ OUTPUT: "qual_name_offset": 16, "short_name": "foo", "bases": [], - "vars": [], + "vars": [12904523933304867124], "callees": [], "kind": 12, "parent_kind": 0, @@ -63,7 +63,7 @@ OUTPUT: "uses": [] }, { "usr": 6113470698424012876, - "detailed_name": "void vector >::clear()", + "detailed_name": "void vector::clear()", "qual_name_offset": 5, "short_name": "clear", "bases": [], @@ -82,10 +82,10 @@ OUTPUT: "short_name": "foo", "spell": "39:6-39:9|39:1-39:21|2|-1", "bases": [], - "vars": [17826688417349629938], + "vars": [9217877221147056536, 3621126593459656452, 17826688417349629938], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -106,7 +106,7 @@ OUTPUT: "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -119,11 +119,27 @@ OUTPUT: "parent_kind": 0, "declarations": [], "derived": [], - "instances": [13914496963221806870], + "instances": [9217877221147056536, 3621126593459656452, 13914496963221806870], + "uses": [] + }, { + "usr": 481, + "detailed_name": "", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [12904523933304867124], "uses": [] }, { "usr": 218068462278884837, - "detailed_name": "template class function {}", + "detailed_name": "template class function {}", "qual_name_offset": 46, "short_name": "function", "spell": "5:7-5:15|4:1-5:30|2|-1", @@ -133,14 +149,14 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [2933643612409209903], "uses": ["7:1-7:9|4|-1"] }, { "usr": 1663022413889915338, - "detailed_name": "template<> class vector> {}", + "detailed_name": "template<> class vector {}", "qual_name_offset": 17, "short_name": "vector", "spell": "26:7-26:13|25:1-28:2|2|-1", @@ -150,11 +166,11 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [15931696253641284761], - "uses": ["26:7-26:13|4|-1", "33:1-33:7|4|-1"] + "uses": ["33:1-33:7|4|-1"] }, { "usr": 5760043510674081814, "detailed_name": "struct Z1 {}", @@ -167,11 +183,43 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], "uses": ["21:23-21:25|4|-1", "32:8-32:10|4|-1"] + }, { + "usr": 6953303017847795730, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["11:19-11:20|11:10-11:20|1025|-1"], + "derived": [], + "instances": [], + "uses": ["11:49-11:50|4|-1"] + }, { + "usr": 7143192229126273961, + "detailed_name": "Args", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [], + "uses": ["5:18-5:22|4|-1"] }, { "usr": 7440942986741176606, "detailed_name": "class vector {}", @@ -180,15 +228,31 @@ OUTPUT: "spell": "12:7-12:13|12:1-14:2|2|-1", "bases": [], "funcs": [18107614608385228556], - "types": [], + "types": [6953303017847795730, 9777924294257602255], "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [16155717907537731864, 1663022413889915338], - "instances": [5792869548777559988], - "uses": ["17:7-17:13|4|-1", "21:16-21:22|4|-1", "30:1-30:7|4|-1", "32:1-32:7|4|-1"] + "instances": [5792869548777559988, 3566687051827176322], + "uses": ["30:1-30:7|4|-1", "32:1-32:7|4|-1"] + }, { + "usr": 8880262253425334092, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [], + "uses": ["17:14-17:15|4|-1"] }, { "usr": 9201299975592934124, "detailed_name": "enum Enum {}", @@ -201,10 +265,42 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, + "parent_kind": 1, + "declarations": [], + "derived": [], + "instances": [], + "uses": ["38:30-38:34|4|-1"] + }, { + "usr": 9673599782548740467, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, "parent_kind": 0, "declarations": [], "derived": [], "instances": [], + "uses": ["5:16-5:17|4|-1"] + }, { + "usr": 9777924294257602255, + "detailed_name": "Alloc", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["11:31-11:36|11:22-11:51|1025|-1"], + "derived": [], + "instances": [], "uses": [] }, { "usr": 10124869160135436852, @@ -218,7 +314,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -227,19 +323,18 @@ OUTPUT: "usr": 14111105212951082474, "detailed_name": "T", "qual_name_offset": 0, - "short_name": "T", - "spell": "38:20-38:21|38:11-38:21|2|-1", + "short_name": "", "bases": [], "funcs": [], "types": [], "vars": [], "alias_of": 0, "kind": 26, - "parent_kind": 5, - "declarations": [], + "parent_kind": 0, + "declarations": ["38:20-38:21|38:11-38:21|1|-1"], "derived": [], "instances": [17826688417349629938], - "uses": [] + "uses": ["39:10-39:11|4|-1"] }, { "usr": 15019211479263750068, "detailed_name": "class function", @@ -247,7 +342,7 @@ OUTPUT: "short_name": "function", "bases": [], "funcs": [], - "types": [], + "types": [18140454020659517869], "vars": [], "alias_of": 0, "kind": 5, @@ -255,22 +350,6 @@ OUTPUT: "declarations": ["2:7-2:15|2:1-2:15|1|-1"], "derived": [218068462278884837], "instances": [], - "uses": ["5:7-5:15|4|-1"] - }, { - "usr": 15440970074034693939, - "detailed_name": "", - "qual_name_offset": 0, - "short_name": "", - "bases": [], - "funcs": [], - "types": [], - "vars": [], - "alias_of": 0, - "kind": 0, - "parent_kind": 0, - "declarations": [], - "derived": [], - "instances": [3566687051827176322], "uses": [] }, { "usr": 15695704394170757108, @@ -279,7 +358,7 @@ OUTPUT: "short_name": "allocator", "bases": [], "funcs": [], - "types": [], + "types": [17690566930043896921], "vars": [], "alias_of": 0, "kind": 5, @@ -290,7 +369,7 @@ OUTPUT: "uses": ["11:39-11:48|4|-1"] }, { "usr": 16155717907537731864, - "detailed_name": "template class vector> {}", + "detailed_name": "template class vector {}", "qual_name_offset": 28, "short_name": "vector", "spell": "17:7-17:13|16:1-17:20|2|-1", @@ -300,11 +379,43 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [86949563628772958], "uses": ["31:1-31:7|4|-1"] + }, { + "usr": 17690566930043896921, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["9:19-9:20|9:10-9:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] + }, { + "usr": 18140454020659517869, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:16-1:17|1:10-1:17|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }], "usr2var": [{ "usr": 86949563628772958, @@ -314,7 +425,7 @@ OUTPUT: "spell": "31:14-31:17|31:1-31:17|2|-1", "type": 16155717907537731864, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -326,7 +437,7 @@ OUTPUT: "spell": "7:21-7:22|7:1-7:22|2|-1", "type": 218068462278884837, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -336,12 +447,23 @@ OUTPUT: "qual_name_offset": 11, "short_name": "vz1", "spell": "32:12-32:15|32:1-32:15|2|-1", - "type": 15440970074034693939, + "type": 7440942986741176606, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] + }, { + "usr": 3621126593459656452, + "detailed_name": "int E", + "qual_name_offset": 4, + "short_name": "E", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": ["38:40-38:41|38:36-38:41|1025|-1"], + "uses": [] }, { "usr": 4917621020431490070, "detailed_name": "Enum1", @@ -351,7 +473,7 @@ OUTPUT: "spell": "36:10-36:15|36:10-36:15|1026|-1", "type": 9201299975592934124, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -363,7 +485,30 @@ OUTPUT: "spell": "30:14-30:16|30:1-30:16|2|-1", "type": 7440942986741176606, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, + "storage": 0, + "declarations": [], + "uses": [] + }, { + "usr": 9217877221147056536, + "detailed_name": "int I", + "qual_name_offset": 4, + "short_name": "I", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": ["38:27-38:28|38:23-38:28|1025|-1"], + "uses": [] + }, { + "usr": 12904523933304867124, + "detailed_name": "float Value", + "qual_name_offset": 6, + "short_name": "Value", + "spell": "43:44-43:49|43:38-43:49|1026|-1", + "type": 481, + "kind": 253, + "parent_kind": 12, "storage": 0, "declarations": [], "uses": [] @@ -374,9 +519,9 @@ OUTPUT: "short_name": "kOnst", "hover": "static const int kOnst = 7", "spell": "41:18-41:23|41:1-41:27|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 2, "declarations": [], "uses": ["43:27-43:32|12|-1"] @@ -389,7 +534,7 @@ OUTPUT: "spell": "36:3-36:8|36:3-36:8|1026|-1", "type": 9201299975592934124, "kind": 22, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": ["43:20-43:25|4|-1"] @@ -401,7 +546,7 @@ OUTPUT: "spell": "33:12-33:15|33:1-33:15|2|-1", "type": 1663022413889915338, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/templates/specialized_func_definition.cc b/index_tests/templates/specialized_func_definition.cc index c57b35ff..c1dc2a05 100644 --- a/index_tests/templates/specialized_func_definition.cc +++ b/index_tests/templates/specialized_func_definition.cc @@ -9,7 +9,6 @@ void Template::Foo() {} template<> void Template::Foo() {} - /* // TODO: usage information on Template is bad. // TODO: Foo() should have multiple definitions. @@ -54,6 +53,38 @@ OUTPUT: "uses": [] }], "usr2type": [{ + "usr": 4889840470949104569, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:16-1:17|1:10-1:17|1025|-1"], + "derived": [], + "instances": [], + "uses": [] + }, { + "usr": 13161199857701142428, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [], + "uses": ["7:15-7:16|4|-1"] + }, { "usr": 17107291254533526269, "detailed_name": "class Template {}", "qual_name_offset": 6, @@ -61,11 +92,11 @@ OUTPUT: "spell": "2:7-2:15|2:1-4:2|2|-1", "bases": [], "funcs": [11994188353303124840], - "types": [], + "types": [4889840470949104569], "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], 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 6efb299e..0854142b 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 @@ -30,7 +30,7 @@ OUTPUT: "uses": ["8:19-8:22|36|-1", "9:20-9:23|36|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -53,15 +53,31 @@ OUTPUT: "spell": "2:8-2:11|2:1-6:2|2|-1", "bases": [], "funcs": [8340731781048851399], - "types": [], + "types": [14929630827782508810], "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], "uses": ["8:9-8:12|4|-1", "9:9-9:12|4|-1"] + }, { + "usr": 14929630827782508810, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }], "usr2var": [{ "usr": 12028309045033782423, @@ -70,9 +86,9 @@ OUTPUT: "short_name": "b", "hover": "int b = Foo::foo()", "spell": "9:5-9:6|9:1-9:25|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -83,9 +99,9 @@ OUTPUT: "short_name": "a", "hover": "int a = Foo::foo()", "spell": "8:5-8:6|8:1-8:24|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] 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 c364718f..3c075e70 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 @@ -31,7 +31,7 @@ OUTPUT: "uses": ["9:19-9:22|36|-1", "10:20-10:23|36|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -46,6 +46,22 @@ OUTPUT: "derived": [], "instances": [16721564935990383768, 12028309045033782423], "uses": [] + }, { + "usr": 10424609343859267126, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 10528472276654770367, "detailed_name": "struct Foo {}", @@ -54,15 +70,31 @@ OUTPUT: "spell": "2:8-2:11|2:1-7:2|2|-1", "bases": [], "funcs": [9034026360701857235], - "types": [], + "types": [10424609343859267126], "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], "uses": ["9:9-9:12|4|-1", "10:9-10:12|4|-1"] + }, { + "usr": 12336546102385362252, + "detailed_name": "R", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["3:21-3:22|3:12-3:22|1|-1"], + "derived": [], + "instances": [], + "uses": [] }], "usr2var": [{ "usr": 12028309045033782423, @@ -71,9 +103,9 @@ OUTPUT: "short_name": "b", "hover": "int b = Foo::foo()", "spell": "10:5-10:6|10:1-10:33|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -84,9 +116,9 @@ OUTPUT: "short_name": "a", "hover": "int a = Foo::foo()", "spell": "9:5-9:6|9:1-9:31|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] 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 b15eb530..71f69c67 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 @@ -31,7 +31,7 @@ VarDecl b OUTPUT: { "includes": [], - "skipped_ranges": ["12:1-29:1"], + "skipped_ranges": ["12:1-28:7"], "usr2func": [], "usr2type": [{ "usr": 6697181287623958829, @@ -45,7 +45,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -58,11 +58,11 @@ OUTPUT: "spell": "5:8-5:11|5:1-7:2|2|-1", "bases": [], "funcs": [], - "types": [13938528237873543349], + "types": [15010559816125069973, 13938528237873543349], "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -79,7 +79,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -101,6 +101,22 @@ OUTPUT: "derived": [], "instances": [16721564935990383768, 12028309045033782423], "uses": ["9:9-9:14|4|-1", "10:9-10:14|4|-1"] + }, { + "usr": 15010559816125069973, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["4:19-4:20|4:10-4:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }], "usr2var": [{ "usr": 12028309045033782423, @@ -110,7 +126,7 @@ OUTPUT: "spell": "10:15-10:16|10:1-10:16|2|-1", "type": 13938528237873543349, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -122,7 +138,7 @@ OUTPUT: "spell": "9:15-9:16|9:1-9:16|2|-1", "type": 13938528237873543349, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] 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 f2c4390c..c77ec976 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 @@ -13,7 +13,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -28,6 +28,22 @@ OUTPUT: "derived": [], "instances": [13545144895171991916, 16721564935990383768, 12028309045033782423], "uses": [] + }, { + "usr": 8038341777080655976, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 10528472276654770367, "detailed_name": "struct Foo {}", @@ -36,11 +52,11 @@ OUTPUT: "spell": "2:8-2:11|2:1-4:2|2|-1", "bases": [], "funcs": [], - "types": [], + "types": [8038341777080655976], "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -53,9 +69,9 @@ OUTPUT: "short_name": "b", "hover": "int b = Foo::var", "spell": "7:5-7:6|7:1-7:23|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -65,11 +81,12 @@ OUTPUT: "qual_name_offset": 21, "short_name": "var", "hover": "static constexpr int Foo::var = 3", - "type": 53, - "kind": 13, + "spell": "3:24-3:27|3:3-3:31|1026|-1", + "type": 452, + "kind": 8, "parent_kind": 23, "storage": 2, - "declarations": ["3:24-3:27|3:3-3:31|1025|-1"], + "declarations": [], "uses": ["6:19-6:22|12|-1", "7:20-7:23|12|-1"] }, { "usr": 16721564935990383768, @@ -78,9 +95,9 @@ OUTPUT: "short_name": "a", "hover": "int a = Foo::var", "spell": "6:5-6:6|6:1-6:22|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/templates/template_func_usage_folded_into_one.cc b/index_tests/templates/template_func_usage_folded_into_one.cc index 9c253894..fa091c22 100644 --- a/index_tests/templates/template_func_usage_folded_into_one.cc +++ b/index_tests/templates/template_func_usage_folded_into_one.cc @@ -24,14 +24,14 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": ["6:9-6:12|36|-1", "7:9-7:12|36|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -46,6 +46,22 @@ OUTPUT: "derived": [], "instances": [16721564935990383768, 12028309045033782423], "uses": [] + }, { + "usr": 17666708977284229997, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1|-1"], + "derived": [], + "instances": [], + "uses": [] }], "usr2var": [{ "usr": 12028309045033782423, @@ -54,9 +70,9 @@ OUTPUT: "short_name": "b", "hover": "int b = foo()", "spell": "7:5-7:6|7:1-7:20|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -67,9 +83,9 @@ OUTPUT: "short_name": "a", "hover": "int a = foo()", "spell": "6:5-6:6|6:1-6:19|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/templates/template_type_usage_folded_into_one.cc b/index_tests/templates/template_type_usage_folded_into_one.cc index 05dfa00e..f93ea9ca 100644 --- a/index_tests/templates/template_type_usage_folded_into_one.cc +++ b/index_tests/templates/template_type_usage_folded_into_one.cc @@ -11,6 +11,22 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ + "usr": 8047497394564431352, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] + }, { "usr": 10528472276654770367, "detailed_name": "class Foo {}", "qual_name_offset": 6, @@ -18,11 +34,11 @@ OUTPUT: "spell": "2:7-2:10|2:1-2:13|2|-1", "bases": [], "funcs": [], - "types": [], + "types": [8047497394564431352], "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [16721564935990383768, 12028309045033782423], @@ -36,7 +52,7 @@ OUTPUT: "spell": "5:11-5:12|5:1-5:12|2|-1", "type": 10528472276654770367, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -48,7 +64,7 @@ OUTPUT: "spell": "4:10-4:11|4:1-4:11|2|-1", "type": 10528472276654770367, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/templates/template_var_usage_folded_into_one.cc b/index_tests/templates/template_var_usage_folded_into_one.cc index 7359e0dd..2f2c5c0f 100644 --- a/index_tests/templates/template_var_usage_folded_into_one.cc +++ b/index_tests/templates/template_var_usage_folded_into_one.cc @@ -34,7 +34,7 @@ EXTRA_FLAGS: OUTPUT: { "includes": [], - "skipped_ranges": ["12:1-29:1"], + "skipped_ranges": ["12:1-28:7"], "usr2func": [], "usr2type": [{ "usr": 6697181287623958829, @@ -48,7 +48,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [16721564935990383768], @@ -57,19 +57,18 @@ OUTPUT: "usr": 11919899838872947844, "detailed_name": "T", "qual_name_offset": 0, - "short_name": "T", - "spell": "4:19-4:20|4:10-4:20|2|-1", + "short_name": "", "bases": [], "funcs": [], "types": [], "vars": [], "alias_of": 0, "kind": 26, - "parent_kind": 5, - "declarations": [], + "parent_kind": 0, + "declarations": ["4:19-4:20|4:10-4:20|1|-1"], "derived": [], "instances": [8096973118640070624], - "uses": [] + "uses": ["5:1-5:2|4|-1", "5:9-5:10|4|-1"] }, { "usr": 13892793056005362145, "detailed_name": "enum B {}", @@ -82,7 +81,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [12028309045033782423], @@ -97,7 +96,7 @@ OUTPUT: "spell": "5:3-5:6|5:1-5:12|2|-1", "type": 11919899838872947844, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": ["7:7-7:10|12|-1", "8:7-8:10|12|-1"] @@ -110,7 +109,7 @@ OUTPUT: "spell": "8:3-8:4|8:1-8:13|2|-1", "type": 13892793056005362145, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] @@ -123,7 +122,7 @@ OUTPUT: "spell": "7:3-7:4|7:1-7:13|2|-1", "type": 6697181287623958829, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": [] diff --git a/index_tests/types/anonymous_struct.cc b/index_tests/types/anonymous_struct.cc index baa5c2dc..551c9bd7 100644 --- a/index_tests/types/anonymous_struct.cc +++ b/index_tests/types/anonymous_struct.cc @@ -10,7 +10,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ - "usr": 82, + "usr": 481, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -75,7 +75,7 @@ OUTPUT: }], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -99,7 +99,7 @@ OUTPUT: "qual_name_offset": 6, "short_name": "x", "spell": "2:18-2:19|2:12-2:19|1026|-1", - "type": 82, + "type": 481, "kind": 8, "parent_kind": 23, "storage": 0, @@ -111,7 +111,7 @@ OUTPUT: "qual_name_offset": 6, "short_name": "y", "spell": "2:21-2:22|2:12-2:22|1026|-1", - "type": 82, + "type": 481, "kind": 8, "parent_kind": 23, "storage": 0, @@ -123,7 +123,7 @@ OUTPUT: "qual_name_offset": 6, "short_name": "z", "spell": "2:24-2:25|2:12-2:25|1026|-1", - "type": 82, + "type": 481, "kind": 8, "parent_kind": 23, "storage": 0, diff --git a/index_tests/types/typedefs.cc b/index_tests/types/typedefs.cc index 4a2844b7..4ec16718 100644 --- a/index_tests/types/typedefs.cc +++ b/index_tests/types/typedefs.cc @@ -33,7 +33,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/unions/union_decl.cc b/index_tests/unions/union_decl.cc index 313c201e..6f1f50e2 100644 --- a/index_tests/unions/union_decl.cc +++ b/index_tests/unions/union_decl.cc @@ -10,7 +10,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ - "usr": 37, + "usr": 436, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -26,7 +26,7 @@ OUTPUT: "instances": [8804696910588009104], "uses": [] }, { - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -59,7 +59,7 @@ OUTPUT: }], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -71,7 +71,7 @@ OUTPUT: "qual_name_offset": 5, "short_name": "b", "spell": "3:8-3:9|3:3-3:9|1026|-1", - "type": 37, + "type": 436, "kind": 8, "parent_kind": 5, "storage": 0, @@ -83,7 +83,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "2:7-2:8|2:3-2:8|1026|-1", - "type": 53, + "type": 452, "kind": 8, "parent_kind": 5, "storage": 0, diff --git a/index_tests/unions/union_usage.cc b/index_tests/unions/union_usage.cc index 57bb2ebf..6ac05f58 100644 --- a/index_tests/unions/union_usage.cc +++ b/index_tests/unions/union_usage.cc @@ -26,14 +26,14 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 37, + "usr": 436, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -49,7 +49,7 @@ OUTPUT: "instances": [8804696910588009104], "uses": [] }, { - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -82,7 +82,7 @@ OUTPUT: }], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [2933643612409209903], @@ -96,7 +96,7 @@ OUTPUT: "spell": "6:5-6:6|6:1-6:6|2|-1", "type": 8501689086387244262, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "uses": ["9:3-9:4|4|-1"] @@ -106,7 +106,7 @@ OUTPUT: "qual_name_offset": 5, "short_name": "b", "spell": "3:8-3:9|3:3-3:13|1026|-1", - "type": 37, + "type": 436, "kind": 8, "parent_kind": 5, "storage": 0, @@ -118,7 +118,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "2:7-2:8|2:3-2:12|1026|-1", - "type": 53, + "type": 452, "kind": 8, "parent_kind": 5, "storage": 0, diff --git a/index_tests/usage/func_called_from_constructor.cc b/index_tests/usage/func_called_from_constructor.cc index d002eb45..6422f861 100644 --- a/index_tests/usage/func_called_from_constructor.cc +++ b/index_tests/usage/func_called_from_constructor.cc @@ -23,7 +23,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -56,7 +56,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/usage/func_called_from_macro_argument.cc b/index_tests/usage/func_called_from_macro_argument.cc index 2c7f4305..99802e27 100644 --- a/index_tests/usage/func_called_from_macro_argument.cc +++ b/index_tests/usage/func_called_from_macro_argument.cc @@ -17,7 +17,7 @@ OUTPUT: "qual_name_offset": 5, "short_name": "called", "bases": [], - "vars": [], + "vars": [821688872341099790, 6986353817767193884], "callees": [], "kind": 12, "parent_kind": 0, @@ -35,14 +35,54 @@ OUTPUT: "vars": [], "callees": ["6:14-6:20|3787803219955606747|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], - "usr2type": [], + "usr2type": [{ + "usr": 436, + "detailed_name": "", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [821688872341099790, 6986353817767193884], + "uses": [] + }], "usr2var": [{ + "usr": 821688872341099790, + "detailed_name": "bool a", + "qual_name_offset": 5, + "short_name": "a", + "spell": "3:18-3:19|3:13-3:19|1026|-1", + "type": 436, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { + "usr": 6986353817767193884, + "detailed_name": "bool b", + "qual_name_offset": 5, + "short_name": "b", + "spell": "3:26-3:27|3:21-3:27|1026|-1", + "type": 436, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { "usr": 16326993795872073150, "detailed_name": "MACRO_CALL", "qual_name_offset": 0, diff --git a/index_tests/usage/func_called_from_template.cc b/index_tests/usage/func_called_from_template.cc index 9ff9b66c..10c093ea 100644 --- a/index_tests/usage/func_called_from_template.cc +++ b/index_tests/usage/func_called_from_template.cc @@ -54,7 +54,7 @@ OUTPUT: "vars": [], "callees": ["9:3-9:9|10177235824697315808|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -69,13 +69,29 @@ OUTPUT: "vars": [], "callees": ["5:3-5:9|468307235068920063|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": ["9:3-9:9|16420|-1"] }], - "usr2type": [], + "usr2type": [{ + "usr": 8908003062153072411, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["3:20-3:21|3:11-3:21|1|-1"], + "derived": [], + "instances": [], + "uses": [] + }], "usr2var": [] } */ \ No newline at end of file diff --git a/index_tests/usage/func_called_implicit_ctor.cc b/index_tests/usage/func_called_implicit_ctor.cc index 771ab3ce..9f93c9c7 100644 --- a/index_tests/usage/func_called_implicit_ctor.cc +++ b/index_tests/usage/func_called_implicit_ctor.cc @@ -23,7 +23,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -34,7 +34,7 @@ OUTPUT: "qual_name_offset": 0, "short_name": "Wrapper", "bases": [], - "vars": [], + "vars": [17356425290273905453], "callees": [], "kind": 9, "parent_kind": 0, @@ -52,13 +52,29 @@ OUTPUT: "vars": [], "callees": ["8:10-8:16|10544127002917214589|3|16676", "8:10-8:16|468307235068920063|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ + "usr": 452, + "detailed_name": "", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [17356425290273905453], + "uses": [] + }, { "usr": 13611487872560323389, "detailed_name": "struct Wrapper {}", "qual_name_offset": 7, @@ -70,12 +86,24 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], "uses": ["2:3-2:10|4|-1", "7:1-7:8|4|-1"] }], - "usr2var": [] + "usr2var": [{ + "usr": 17356425290273905453, + "detailed_name": "int i", + "qual_name_offset": 4, + "short_name": "i", + "spell": "2:15-2:16|2:11-2:16|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 9, + "storage": 0, + "declarations": [], + "uses": [] + }] } */ diff --git a/index_tests/usage/func_usage_addr_func.cc b/index_tests/usage/func_usage_addr_func.cc index b0c5fb4f..fd7f2acf 100644 --- a/index_tests/usage/func_usage_addr_func.cc +++ b/index_tests/usage/func_usage_addr_func.cc @@ -22,7 +22,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -35,9 +35,8 @@ OUTPUT: "spell": "5:6-5:10|5:1-8:2|2|-1", "bases": [], "vars": [16088407831770615719], - "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"], - "kind": 12, - "parent_kind": 0, + "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"], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -52,7 +51,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/usage/func_usage_addr_method.cc b/index_tests/usage/func_usage_addr_method.cc index 3e0582da..ea8404e5 100644 --- a/index_tests/usage/func_usage_addr_method.cc +++ b/index_tests/usage/func_usage_addr_method.cc @@ -6,7 +6,6 @@ void user() { auto x = &Foo::Used; } - /* OUTPUT: { @@ -22,7 +21,7 @@ OUTPUT: "vars": [4636142131003982569], "callees": ["6:18-6:22|18417145003926999463|3|132", "6:18-6:22|18417145003926999463|3|132"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -54,7 +53,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/usage/func_usage_call_func.cc b/index_tests/usage/func_usage_call_func.cc index 29841134..80d7497f 100644 --- a/index_tests/usage/func_usage_call_func.cc +++ b/index_tests/usage/func_usage_call_func.cc @@ -18,7 +18,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -33,7 +33,7 @@ OUTPUT: "vars": [], "callees": ["3:3-3:9|468307235068920063|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/usage/func_usage_call_method.cc b/index_tests/usage/func_usage_call_method.cc index 6e86be51..9f185d5b 100644 --- a/index_tests/usage/func_usage_call_method.cc +++ b/index_tests/usage/func_usage_call_method.cc @@ -22,7 +22,7 @@ OUTPUT: "vars": [14045150712868309451], "callees": ["7:6-7:10|18417145003926999463|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -54,7 +54,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [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 f62581ea..f60ffade 100644 --- a/index_tests/usage/func_usage_class_inline_var_def.cc +++ b/index_tests/usage/func_usage_class_inline_var_def.cc @@ -21,14 +21,14 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": ["6:11-6:17|36|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -58,7 +58,7 @@ OUTPUT: }], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -71,7 +71,7 @@ OUTPUT: "short_name": "x", "hover": "int Foo::x = helper()", "spell": "6:7-6:8|6:3-6:19|1026|-1", - "type": 53, + "type": 452, "kind": 8, "parent_kind": 5, "storage": 0, diff --git a/index_tests/usage/func_usage_forward_decl_func.cc b/index_tests/usage/func_usage_forward_decl_func.cc index 06a1e767..0c11f839 100644 --- a/index_tests/usage/func_usage_forward_decl_func.cc +++ b/index_tests/usage/func_usage_forward_decl_func.cc @@ -32,7 +32,7 @@ OUTPUT: "vars": [], "callees": ["4:3-4:6|4259594751088586730|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/usage/func_usage_forward_decl_method.cc b/index_tests/usage/func_usage_forward_decl_method.cc index 7da093ea..5598a299 100644 --- a/index_tests/usage/func_usage_forward_decl_method.cc +++ b/index_tests/usage/func_usage_forward_decl_method.cc @@ -21,7 +21,7 @@ OUTPUT: "vars": [16229832321010999607], "callees": ["7:6-7:9|17922201480358737771|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -53,7 +53,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [16229832321010999607], diff --git a/index_tests/usage/func_usage_template_func.cc b/index_tests/usage/func_usage_template_func.cc index 6a812a46..db61fe1a 100644 --- a/index_tests/usage/func_usage_template_func.cc +++ b/index_tests/usage/func_usage_template_func.cc @@ -21,7 +21,7 @@ OUTPUT: "vars": [], "callees": ["5:3-5:9|10585861037135727329|3|16420", "6:3-6:9|10585861037135727329|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -41,7 +41,23 @@ OUTPUT: "derived": [], "uses": ["5:3-5:9|16420|-1", "6:3-6:9|16420|-1"] }], - "usr2type": [], + "usr2type": [{ + "usr": 13420564603121289209, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1|-1"], + "derived": [], + "instances": [], + "uses": ["2:13-2:14|4|-1"] + }], "usr2var": [] } */ diff --git a/index_tests/usage/type_usage_as_template_parameter.cc b/index_tests/usage/type_usage_as_template_parameter.cc index f13a593f..2d709011 100644 --- a/index_tests/usage/type_usage_as_template_parameter.cc +++ b/index_tests/usage/type_usage_as_template_parameter.cc @@ -25,7 +25,7 @@ OUTPUT: "vars": [3364438781074774169], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -39,15 +39,31 @@ OUTPUT: "spell": "2:7-2:17|2:1-2:20|2|-1", "bases": [], "funcs": [], - "types": [], + "types": [3365245325694180663], "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [12857919739649552168, 18075066956054788088, 3364438781074774169], "uses": ["6:8-6:18|4|-1", "7:8-7:18|4|-1", "9:1-9:11|4|-1", "10:3-10:13|4|-1"] + }, { + "usr": 3365245325694180663, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 4750332761459066907, "detailed_name": "struct S {}", @@ -60,7 +76,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -86,7 +102,7 @@ OUTPUT: "spell": "6:25-6:27|6:1-6:27|2|-1", "type": 3286534761799572592, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 2, "declarations": [], "uses": [] @@ -98,7 +114,7 @@ OUTPUT: "spell": "7:22-7:24|7:1-7:24|2|-1", "type": 3286534761799572592, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 2, "declarations": [], "uses": [] 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 4dedd131..30e22d07 100644 --- a/index_tests/usage/type_usage_as_template_parameter_complex.cc +++ b/index_tests/usage/type_usage_as_template_parameter_complex.cc @@ -82,7 +82,7 @@ unique_ptr* Foo::foo() { return nullptr; } OUTPUT: { "includes": [], - "skipped_ranges": ["7:1-15:1", "17:1-33:1", "35:1-40:1", "42:1-53:1", "57:1-64:1", "68:1-79:1"], + "skipped_ranges": ["7:1-14:7", "17:1-32:7", "35:1-39:7", "42:1-52:7", "57:1-63:7", "68:1-78:7"], "usr2func": [{ "usr": 1246637699196435450, "detailed_name": "unique_ptr, S2> *as_return_type(unique_ptr *)", @@ -93,7 +93,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -108,7 +108,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -138,13 +138,29 @@ OUTPUT: "vars": [500112618220246], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ + "usr": 875011242051264538, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] + }, { "usr": 4310164820010458371, "detailed_name": "struct S1", "qual_name_offset": 7, @@ -159,7 +175,24 @@ OUTPUT: "declarations": ["4:8-4:10|4:1-4:10|1|-1"], "derived": [], "instances": [], - "uses": ["15:30-15:32|4|-1", "33:23-33:25|4|-1", "33:63-33:65|4|-1", "54:25-54:27|4|-1", "65:14-65:16|4|-1", "79:12-79:14|4|-1"] + "uses": ["15:30-15:32|4|-1", "33:23-33:25|4|-1", "33:63-33:65|4|-1", "54:25-54:27|4|-1", "65:14-65:16|4|-1", +"79:12-79:14|4|-1"] + }, { + "usr": 10605525886521205308, + "detailed_name": "B", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:31-1:32|1:22-1:32|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 12728490517004312484, "detailed_name": "struct S2", @@ -175,7 +208,8 @@ OUTPUT: "declarations": ["5:8-5:10|5:1-5:10|1|-1"], "derived": [], "instances": [], - "uses": ["15:34-15:36|4|-1", "15:39-15:41|4|-1", "33:27-33:29|4|-1", "33:32-33:34|4|-1", "33:67-33:69|4|-1", "54:29-54:31|4|-1", "54:34-54:36|4|-1", "65:18-65:20|4|-1", "79:16-79:18|4|-1"] + "uses": ["15:34-15:36|4|-1", "15:39-15:41|4|-1", "33:27-33:29|4|-1", "33:32-33:34|4|-1", "33:67-33:69|4|-1", +"54:29-54:31|4|-1", "54:34-54:36|4|-1", "65:18-65:20|4|-1", "79:16-79:18|4|-1"] }, { "usr": 14209198335088845323, "detailed_name": "class unique_ptr", @@ -183,7 +217,7 @@ OUTPUT: "short_name": "unique_ptr", "bases": [], "funcs": [], - "types": [], + "types": [875011242051264538, 10605525886521205308], "vars": [], "alias_of": 0, "kind": 5, @@ -191,7 +225,8 @@ OUTPUT: "declarations": ["2:7-2:17|2:1-2:17|1|-1"], "derived": [], "instances": [2933643612409209903, 500112618220246], - "uses": ["15:8-15:18|4|-1", "15:19-15:29|4|-1", "33:1-33:11|4|-1", "33:12-33:22|4|-1", "33:52-33:62|4|-1", "54:3-54:13|4|-1", "54:14-54:24|4|-1", "65:3-65:13|4|-1", "79:1-79:11|4|-1"] + "uses": ["15:8-15:18|4|-1", "15:19-15:29|4|-1", "33:1-33:11|4|-1", "33:12-33:22|4|-1", "33:52-33:62|4|-1", +"54:3-54:13|4|-1", "54:14-54:24|4|-1", "65:3-65:13|4|-1", "79:1-79:11|4|-1"] }, { "usr": 15041163540773201510, "detailed_name": "class Foo {}", @@ -204,7 +239,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/usage/type_usage_as_template_parameter_simple.cc b/index_tests/usage/type_usage_as_template_parameter_simple.cc index 75c9d63e..14e00ebf 100644 --- a/index_tests/usage/type_usage_as_template_parameter_simple.cc +++ b/index_tests/usage/type_usage_as_template_parameter_simple.cc @@ -19,11 +19,11 @@ OUTPUT: "spell": "2:7-2:17|2:1-2:20|2|-1", "bases": [], "funcs": [], - "types": [], + "types": [11508089533865125841], "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [3398408600781120939], @@ -44,6 +44,22 @@ OUTPUT: "derived": [], "instances": [], "uses": ["6:19-6:20|4|-1"] + }, { + "usr": 11508089533865125841, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }], "usr2var": [{ "usr": 3398408600781120939, @@ -53,7 +69,7 @@ OUTPUT: "spell": "6:22-6:25|6:1-6:25|2|-1", "type": 3286534761799572592, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 2, "declarations": [], "uses": [] diff --git a/index_tests/usage/type_usage_declare_extern.cc b/index_tests/usage/type_usage_declare_extern.cc index afe6962f..d2827fbe 100644 --- a/index_tests/usage/type_usage_declare_extern.cc +++ b/index_tests/usage/type_usage_declare_extern.cc @@ -19,7 +19,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [1346710425945444872], diff --git a/index_tests/usage/type_usage_declare_field.cc b/index_tests/usage/type_usage_declare_field.cc index fe6f1afb..c56d81ac 100644 --- a/index_tests/usage/type_usage_declare_field.cc +++ b/index_tests/usage/type_usage_declare_field.cc @@ -24,7 +24,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [14727441168849658842], @@ -63,7 +63,7 @@ OUTPUT: }], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/usage/type_usage_declare_local.cc b/index_tests/usage/type_usage_declare_local.cc index 82415f55..e26fc1fd 100644 --- a/index_tests/usage/type_usage_declare_local.cc +++ b/index_tests/usage/type_usage_declare_local.cc @@ -21,7 +21,7 @@ OUTPUT: "vars": [16374832544037266261, 2580122838476012357], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -39,7 +39,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [2580122838476012357], diff --git a/index_tests/usage/type_usage_declare_param.cc b/index_tests/usage/type_usage_declare_param.cc index ae7c0006..a088e7ac 100644 --- a/index_tests/usage/type_usage_declare_param.cc +++ b/index_tests/usage/type_usage_declare_param.cc @@ -18,7 +18,7 @@ OUTPUT: "vars": [13058491096576226774, 11055777568039014776], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -36,7 +36,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [11055777568039014776], diff --git a/index_tests/usage/type_usage_declare_param_prototype.cc b/index_tests/usage/type_usage_declare_param_prototype.cc index 7c33416a..a810e0a7 100644 --- a/index_tests/usage/type_usage_declare_param_prototype.cc +++ b/index_tests/usage/type_usage_declare_param_prototype.cc @@ -20,10 +20,10 @@ OUTPUT: "short_name": "foo", "spell": "4:6-4:9|4:1-4:26|2|-1", "bases": [], - "vars": [13823260660189154978], + "vars": [9791335934911072644, 13823260660189154978], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": ["3:6-3:9|3:1-3:23|1|-1"], "derived": [], @@ -43,10 +43,22 @@ OUTPUT: "parent_kind": 0, "declarations": ["1:8-1:11|1:1-1:11|1|-1"], "derived": [], - "instances": [13823260660189154978], + "instances": [9791335934911072644, 13823260660189154978], "uses": ["3:10-3:13|4|-1", "3:18-3:21|4|-1", "4:10-4:13|4|-1", "4:18-4:21|4|-1"] }], "usr2var": [{ + "usr": 9791335934911072644, + "detailed_name": "Foo *f", + "qual_name_offset": 5, + "short_name": "f", + "spell": "3:15-3:16|3:10-3:16|1026|-1", + "type": 15041163540773201510, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { "usr": 13823260660189154978, "detailed_name": "Foo *f", "qual_name_offset": 5, diff --git a/index_tests/usage/type_usage_declare_param_unnamed.cc b/index_tests/usage/type_usage_declare_param_unnamed.cc index 29208739..e174a65e 100644 --- a/index_tests/usage/type_usage_declare_param_unnamed.cc +++ b/index_tests/usage/type_usage_declare_param_unnamed.cc @@ -15,7 +15,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/usage/type_usage_declare_qualifiers.cc b/index_tests/usage/type_usage_declare_qualifiers.cc index b6131373..cf05597d 100644 --- a/index_tests/usage/type_usage_declare_qualifiers.cc +++ b/index_tests/usage/type_usage_declare_qualifiers.cc @@ -18,14 +18,9 @@ OUTPUT: "short_name": "foo", "spell": "3:6-3:9|3:1-8:2|2|-1", "bases": [], - "vars": [7997456978847868736, 17228576662112939520, 15429032129697337561, 6081981442495435784, 5004072032239834773, 14939253431683105646], - "callees": [], - "kind": 12, - "parent_kind": 0, - "storage": 0, - "declarations": [], - "derived": [], - "uses": [] + "vars": [7997456978847868736, 17228576662112939520, 15429032129697337561, 6081981442495435784, +5004072032239834773, 14939253431683105646], "callees": [], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": +[], "derived": [], "uses": [] }], "usr2type": [{ "usr": 13487927231218873822, @@ -39,11 +34,12 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], - "instances": [7997456978847868736, 17228576662112939520, 15429032129697337561, 6081981442495435784, 5004072032239834773, 14939253431683105646], - "uses": ["3:10-3:14|4|-1", "3:26-3:30|4|-1", "4:3-4:7|4|-1", "5:3-5:7|4|-1", "6:9-6:13|4|-1", "7:9-7:13|4|-1"] + "instances": [7997456978847868736, 17228576662112939520, 15429032129697337561, 6081981442495435784, +5004072032239834773, 14939253431683105646], "uses": ["3:10-3:14|4|-1", "3:26-3:30|4|-1", "4:3-4:7|4|-1", "5:3-5:7|4|-1", +"6:9-6:13|4|-1", "7:9-7:13|4|-1"] }], "usr2var": [{ "usr": 5004072032239834773, diff --git a/index_tests/usage/type_usage_declare_static.cc b/index_tests/usage/type_usage_declare_static.cc index 3957ceb2..3df18674 100644 --- a/index_tests/usage/type_usage_declare_static.cc +++ b/index_tests/usage/type_usage_declare_static.cc @@ -18,7 +18,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [6601831367240627080], @@ -32,7 +32,7 @@ OUTPUT: "spell": "2:13-2:14|2:1-2:14|2|-1", "type": 13487927231218873822, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 2, "declarations": [], "uses": [] diff --git a/index_tests/usage/type_usage_on_return_type.cc b/index_tests/usage/type_usage_on_return_type.cc index cb6ef08e..0f4a528d 100644 --- a/index_tests/usage/type_usage_on_return_type.cc +++ b/index_tests/usage/type_usage_on_return_type.cc @@ -47,7 +47,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": ["3:7-3:10|3:1-3:12|1|-1", "4:7-4:10|4:1-4:12|1|-1"], "derived": [], @@ -91,7 +91,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": ["17:14-17:17|17:1-17:19|1|-1"], "derived": [], @@ -112,7 +112,8 @@ OUTPUT: "declarations": ["1:8-1:12|1:1-1:12|1|-1"], "derived": [], "instances": [], - "uses": ["3:1-3:5|4|-1", "4:1-4:5|4|-1", "5:1-5:5|4|-1", "8:3-8:7|4|-1", "12:1-12:5|4|-1", "15:14-15:18|4|-1", "17:8-17:12|4|-1", "18:8-18:12|4|-1"] + "uses": ["3:1-3:5|4|-1", "4:1-4:5|4|-1", "5:1-5:5|4|-1", "8:3-8:7|4|-1", "12:1-12:5|4|-1", "15:14-15:18|4|-1", +"17:8-17:12|4|-1", "18:8-18:12|4|-1"] }, { "usr": 15041163540773201510, "detailed_name": "class Foo {}", @@ -125,7 +126,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/usage/type_usage_typedef_and_using.cc b/index_tests/usage/type_usage_typedef_and_using.cc index 58c82325..b02552af 100644 --- a/index_tests/usage/type_usage_typedef_and_using.cc +++ b/index_tests/usage/type_usage_typedef_and_using.cc @@ -24,7 +24,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -39,7 +39,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -54,7 +54,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -69,7 +69,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -87,7 +87,7 @@ OUTPUT: "vars": [], "alias_of": 15041163540773201510, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -104,7 +104,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -137,7 +137,7 @@ OUTPUT: "vars": [], "alias_of": 15041163540773201510, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -154,7 +154,7 @@ OUTPUT: "vars": [], "alias_of": 1544499294580512394, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/usage/type_usage_typedef_and_using_template.cc b/index_tests/usage/type_usage_typedef_and_using_template.cc index 00848483..bea35e9a 100644 --- a/index_tests/usage/type_usage_typedef_and_using_template.cc +++ b/index_tests/usage/type_usage_typedef_and_using_template.cc @@ -22,11 +22,27 @@ OUTPUT: "vars": [], "alias_of": 10528472276654770367, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], "uses": ["5:13-5:17|4|-1"] + }, { + "usr": 8734442555193909854, + "detailed_name": "T", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 26, + "parent_kind": 0, + "declarations": ["1:19-1:20|1:10-1:20|1025|-1"], + "derived": [], + "instances": [], + "uses": [] }, { "usr": 10528472276654770367, "detailed_name": "struct Foo", @@ -34,10 +50,10 @@ OUTPUT: "short_name": "Foo", "bases": [], "funcs": [], - "types": [], + "types": [8734442555193909854], "vars": [], "alias_of": 0, - "kind": 5, + "kind": 23, "parent_kind": 0, "declarations": ["2:8-2:11|2:1-2:11|1|-1"], "derived": [], @@ -55,7 +71,7 @@ OUTPUT: "vars": [], "alias_of": 10528472276654770367, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], diff --git a/index_tests/usage/type_usage_various.cc b/index_tests/usage/type_usage_various.cc index d3c8959a..1246f1fc 100644 --- a/index_tests/usage/type_usage_various.cc +++ b/index_tests/usage/type_usage_various.cc @@ -42,7 +42,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [16380484338511689669, 14455976355866885943], diff --git a/index_tests/usage/usage_inside_of_call.cc b/index_tests/usage/usage_inside_of_call.cc index 44d65416..7a17a186 100644 --- a/index_tests/usage/usage_inside_of_call.cc +++ b/index_tests/usage/usage_inside_of_call.cc @@ -29,7 +29,7 @@ OUTPUT: "vars": [8039186520399841081], "callees": ["14:3-14:9|18319417758892371313|3|16420", "14:14-14:17|11404602816585117695|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -54,7 +54,7 @@ OUTPUT: "qual_name_offset": 5, "short_name": "called", "bases": [], - "vars": [], + "vars": [6112882821797148411], "callees": [], "kind": 12, "parent_kind": 0, @@ -64,7 +64,7 @@ OUTPUT: "uses": ["14:3-14:9|16420|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -77,8 +77,8 @@ OUTPUT: "parent_kind": 0, "declarations": [], "derived": [], - "instances": [11489549839875479478, 9648311402855509901, 11489549839875479478, 8039186520399841081], - "uses": [] + "instances": [6112882821797148411, 11489549839875479478, 9648311402855509901, 11489549839875479478, +8039186520399841081], "uses": [] }, { "usr": 15041163540773201510, "detailed_name": "struct Foo {}", @@ -94,20 +94,32 @@ OUTPUT: }], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], "uses": ["10:5-10:8|4|-1", "14:22-14:25|4|-1", "14:40-14:43|4|-1"] }], "usr2var": [{ + "usr": 6112882821797148411, + "detailed_name": "int a", + "qual_name_offset": 4, + "short_name": "a", + "spell": "1:17-1:18|1:13-1:18|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }, { "usr": 8039186520399841081, "detailed_name": "int a", "qual_name_offset": 4, "short_name": "a", "hover": "int a = 5", "spell": "13:7-13:8|13:3-13:12|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, @@ -119,7 +131,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "field_var", "spell": "7:7-7:16|7:3-7:16|1026|-1", - "type": 53, + "type": 452, "kind": 8, "parent_kind": 23, "storage": 0, @@ -131,8 +143,8 @@ OUTPUT: "qual_name_offset": 11, "short_name": "static_var", "spell": "10:10-10:20|10:1-10:24|1026|-1", - "type": 53, - "kind": 13, + "type": 452, + "kind": 8, "parent_kind": 23, "storage": 2, "declarations": ["6:14-6:24|6:3-6:24|1025|-1"], diff --git a/index_tests/usage/usage_inside_of_call_simple.cc b/index_tests/usage/usage_inside_of_call_simple.cc index c2320556..7da521a8 100644 --- a/index_tests/usage/usage_inside_of_call_simple.cc +++ b/index_tests/usage/usage_inside_of_call_simple.cc @@ -19,13 +19,9 @@ OUTPUT: "spell": "5:6-5:9|5:1-7:2|2|-1", "bases": [], "vars": [], - "callees": ["6:3-6:9|18319417758892371313|3|16420", "6:10-6:13|11404602816585117695|3|16420", "6:18-6:21|11404602816585117695|3|16420"], - "kind": 12, - "parent_kind": 0, - "storage": 0, - "declarations": [], - "derived": [], - "uses": [] + "callees": ["6:3-6:9|18319417758892371313|3|16420", "6:10-6:13|11404602816585117695|3|16420", +"6:18-6:21|11404602816585117695|3|16420"], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": [], "derived": +[], "uses": [] }, { "usr": 11404602816585117695, "detailed_name": "int gen()", @@ -36,7 +32,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -47,7 +43,7 @@ OUTPUT: "qual_name_offset": 5, "short_name": "called", "bases": [], - "vars": [], + "vars": [5483552950122803801], "callees": [], "kind": 12, "parent_kind": 0, @@ -56,7 +52,35 @@ OUTPUT: "derived": [], "uses": ["6:3-6:9|16420|-1"] }], - "usr2type": [], - "usr2var": [] + "usr2type": [{ + "usr": 452, + "detailed_name": "", + "qual_name_offset": 0, + "short_name": "", + "bases": [], + "funcs": [], + "types": [], + "vars": [], + "alias_of": 0, + "kind": 0, + "parent_kind": 0, + "declarations": [], + "derived": [], + "instances": [5483552950122803801], + "uses": [] + }], + "usr2var": [{ + "usr": 5483552950122803801, + "detailed_name": "int a", + "qual_name_offset": 4, + "short_name": "a", + "spell": "1:17-1:18|1:13-1:18|1026|-1", + "type": 452, + "kind": 253, + "parent_kind": 12, + "storage": 0, + "declarations": [], + "uses": [] + }] } */ diff --git a/index_tests/usage/var_usage_call_function.cc b/index_tests/usage/var_usage_call_function.cc index 0a0df74f..10919719 100644 --- a/index_tests/usage/var_usage_call_function.cc +++ b/index_tests/usage/var_usage_call_function.cc @@ -22,7 +22,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -35,12 +35,8 @@ OUTPUT: "spell": "3:6-3:12|3:1-8:2|2|-1", "bases": [], "vars": [9121974011454213596], - "callees": ["4:13-4:19|468307235068920063|3|132", "4:13-4:19|468307235068920063|3|132", "7:3-7:9|468307235068920063|3|16420"], - "kind": 12, - "parent_kind": 0, - "storage": 0, - "declarations": [], - "derived": [], + "callees": ["4:13-4:19|468307235068920063|3|132", "4:13-4:19|468307235068920063|3|132", +"7:3-7:9|468307235068920063|3|16420"], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [], diff --git a/index_tests/usage/var_usage_class_member.cc b/index_tests/usage/var_usage_class_member.cc index 9f230cd5..3c04b8bd 100644 --- a/index_tests/usage/var_usage_class_member.cc +++ b/index_tests/usage/var_usage_class_member.cc @@ -30,9 +30,8 @@ OUTPUT: "spell": "10:6-10:9|10:1-18:2|2|-1", "bases": [], "vars": [14669930844300034456], - "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"], - "kind": 12, - "parent_kind": 0, + "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"], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -67,7 +66,7 @@ OUTPUT: "uses": ["14:3-14:9|16420|-1", "15:3-15:9|16420|-1", "17:3-17:9|16420|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -100,7 +99,7 @@ OUTPUT: }], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [14669930844300034456], @@ -112,7 +111,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "y", "spell": "4:7-4:8|4:3-4:8|1026|-1", - "type": 53, + "type": 452, "kind": 8, "parent_kind": 5, "storage": 0, @@ -124,12 +123,12 @@ OUTPUT: "qual_name_offset": 4, "short_name": "x", "spell": "3:7-3:8|3:3-3:8|1026|-1", - "type": 53, + "type": 452, "kind": 8, "parent_kind": 5, "storage": 0, "declarations": [], - "uses": ["12:5-12:6|20|-1", "13:5-13:6|4|-1", "14:12-14:13|12|-1", "15:12-15:13|12|-1", "16:13-16:14|132|-1"] + "uses": ["12:5-12:6|20|-1", "13:5-13:6|28|-1", "14:12-14:13|12|-1", "15:12-15:13|12|-1", "16:13-16:14|132|-1"] }, { "usr": 14669930844300034456, "detailed_name": "Foo f", @@ -141,7 +140,8 @@ OUTPUT: "parent_kind": 12, "storage": 0, "declarations": [], - "uses": ["12:3-12:4|4|-1", "13:3-13:4|4|-1", "14:10-14:11|4|-1", "15:10-15:11|4|-1", "16:11-16:12|4|-1", "17:10-17:11|4|-1"] + "uses": ["12:3-12:4|4|-1", "13:3-13:4|4|-1", "14:10-14:11|4|-1", "15:10-15:11|4|-1", "16:11-16:12|4|-1", +"17:10-17:11|4|-1"] }] } */ diff --git a/index_tests/usage/var_usage_class_member_static.cc b/index_tests/usage/var_usage_class_member_static.cc index 1206c2d8..f50d1dc2 100644 --- a/index_tests/usage/var_usage_class_member_static.cc +++ b/index_tests/usage/var_usage_class_member_static.cc @@ -23,7 +23,7 @@ OUTPUT: "vars": [], "callees": ["8:3-8:9|17175780305784503374|3|16420"], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -44,7 +44,7 @@ OUTPUT: "uses": ["8:3-8:9|16420|-1"] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -71,7 +71,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -82,8 +82,8 @@ OUTPUT: "detailed_name": "static int Foo::x", "qual_name_offset": 11, "short_name": "x", - "type": 53, - "kind": 13, + "type": 452, + "kind": 8, "parent_kind": 23, "storage": 2, "declarations": ["2:14-2:15|2:3-2:15|1025|-1"], diff --git a/index_tests/usage/var_usage_cstyle_cast.cc b/index_tests/usage/var_usage_cstyle_cast.cc index e041ffba..109bd9ed 100644 --- a/index_tests/usage/var_usage_cstyle_cast.cc +++ b/index_tests/usage/var_usage_cstyle_cast.cc @@ -6,7 +6,6 @@ struct Holder { const VarType Holder::static_var; - /* OUTPUT: { @@ -25,7 +24,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 10, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [7057400933868440116, 7057400933868440116], @@ -42,7 +41,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -54,41 +53,17 @@ OUTPUT: "qual_name_offset": 25, "short_name": "static_var", "hover": "static constexpr VarType Holder::static_var = (VarType)0x0", - "spell": "7:23-7:33|7:1-7:33|1026|-1", + "spell": "4:28-4:38|4:3-4:53|1026|-1", "type": 5792006888140599735, - "kind": 13, + "kind": 8, "parent_kind": 23, "storage": 2, - "declarations": ["4:28-4:38|4:3-4:53|1025|-1"], + "declarations": ["7:23-7:33|7:1-7:33|1025|-1"], "uses": [] }] } */ - - - - - - - - - - - - - - - - - - - - - - - - //#include //#include diff --git a/index_tests/usage/var_usage_extern.cc b/index_tests/usage/var_usage_extern.cc index 14cb93e7..b86992b2 100644 --- a/index_tests/usage/var_usage_extern.cc +++ b/index_tests/usage/var_usage_extern.cc @@ -18,14 +18,14 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -46,7 +46,7 @@ OUTPUT: "detailed_name": "extern int a", "qual_name_offset": 11, "short_name": "a", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 0, "storage": 1, diff --git a/index_tests/usage/var_usage_func_parameter.cc b/index_tests/usage/var_usage_func_parameter.cc index 069c7262..d95b2785 100644 --- a/index_tests/usage/var_usage_func_parameter.cc +++ b/index_tests/usage/var_usage_func_parameter.cc @@ -16,14 +16,14 @@ OUTPUT: "vars": [10063793875496522529], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -45,12 +45,12 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "1:14-1:15|1:10-1:15|1026|-1", - "type": 53, + "type": 452, "kind": 253, "parent_kind": 12, "storage": 0, "declarations": [], - "uses": ["2:3-2:4|4|-1"] + "uses": ["2:3-2:4|28|-1"] }] } */ diff --git a/index_tests/usage/var_usage_local.cc b/index_tests/usage/var_usage_local.cc index 577d810c..bc073768 100644 --- a/index_tests/usage/var_usage_local.cc +++ b/index_tests/usage/var_usage_local.cc @@ -17,14 +17,14 @@ OUTPUT: "vars": [14014650769929566957], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -46,7 +46,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "x", "spell": "2:7-2:8|2:3-2:8|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, diff --git a/index_tests/usage/var_usage_shadowed_local.cc b/index_tests/usage/var_usage_shadowed_local.cc index efe2d460..f273ab7b 100644 --- a/index_tests/usage/var_usage_shadowed_local.cc +++ b/index_tests/usage/var_usage_shadowed_local.cc @@ -22,14 +22,14 @@ OUTPUT: "vars": [13311055950748663970, 14036425367303419504], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -51,7 +51,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "2:7-2:8|2:3-2:8|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, @@ -63,7 +63,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "5:9-5:10|5:5-5:10|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, diff --git a/index_tests/usage/var_usage_shadowed_parameter.cc b/index_tests/usage/var_usage_shadowed_parameter.cc index dfa4a6ca..8286d7a6 100644 --- a/index_tests/usage/var_usage_shadowed_parameter.cc +++ b/index_tests/usage/var_usage_shadowed_parameter.cc @@ -22,14 +22,14 @@ OUTPUT: "vars": [11608231465452906059, 6997229590862003559], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -51,7 +51,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "4:9-4:10|4:5-4:10|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, @@ -63,7 +63,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "1:14-1:15|1:10-1:15|1026|-1", - "type": 53, + "type": 452, "kind": 253, "parent_kind": 12, "storage": 0, diff --git a/index_tests/usage/var_usage_static.cc b/index_tests/usage/var_usage_static.cc index 705fddff..0ff25b6d 100644 --- a/index_tests/usage/var_usage_static.cc +++ b/index_tests/usage/var_usage_static.cc @@ -19,14 +19,14 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -48,9 +48,9 @@ OUTPUT: "qual_name_offset": 11, "short_name": "a", "spell": "1:12-1:13|1:1-1:13|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 2, "declarations": [], "uses": ["4:3-4:4|20|-1"] diff --git a/index_tests/vars/class_member.cc b/index_tests/vars/class_member.cc index 9b62aec7..6bdc19a4 100644 --- a/index_tests/vars/class_member.cc +++ b/index_tests/vars/class_member.cc @@ -22,7 +22,7 @@ OUTPUT: }], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [13799811842374292251], diff --git a/index_tests/vars/class_static_member.cc b/index_tests/vars/class_static_member.cc index 3c67ac6e..1b4ba742 100644 --- a/index_tests/vars/class_static_member.cc +++ b/index_tests/vars/class_static_member.cc @@ -21,7 +21,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [5844987037615239736, 5844987037615239736], @@ -34,7 +34,7 @@ OUTPUT: "short_name": "member", "spell": "4:11-4:17|4:1-4:27|1026|-1", "type": 15041163540773201510, - "kind": 13, + "kind": 8, "parent_kind": 5, "storage": 2, "declarations": ["2:15-2:21|2:3-2:21|1025|-1"], diff --git a/index_tests/vars/class_static_member_decl_only.cc b/index_tests/vars/class_static_member_decl_only.cc index 0cf61b2c..654a8548 100644 --- a/index_tests/vars/class_static_member_decl_only.cc +++ b/index_tests/vars/class_static_member_decl_only.cc @@ -8,7 +8,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -35,7 +35,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -46,8 +46,8 @@ OUTPUT: "detailed_name": "static int Foo::member", "qual_name_offset": 11, "short_name": "member", - "type": 53, - "kind": 13, + "type": 452, + "kind": 8, "parent_kind": 5, "storage": 2, "declarations": ["2:14-2:20|2:3-2:20|1025|-1"], diff --git a/index_tests/vars/deduce_auto_type.cc b/index_tests/vars/deduce_auto_type.cc index 7e9c0cbc..4de91e81 100644 --- a/index_tests/vars/deduce_auto_type.cc +++ b/index_tests/vars/deduce_auto_type.cc @@ -19,7 +19,7 @@ OUTPUT: "vars": [10601729374837386290, 18422884837902130475], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -37,7 +37,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 5, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [10601729374837386290, 18422884837902130475], diff --git a/index_tests/vars/function_local.cc b/index_tests/vars/function_local.cc index 70a985ba..b3bbb015 100644 --- a/index_tests/vars/function_local.cc +++ b/index_tests/vars/function_local.cc @@ -19,7 +19,7 @@ OUTPUT: "vars": [13198746475679542317], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/vars/function_param.cc b/index_tests/vars/function_param.cc index 751fbd65..6301086f 100644 --- a/index_tests/vars/function_param.cc +++ b/index_tests/vars/function_param.cc @@ -17,7 +17,7 @@ OUTPUT: "vars": [8730439006497971620, 2525014371090380500], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/vars/function_param_unnamed.cc b/index_tests/vars/function_param_unnamed.cc index bd8c9d84..d285faa7 100644 --- a/index_tests/vars/function_param_unnamed.cc +++ b/index_tests/vars/function_param_unnamed.cc @@ -14,7 +14,7 @@ OUTPUT: "vars": [], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], diff --git a/index_tests/vars/function_shadow_local.cc b/index_tests/vars/function_shadow_local.cc index 0ccc91e3..75755796 100644 --- a/index_tests/vars/function_shadow_local.cc +++ b/index_tests/vars/function_shadow_local.cc @@ -22,14 +22,14 @@ OUTPUT: "vars": [1894874819807168345, 4508045017817092115], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -51,7 +51,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "2:7-2:8|2:3-2:8|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, @@ -63,7 +63,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "a", "spell": "5:9-5:10|5:5-5:10|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, diff --git a/index_tests/vars/function_shadow_param.cc b/index_tests/vars/function_shadow_param.cc index 80f8d4f1..df8124a2 100644 --- a/index_tests/vars/function_shadow_param.cc +++ b/index_tests/vars/function_shadow_param.cc @@ -16,14 +16,14 @@ OUTPUT: "vars": [5875271969926422921, 11404600766177939811], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], "uses": [] }], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -45,7 +45,7 @@ OUTPUT: "qual_name_offset": 4, "short_name": "p", "spell": "1:14-1:15|1:10-1:15|1026|-1", - "type": 53, + "type": 452, "kind": 253, "parent_kind": 12, "storage": 0, @@ -58,7 +58,7 @@ OUTPUT: "short_name": "p", "hover": "int p = 0", "spell": "2:9-2:10|2:5-2:14|2|-1", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 12, "storage": 0, diff --git a/index_tests/vars/global_variable.cc b/index_tests/vars/global_variable.cc index 3ce2d119..eb28a3c1 100644 --- a/index_tests/vars/global_variable.cc +++ b/index_tests/vars/global_variable.cc @@ -6,7 +6,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -29,9 +29,9 @@ OUTPUT: "short_name": "global", "hover": "static int global = 0", "spell": "1:12-1:18|1:1-1:22|2|-1", - "type": 53, + "type": 452, "kind": 13, - "parent_kind": 0, + "parent_kind": 1, "storage": 2, "declarations": [], "uses": [] diff --git a/index_tests/vars/global_variable_decl_only.cc b/index_tests/vars/global_variable_decl_only.cc index 1ba9f2e4..3bc28123 100644 --- a/index_tests/vars/global_variable_decl_only.cc +++ b/index_tests/vars/global_variable_decl_only.cc @@ -6,7 +6,7 @@ OUTPUT: "skipped_ranges": [], "usr2func": [], "usr2type": [{ - "usr": 53, + "usr": 452, "detailed_name": "", "qual_name_offset": 0, "short_name": "", @@ -27,7 +27,7 @@ OUTPUT: "detailed_name": "extern int global", "qual_name_offset": 11, "short_name": "global", - "type": 53, + "type": 452, "kind": 13, "parent_kind": 0, "storage": 1, diff --git a/index_tests/vars/type_instance_on_using_type.cc b/index_tests/vars/type_instance_on_using_type.cc index ce3607eb..4ba96f4b 100644 --- a/index_tests/vars/type_instance_on_using_type.cc +++ b/index_tests/vars/type_instance_on_using_type.cc @@ -21,7 +21,7 @@ OUTPUT: "vars": [6975456769752895964], "callees": [], "kind": 12, - "parent_kind": 0, + "parent_kind": 1, "storage": 0, "declarations": [], "derived": [], @@ -39,7 +39,7 @@ OUTPUT: "vars": [], "alias_of": 0, "kind": 23, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [], @@ -56,7 +56,7 @@ OUTPUT: "vars": [], "alias_of": 4750332761459066907, "kind": 252, - "parent_kind": 0, + "parent_kind": 1, "declarations": [], "derived": [], "instances": [6975456769752895964], diff --git a/src/test.cc b/src/test.cc index aec341da..b43f0e2c 100644 --- a/src/test.cc +++ b/src/test.cc @@ -182,8 +182,8 @@ void diffDocuments(std::string path, std::string path_section, rapidjson::Docume char actual_file[] = "/tmp/ccls.actual.XXXXXX"; int expected_fd = mkstemp(expected_file); int actual_fd = mkstemp(actual_file); - dprintf(expected_fd, "%s", joined_expected_output.c_str()); - dprintf(actual_fd, "%s", joined_actual_output.c_str()); + dprintf(expected_fd, "%s\n", joined_expected_output.c_str()); + dprintf(actual_fd, "%s\n", joined_actual_output.c_str()); close(expected_fd); close(actual_fd); pid_t child = fork(); @@ -246,7 +246,7 @@ bool runIndexTests(const std::string &filter_path, bool enable_update) { std::string version = LLVM_VERSION_STRING; // Index tests change based on the version of clang used. - static const char kRequiredClangVersion[] = "6.0.0"; + static const char kRequiredClangVersion[] = "22.0.0git"; if (version != kRequiredClangVersion && version.find("svn") == std::string::npos) { fprintf(stderr, "Index tests must be run using clang version %s, ccls is running " @@ -276,20 +276,16 @@ bool runIndexTests(const std::string &filter_path, bool enable_update) { lines_with_endings.push_back(line); } TextReplacer text_replacer; - std::vector flags; + std::vector args{"-std=c++20", "-resource-dir=" + getDefaultResourceDirectory(), path}; std::unordered_map all_expected_output; - parseTestExpectation(path, lines_with_endings, &text_replacer, &flags, &all_expected_output); - - // Build flags. - flags.push_back("-resource-dir=" + getDefaultResourceDirectory()); - flags.push_back(path); + parseTestExpectation(path, lines_with_endings, &text_replacer, &args, &all_expected_output); // Run test. g_config = new Config; VFS vfs; WorkingFiles wfiles; std::vector cargs; - for (auto &arg : flags) + for (auto &arg : args) cargs.push_back(arg.c_str()); bool ok; auto result = ccls::idx::index(&wfiles, &vfs, "", path, cargs, {}, true, ok);