Misc improvement to indexer

* Make CXXConstructor span one more column to left/right
* Use OrigD to collect Decl::Record members
* Better comment parsing
* Limit lines of initializers and macro definition to 3
* Attribute macro arg uses to spelling loc
* Remove FuncDef::declaring_type

index_tests/constructors/constructor.cc

@@ -23,11 +23,10 @@ OUTPUT:
       "declarations": [],
       "spell": "3:3-3:6|15041163540773201510|2|1026",
       "extent": "3:3-3:11|15041163540773201510|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
-      "uses": ["7:7-7:8|15041163540773201510|2|16420", "8:17-8:20|15041163540773201510|2|16420"],
+      "uses": ["7:7-7:8|15041163540773201510|2|16676", "8:17-8:20|15041163540773201510|2|16676"],
       "callees": []
     }, {
       "usr": 4259594751088586730,
@@ -39,7 +38,6 @@ OUTPUT:
       "declarations": [],
       "spell": "6:6-6:9|0|1|2",
       "extent": "6:1-9:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [10983126130596230582, 17165811951126099095],

index_tests/constructors/destructor.cc

@@ -28,11 +28,10 @@ OUTPUT:
       "declarations": [],
       "spell": "3:3-3:6|15041163540773201510|2|1026",
       "extent": "3:3-3:11|15041163540773201510|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
-      "uses": ["8:7-8:8|15041163540773201510|2|16420"],
+      "uses": ["8:7-8:8|15041163540773201510|2|16676"],
       "callees": []
     }, {
       "usr": 4259594751088586730,
@@ -44,7 +43,6 @@ OUTPUT:
       "declarations": [],
       "spell": "7:6-7:9|0|1|2",
       "extent": "7:1-9:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [1893354193220338759],
@@ -60,7 +58,6 @@ OUTPUT:
       "declarations": [],
       "spell": "4:3-4:4|15041163540773201510|2|1026",
       "extent": "4:3-4:12|15041163540773201510|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/constructors/implicit_constructor.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:6-5:10|0|1|2",
       "extent": "5:1-8:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [449111627548814328, 17097499197730163115],
@@ -38,11 +37,10 @@ OUTPUT:
       "declarations": [],
       "spell": "2:3-2:7|13487927231218873822|2|1026",
       "extent": "2:3-2:12|13487927231218873822|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
-      "uses": ["6:8-6:12|13487927231218873822|2|16420", "7:15-7:19|13487927231218873822|2|16420"],
+      "uses": ["6:8-6:12|13487927231218873822|2|16676", "7:15-7:19|13487927231218873822|2|16676"],
       "callees": []
     }],
   "usr2type": [{

index_tests/constructors/invalid_reference.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": [],
       "spell": "4:6-4:9|15041163540773201510|2|1026",
       "extent": "4:1-4:11|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/constructors/make_functions.cc

@@ -38,7 +38,6 @@ OUTPUT: make_functions.h
       "declarations": [],
       "spell": "7:3-7:9|14935975554338052500|2|1026",
       "extent": "7:3-7:32|14935975554338052500|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -54,7 +53,6 @@ OUTPUT: make_functions.h
       "declarations": [],
       "spell": "6:3-6:9|14935975554338052500|2|1026",
       "extent": "6:3-6:17|14935975554338052500|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -70,7 +68,6 @@ OUTPUT: make_functions.h
       "declarations": [],
       "spell": "5:3-5:9|14935975554338052500|2|1026",
       "extent": "5:3-5:14|14935975554338052500|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -86,7 +83,6 @@ OUTPUT: make_functions.h
       "declarations": [],
       "spell": "8:3-8:9|14935975554338052500|2|1026",
       "extent": "8:3-8:30|14935975554338052500|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -145,7 +141,6 @@ OUTPUT: make_functions.cc
       "kind": 0,
       "storage": 0,
       "declarations": [],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [2555873744476712860, 2555873744476712860, 2555873744476712860],
@@ -161,7 +156,6 @@ OUTPUT: make_functions.cc
       "declarations": [],
       "spell": "9:4-9:15|0|1|2",
       "extent": "9:1-11:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [3908732770590594660],
@@ -177,7 +171,6 @@ OUTPUT: make_functions.cc
       "declarations": [],
       "spell": "13:6-13:14|0|1|2",
       "extent": "13:1-18:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -191,7 +184,6 @@ OUTPUT: make_functions.cc
       "kind": 0,
       "storage": 0,
       "declarations": [],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [16395392342608151399],
@@ -205,7 +197,6 @@ OUTPUT: make_functions.cc
       "kind": 0,
       "storage": 0,
       "declarations": [],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [180270746871803062, 180270746871803062, 180270746871803062],
@@ -221,7 +212,6 @@ OUTPUT: make_functions.cc
       "declarations": [],
       "spell": "4:4-4:14|0|1|2",
       "extent": "4:1-6:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [8463700030555379526],

index_tests/declaration_vs_definition/func.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "declarations": ["1:6-1:9|0|1|1", "2:6-2:9|0|1|1", "4:6-4:9|0|1|1"],
       "spell": "3:6-3:9|0|1|2",
       "extent": "3:1-3:14|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/declaration_vs_definition/func_associated_function_params.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "declarations": ["1:5-1:8|0|1|1", "2:5-2:8|0|1|1", "4:5-4:8|0|1|1"],
       "spell": "5:5-5:8|0|1|2",
       "extent": "5:1-5:36|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [14555488990109936920, 10963664335057337329],

index_tests/declaration_vs_definition/method.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["2:8-2:16|15041163540773201510|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -33,7 +32,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["3:16-3:27|15041163540773201510|2|1089"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -49,7 +47,6 @@ OUTPUT:
       "declarations": ["4:8-4:11|15041163540773201510|2|1025"],
       "spell": "7:11-7:14|15041163540773201510|2|1026",
       "extent": "7:1-7:19|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/function_declaration.cc

@@ -13,7 +13,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["1:6-1:9|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/function_declaration_definition.cc

@@ -17,7 +17,6 @@ OUTPUT:
       "declarations": ["1:6-1:9|0|1|1"],
       "spell": "3:6-3:9|0|1|2",
       "extent": "3:1-3:14|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/function_definition.cc

@@ -15,7 +15,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:9|0|1|2",
       "extent": "1:1-1:14|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/inheritance/function_override.cc

@@ -20,7 +20,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:8-5:11|10963370434658308541|2|5186",
       "extent": "5:3-5:25|10963370434658308541|2|0",
-      "declaring_type": 0,
       "bases": [9948027785633571339],
       "derived": [],
       "vars": [],
@@ -34,7 +33,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["2:16-2:19|3897841498936210886|2|1089"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [6666242542855173890],
       "vars": [],

index_tests/inheritance/interface_pure_virtual.cc

@@ -15,7 +15,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["2:16-2:19|9949214233977131946|2|1089"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/inheritance/multiple_base_functions.cc

@@ -23,7 +23,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:11-5:12|15826803741381445676|2|1090",
       "extent": "5:3-5:23|15826803741381445676|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -39,7 +38,6 @@ OUTPUT:
       "declarations": [],
       "spell": "8:3-8:4|10963370434658308541|2|5186",
       "extent": "8:3-8:26|10963370434658308541|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -55,7 +53,6 @@ OUTPUT:
       "declarations": [],
       "spell": "2:11-2:12|11628904180681204356|2|1090",
       "extent": "2:3-2:23|11628904180681204356|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/lambdas/lambda.cc

@@ -26,7 +26,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:9|0|1|2",
       "extent": "1:1-12:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [12666114896600231317, 2981279427664991319],
@@ -40,7 +39,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": [],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -85,7 +83,7 @@ OUTPUT:
       "detailed_name": "(lambda) dosomething",
       "qual_name_offset": 9,
       "short_name": "dosomething",
-      "hover": "(lambda) dosomething = [&x](int y) {\n    ++x;\n    ++y;\n  }",
+      "hover": "(lambda) dosomething",
       "declarations": [],
       "spell": "4:8-4:19|4259594751088586730|3|2",
       "extent": "4:3-7:4|4259594751088586730|3|0",

index_tests/macros/complex.cc

@@ -26,7 +26,6 @@ OUTPUT:
       "declarations": ["12:1-12:20|0|1|1"],
       "spell": "12:1-12:20|0|1|2",
       "extent": "1:1-1:1|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -42,11 +41,10 @@ OUTPUT:
       "declarations": [],
       "spell": "6:5-6:10|0|1|2",
       "extent": "6:1-8:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
-      "uses": ["12:1-12:20|0|1|16420", "12:5-12:10|0|1|64|0"],
+      "uses": ["12:5-12:10|0|1|16420"],
       "callees": []
     }],
   "usr2type": [{
@@ -75,7 +73,7 @@ OUTPUT:
       "spell": "9:11-9:16|0|1|2",
       "extent": "9:1-9:20|0|1|0",
       "type": 53,
-      "uses": ["12:1-12:20|0|1|12", "12:14-12:19|0|1|64|0"],
+      "uses": ["12:14-12:19|0|1|12"],
       "kind": 13,
       "storage": 0
     }, {

index_tests/macros/foo.cc

@@ -20,9 +20,8 @@ OUTPUT:
       "kind": 9,
       "storage": 0,
       "declarations": [],
-      "spell": "5:3-5:16|15041163540773201510|2|1026",
+      "spell": "5:12-5:15|15041163540773201510|2|1026",
       "extent": "1:1-1:1|15041163540773201510|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -60,7 +59,7 @@ OUTPUT:
       "funcs": [13788753348312146871],
       "vars": [],
       "instances": [],
-      "uses": ["5:3-5:16|0|1|4", "5:12-5:15|0|1|64|0"]
+      "uses": ["5:12-5:15|0|1|4"]
     }],
   "usr2var": [{
       "usr": 1569772797058982873,

index_tests/method_declaration.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["2:8-2:11|15041163540773201510|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/method_definition.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "declarations": ["2:8-2:11|15041163540773201510|2|1025"],
       "spell": "5:11-5:14|15041163540773201510|2|1026",
       "extent": "5:1-5:25|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/method_inline_declaration.cc

@@ -17,7 +17,6 @@ OUTPUT:
       "declarations": [],
       "spell": "2:8-2:11|15041163540773201510|2|1026",
       "extent": "2:3-2:16|15041163540773201510|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/multi_file/impl.cc

@@ -19,7 +19,6 @@ OUTPUT: header.h
       "declarations": [],
       "spell": "10:6-10:10|0|1|2",
       "extent": "10:1-10:15|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -209,7 +208,6 @@ OUTPUT: impl.cc
       "declarations": [],
       "spell": "3:6-3:10|0|1|2",
       "extent": "3:1-5:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -223,7 +221,6 @@ OUTPUT: impl.cc
       "kind": 12,
       "storage": 0,
       "declarations": [],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/multi_file/simple_impl.cc

@@ -17,7 +17,6 @@ OUTPUT: simple_header.h
       "kind": 12,
       "storage": 0,
       "declarations": ["3:6-3:12|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -44,7 +43,6 @@ OUTPUT: simple_impl.cc
       "declarations": [],
       "spell": "3:6-3:10|0|1|2",
       "extent": "3:1-5:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -58,7 +56,6 @@ OUTPUT: simple_impl.cc
       "kind": 12,
       "storage": 0,
       "declarations": [],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/multi_file/static.cc

@@ -15,7 +15,6 @@ OUTPUT: static.h
       "kind": 6,
       "storage": 0,
       "declarations": ["4:15-4:33|9411323049603567600|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -59,7 +58,6 @@ OUTPUT: static.cc
       "declarations": [],
       "spell": "3:14-3:32|9411323049603567600|2|1026",
       "extent": "3:1-3:37|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/namespaces/anonymous_function.cc

@@ -15,7 +15,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["2:6-2:9|7144845543074395457|2|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/namespaces/function_declaration.cc

@@ -15,7 +15,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["2:6-2:9|2029211996748007610|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/namespaces/function_definition.cc

@@ -17,7 +17,6 @@ OUTPUT:
       "declarations": [],
       "spell": "2:6-2:9|2029211996748007610|2|1026",
       "extent": "2:1-2:14|2029211996748007610|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/namespaces/method_declaration.cc

@@ -17,7 +17,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["3:8-3:11|4508214972876735896|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/namespaces/method_definition.cc

@@ -21,7 +21,6 @@ OUTPUT:
       "declarations": ["3:8-3:11|4508214972876735896|2|1025"],
       "spell": "6:11-6:14|4508214972876735896|2|1026",
       "extent": "6:1-6:19|2029211996748007610|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/namespaces/method_inline_declaration.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:8-3:11|4508214972876735896|2|1026",
       "extent": "3:3-3:16|4508214972876735896|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/namespaces/namespace_alias.cc

@@ -28,7 +28,6 @@ OUTPUT:
       "declarations": [],
       "spell": "11:6-11:10|0|1|2",
       "extent": "11:1-14:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [6030927277961448585, 7657277353101371136],

index_tests/namespaces/namespace_reference.cc

@@ -24,7 +24,6 @@ OUTPUT:
       "declarations": [],
       "spell": "6:6-6:12|0|1|2",
       "extent": "6:1-10:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -40,7 +39,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:8-3:14|11072669167287398027|2|1026",
       "extent": "3:3-3:24|11072669167287398027|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [3649375698083002347],

index_tests/operators/operator.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["3:8-3:16|15041163540773201510|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -33,7 +32,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["4:7-4:15|15041163540773201510|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -49,7 +47,6 @@ OUTPUT:
       "declarations": [],
       "spell": "2:8-2:16|15041163540773201510|2|1026",
       "extent": "2:3-2:27|15041163540773201510|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -63,7 +60,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["7:6-7:14|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/outline/static_function_in_type.cc

@@ -19,7 +19,6 @@ OUTPUT: static_function_in_type.h
       "kind": 6,
       "storage": 0,
       "declarations": ["6:15-6:23|17262466801709381811|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -94,7 +93,6 @@ OUTPUT: static_function_in_type.cc
       "declarations": [],
       "spell": "5:11-5:19|17262466801709381811|2|1026",
       "extent": "5:1-6:2|11072669167287398027|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [13569879755236306838],

index_tests/templates/func_specialized_template_param.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": ["5:8-5:11|15041163540773201510|2|1025"],
       "spell": "8:11-8:14|15041163540773201510|2|1026",
       "extent": "8:1-8:36|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/templates/member_ref_in_template.cc

@@ -35,7 +35,6 @@ OUTPUT:
       "declarations": [],
       "spell": "8:6-8:9|0|1|2",
       "extent": "8:1-8:11|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -49,7 +48,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["4:8-4:11|8402783583255987702|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc

@@ -26,7 +26,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:16-5:19|14042997404480181958|2|1026",
       "extent": "5:5-7:6|14042997404480181958|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/templates/specialization.cc

@@ -55,7 +55,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["43:6-43:9|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -69,7 +68,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["27:8-27:13|1663022413889915338|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -85,7 +83,6 @@ OUTPUT:
       "declarations": [],
       "spell": "39:6-39:9|0|1|2",
       "extent": "39:1-39:21|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [17826688417349629938],
@@ -99,7 +96,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["13:8-13:13|7440942986741176606|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/templates/specialized_func_definition.cc

@@ -32,7 +32,6 @@ OUTPUT:
       "declarations": [],
       "spell": "10:22-10:25|17649312483543982122|2|1026",
       "extent": "9:1-10:30|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -48,7 +47,6 @@ OUTPUT:
       "declarations": ["3:8-3:11|17107291254533526269|2|1025"],
       "spell": "7:19-7:22|17107291254533526269|2|1026",
       "extent": "6:1-7:24|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/templates/template_class_func_usage_folded_into_one.cc

@@ -23,7 +23,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:14-3:17|10528472276654770367|2|1026",
       "extent": "3:3-5:4|10528472276654770367|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/templates/template_class_template_func_usage_folded_into_one.cc

@@ -24,7 +24,6 @@ OUTPUT:
       "declarations": [],
       "spell": "4:14-4:17|10528472276654770367|2|1026",
       "extent": "4:3-6:4|10528472276654770367|2|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/templates/template_func_usage_folded_into_one.cc

@@ -24,7 +24,6 @@ OUTPUT:
       "declarations": [],
       "spell": "2:12-2:15|0|1|2",
       "extent": "2:1-4:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/types/typedefs.cc

@@ -14,7 +14,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["2:13-2:14|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/unions/union_usage.cc

@@ -26,7 +26,6 @@ OUTPUT:
       "declarations": [],
       "spell": "8:6-8:9|0|1|2",
       "extent": "8:1-10:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_called_from_constructor.cc

@@ -23,7 +23,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:12|0|1|2",
       "extent": "1:1-1:17|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -39,7 +38,6 @@ OUTPUT:
       "declarations": ["4:3-4:6|15041163540773201510|2|1025"],
       "spell": "7:6-7:9|15041163540773201510|2|1026",
       "extent": "7:1-9:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_called_from_macro_argument.cc

@@ -19,11 +19,10 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["3:6-3:12|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
-      "uses": ["6:3-6:33|0|1|16420", "6:14-6:20|0|1|64|0"],
+      "uses": ["6:14-6:20|0|1|16420"],
       "callees": []
     }, {
       "usr": 11404881820527069090,
@@ -35,7 +34,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:6-5:12|0|1|2",
       "extent": "5:1-7:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_called_from_template.cc

@@ -24,7 +24,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["1:6-1:12|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -40,7 +39,6 @@ OUTPUT:
       "declarations": [],
       "spell": "8:6-8:9|0|1|2",
       "extent": "8:1-10:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -56,7 +54,6 @@ OUTPUT:
       "declarations": [],
       "spell": "4:6-4:12|0|1|2",
       "extent": "4:1-6:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_called_implicit_ctor.cc

@@ -23,7 +23,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:5-5:11|0|1|2",
       "extent": "5:1-5:27|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -37,11 +36,10 @@ OUTPUT:
       "kind": 9,
       "storage": 0,
       "declarations": ["2:3-2:10|13611487872560323389|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
-      "uses": ["8:10-8:16|13611487872560323389|2|16420"],
+      "uses": ["8:10-8:16|13611487872560323389|2|16676"],
       "callees": []
     }, {
       "usr": 11404881820527069090,
@@ -53,7 +51,6 @@ OUTPUT:
       "declarations": [],
       "spell": "7:9-7:15|0|1|2",
       "extent": "7:1-9:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_usage_addr_func.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:6-3:10|0|1|2",
       "extent": "3:1-3:15|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -38,7 +37,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:6-5:10|0|1|2",
       "extent": "5:1-8:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [16088407831770615719],
@@ -54,7 +52,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:13|0|1|2",
       "extent": "1:1-1:28|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_usage_addr_method.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:6-5:10|0|1|2",
       "extent": "5:1-7:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [4636142131003982569],
@@ -36,7 +35,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["2:8-2:12|15041163540773201510|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_usage_call_func.cc

@@ -18,7 +18,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:12|0|1|2",
       "extent": "1:1-1:17|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -34,7 +33,6 @@ OUTPUT:
       "declarations": [],
       "spell": "2:6-2:12|0|1|2",
       "extent": "2:1-4:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_usage_call_method.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:6-5:10|0|1|2",
       "extent": "5:1-8:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [14045150712868309451],
@@ -36,7 +35,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["2:8-2:12|15041163540773201510|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_usage_class_inline_var_def.cc

@@ -21,7 +21,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:12-1:18|0|1|2",
       "extent": "1:1-3:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_usage_forward_decl_func.cc

@@ -16,7 +16,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["1:6-1:9|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -32,7 +31,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:6-3:11|0|1|2",
       "extent": "3:1-5:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_usage_forward_decl_method.cc

@@ -21,7 +21,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:6-5:11|0|1|2",
       "extent": "5:1-8:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [16229832321010999607],
@@ -35,7 +34,6 @@ OUTPUT:
       "kind": 6,
       "storage": 0,
       "declarations": ["2:8-2:11|15041163540773201510|2|1025"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/func_usage_template_func.cc

@@ -21,7 +21,6 @@ OUTPUT:
       "declarations": [],
       "spell": "4:6-4:9|0|1|2",
       "extent": "4:1-7:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -35,7 +34,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["2:6-2:12|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/type_usage_as_template_parameter.cc

@@ -25,7 +25,6 @@ OUTPUT:
       "declarations": [],
       "spell": "9:16-9:27|0|1|2",
       "extent": "9:1-12:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [3364438781074774169],

index_tests/usage/type_usage_as_template_parameter_complex.cc

@@ -93,7 +93,6 @@ OUTPUT:
       "declarations": [],
       "spell": "33:37-33:51|0|1|2",
       "extent": "33:1-33:92|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -109,7 +108,6 @@ OUTPUT:
       "declarations": [],
       "spell": "40:6-40:20|0|1|2",
       "extent": "40:1-40:28|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -125,7 +123,6 @@ OUTPUT:
       "declarations": ["65:23-65:26|15041163540773201510|2|1025"],
       "spell": "79:26-79:29|15041163540773201510|2|1026",
       "extent": "79:1-79:51|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -141,7 +138,6 @@ OUTPUT:
       "declarations": [],
       "spell": "53:6-53:11|0|1|2",
       "extent": "53:1-55:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [500112618220246],

index_tests/usage/type_usage_declare_local.cc

@@ -21,7 +21,6 @@ OUTPUT:
       "declarations": [],
       "spell": "4:6-4:9|0|1|2",
       "extent": "4:1-7:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [16374832544037266261, 2580122838476012357],

index_tests/usage/type_usage_declare_param.cc

@@ -18,7 +18,6 @@ OUTPUT:
       "declarations": [],
       "spell": "4:6-4:9|0|1|2",
       "extent": "4:1-4:47|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [13058491096576226774, 11055777568039014776],

index_tests/usage/type_usage_declare_param_prototype.cc

@@ -23,7 +23,6 @@ OUTPUT:
       "declarations": ["3:6-3:9|0|1|1"],
       "spell": "4:6-4:9|0|1|2",
       "extent": "4:1-4:26|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [13823260660189154978],

index_tests/usage/type_usage_declare_param_unnamed.cc

@@ -15,7 +15,6 @@ OUTPUT:
       "declarations": [],
       "spell": "2:6-2:9|0|1|2",
       "extent": "2:1-2:26|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/type_usage_declare_qualifiers.cc

@@ -21,7 +21,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:6-3:9|0|1|2",
       "extent": "3:1-8:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [7997456978847868736, 17228576662112939520, 15429032129697337561, 6081981442495435784, 5004072032239834773, 14939253431683105646],

index_tests/usage/type_usage_on_return_type.cc

@@ -32,7 +32,6 @@ OUTPUT:
       "declarations": ["9:8-9:13|15041163540773201510|2|1025"],
       "spell": "13:11-13:16|15041163540773201510|2|1026",
       "extent": "13:1-13:21|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -48,7 +47,6 @@ OUTPUT:
       "declarations": ["3:7-3:10|0|1|1", "4:7-4:10|0|1|1"],
       "spell": "5:7-5:10|0|1|2",
       "extent": "5:1-5:32|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -62,7 +60,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["15:20-15:28|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -78,7 +75,6 @@ OUTPUT:
       "declarations": ["8:9-8:12|15041163540773201510|2|1025"],
       "spell": "12:12-12:15|15041163540773201510|2|1026",
       "extent": "12:1-12:40|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -94,7 +90,6 @@ OUTPUT:
       "declarations": ["17:14-17:17|0|1|1"],
       "spell": "18:14-18:17|0|1|2",
       "extent": "18:1-18:39|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/type_usage_typedef_and_using.cc

@@ -24,7 +24,6 @@ OUTPUT:
       "declarations": [],
       "spell": "8:6-8:13|0|1|2",
       "extent": "8:1-8:23|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -40,7 +39,6 @@ OUTPUT:
       "declarations": [],
       "spell": "7:6-7:12|0|1|2",
       "extent": "7:1-7:21|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -56,7 +54,6 @@ OUTPUT:
       "declarations": [],
       "spell": "9:6-9:13|0|1|2",
       "extent": "9:1-9:23|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -72,7 +69,6 @@ OUTPUT:
       "declarations": [],
       "spell": "10:6-10:13|0|1|2",
       "extent": "10:1-10:23|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/type_usage_various.cc

@@ -24,7 +24,6 @@ OUTPUT:
       "declarations": ["2:8-2:12|15041163540773201510|2|1025"],
       "spell": "5:11-5:15|15041163540773201510|2|1026",
       "extent": "5:1-8:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [16380484338511689669],

index_tests/usage/usage_inside_of_call.cc

@@ -29,7 +29,6 @@ OUTPUT:
       "declarations": [],
       "spell": "12:6-12:9|0|1|2",
       "extent": "12:1-15:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [8039186520399841081],
@@ -43,7 +42,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["3:5-3:8|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -57,7 +55,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["1:6-1:12|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/usage_inside_of_call_simple.cc

@@ -21,7 +21,6 @@ OUTPUT:
       "declarations": [],
       "spell": "5:6-5:9|0|1|2",
       "extent": "5:1-7:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -37,7 +36,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:5-3:8|0|1|2",
       "extent": "3:1-3:24|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -51,7 +49,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["1:6-1:12|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/var_usage_call_function.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:12|0|1|2",
       "extent": "1:1-1:17|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -38,7 +37,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:6-3:12|0|1|2",
       "extent": "3:1-8:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [9121974011454213596],

index_tests/usage/var_usage_class_member.cc

@@ -32,7 +32,6 @@ OUTPUT:
       "declarations": [],
       "spell": "10:6-10:9|0|1|2",
       "extent": "10:1-18:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [14669930844300034456],
@@ -46,7 +45,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["8:6-8:12|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -60,7 +58,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["7:6-7:12|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/var_usage_class_member_static.cc

@@ -23,7 +23,6 @@ OUTPUT:
       "declarations": [],
       "spell": "7:6-7:9|0|1|2",
       "extent": "7:1-9:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],
@@ -37,7 +36,6 @@ OUTPUT:
       "kind": 12,
       "storage": 0,
       "declarations": ["5:6-5:12|0|1|1"],
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/var_usage_extern.cc

@@ -18,7 +18,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:6-3:9|0|1|2",
       "extent": "3:1-5:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/usage/var_usage_func_parameter.cc

@@ -16,7 +16,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:9|0|1|2",
       "extent": "1:1-3:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [10063793875496522529],

index_tests/usage/var_usage_local.cc

@@ -17,7 +17,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:9|0|1|2",
       "extent": "1:1-4:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [14014650769929566957],

index_tests/usage/var_usage_shadowed_local.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:9|0|1|2",
       "extent": "1:1-9:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [13311055950748663970, 14036425367303419504],

index_tests/usage/var_usage_shadowed_parameter.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:9|0|1|2",
       "extent": "1:1-8:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [11608231465452906059, 6997229590862003559],

index_tests/usage/var_usage_static.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:6-3:9|0|1|2",
       "extent": "3:1-5:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/vars/deduce_auto_type.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "declarations": [],
       "spell": "2:6-2:7|0|1|2",
       "extent": "2:1-5:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [10601729374837386290, 18422884837902130475],

index_tests/vars/function_local.cc

@@ -19,7 +19,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:6-3:9|0|1|2",
       "extent": "3:1-5:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [13198746475679542317],

index_tests/vars/function_param.cc

@@ -17,7 +17,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:6-3:9|0|1|2",
       "extent": "3:1-3:30|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [8730439006497971620, 2525014371090380500],

index_tests/vars/function_param_unnamed.cc

@@ -14,7 +14,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:9|0|1|2",
       "extent": "1:1-1:22|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [],

index_tests/vars/function_shadow_local.cc

@@ -22,7 +22,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:9|0|1|2",
       "extent": "1:1-9:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [1894874819807168345, 4508045017817092115],

index_tests/vars/function_shadow_param.cc

@@ -16,7 +16,6 @@ OUTPUT:
       "declarations": [],
       "spell": "1:6-1:9|0|1|2",
       "extent": "1:1-3:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [5875271969926422921, 11404600766177939811],

index_tests/vars/type_instance_on_using_type.cc

@@ -21,7 +21,6 @@ OUTPUT:
       "declarations": [],
       "spell": "3:6-3:9|0|1|2",
       "extent": "3:1-5:2|0|1|0",
-      "declaring_type": 0,
       "bases": [],
       "derived": [],
       "vars": [6975456769752895964],

src/clang_complete.cc

@@ -505,10 +505,11 @@ void DiagnosticQueryMain(ClangCompleteManager *manager) {
                                        E = tu->Unit->stored_diag_end();
          I != E; ++I) {
       FullSourceLoc FLoc = I->getLocation();
-      const auto &SM = FLoc.getManager();
+      if (!FLoc.isValid()) // why?
-
+        continue;
-      const FileEntry *FE = SM.getFileEntryForID(SM.getFileID(FLoc));
+      const FileEntry *FE = FLoc.getFileEntry();
       if (!FE || FileName(*FE) != path) continue;
+      const auto &SM = FLoc.getManager();
       SourceRange R;
       for (const auto &CR : I->getRanges()) {
         auto RT = Lexer::makeFileCharRange(CR, SM, LangOpts);

src/indexer.cc

@@ -30,6 +30,8 @@ using llvm::Timer;
 
 namespace {
 
+constexpr int kInitializerMaxLines = 3;
+
 struct IndexParam {
   std::unordered_map<llvm::sys::fs::UniqueID, std::string> SeenUniqueID;
   std::unordered_map<std::string, FileContents> file_contents;
@@ -327,7 +329,7 @@ public:
       if (pad < 0) {
         // First line, detect the length of comment marker and put into |pad|
         const char *begin = p;
-        while (p < E && (*p == '/' || *p == '*'))
+        while (p < E && (*p == '/' || *p == '*' || *p == '-' || *p == '='))
           p++;
         if (p < E && (*p == '<' || *p == '!'))
           p++;
@@ -485,9 +487,11 @@ public:
       if (!SM.isBeforeInTranslationUnit(L, R.getBegin()))
         return;
       StringRef Buf = GetSourceInRange(SM, Lang, R);
-      Twine T =
+      Twine T = Buf.count('\n') <= kInitializerMaxLines - 1
-          def.detailed_name +
+                    ? def.detailed_name + (Buf.size() && Buf[0] == ':'
-          (Buf.size() && Buf[0] == ':' ? Twine(" ", Buf) : Twine(" = ", Buf));
+                                               ? Twine(" ", Buf)
+                                               : Twine(" = ", Buf))
+                    : def.detailed_name;
       def.hover =
           def.storage == SC_Static && strncmp(def.detailed_name, "static ", 7)
               ? Intern(("static " + T).str())
@@ -565,7 +569,8 @@ public:
     LocFID = SM.getFileID(P.first);
     FE = SM.getFileEntryForID(LocFID);
 #else
-    auto R = SM.getExpansionRange(Loc);
+    auto R = SM.isMacroArgExpansion(Loc) ? CharSourceRange::getTokenRange(Spell)
+                                         : SM.getExpansionRange(Loc);
     loc = FromTokenRange(SM, Lang, R.getAsRange());
     LocFID = SM.getFileID(R.getBegin());
     FE = SM.getFileEntryForID(LocFID);
@@ -615,6 +620,9 @@ public:
       return true;
     case SymbolKind::Func:
       func = &db->ToFunc(usr);
+      // Span one more column to the left/right if D is CXXConstructor.
+      if (!is_def && !is_decl && D->getKind() == Decl::CXXConstructor)
+        role = Role(role | Role::Implicit);
       do_def_decl(func);
       if (Spell != Loc)
         AddMacroUse(db, SM, usr, SymbolKind::Func, Spell);
@@ -749,9 +757,10 @@ public:
     case Decl::Enum:
       type->def.kind = lsSymbolKind::Enum;
       break;
-    case Decl::CXXRecord: {
+    case Decl::CXXRecord:
-      auto *RD = cast<CXXRecordDecl>(D);
+      if (is_def) {
-      if (is_def && RD->hasDefinition()) {
+        auto *RD = dyn_cast<CXXRecordDecl>(OrigD);
+        if (RD && RD->hasDefinition()) {
           for (const CXXBaseSpecifier &Base : RD->bases()) {
             QualType T = Base.getType();
             const NamedDecl *BaseD = nullptr;
@@ -774,8 +783,8 @@ public:
         }
       }
       [[fallthrough]];
-    case Decl::Record: {
+    case Decl::Record:
-      auto *RD = cast<RecordDecl>(D);
+      if (auto *RD = dyn_cast<RecordDecl>(OrigD)) {
         // spec has no Union, use Class
         type->def.kind = RD->getTagKind() == TTK_Struct ? lsSymbolKind::Struct
                                                         : lsSymbolKind::Class;
@@ -786,8 +795,8 @@ public:
             type->def.vars.emplace_back(
                 GetUsr(FD), can_get_offset ? Ctx->getFieldOffset(FD) : -1);
         }
-      break;
       }
+      break;
     case Decl::ClassTemplateSpecialization:
     case Decl::ClassTemplatePartialSpecialization:
       type->def.kind = lsSymbolKind::Class;
@@ -957,7 +966,11 @@ public:
       if (var.def.detailed_name[0] == '\0') {
         var.def.detailed_name = Intern(Name);
         var.def.short_name_size = Name.size();
-        var.def.hover = Intern(Twine("#define ", GetSourceInRange(SM, Lang, R)).str());
+        StringRef Buf = GetSourceInRange(SM, Lang, R);
+        var.def.hover =
+            Intern(Buf.count('\n') <= kInitializerMaxLines - 1
+                       ? Twine("#define ", GetSourceInRange(SM, Lang, R)).str()
+                       : Twine("#define ", Name).str());
       }
     }
   }
@@ -1006,7 +1019,7 @@ public:
 }
 
 const int IndexFile::kMajorVersion = 17;
-const int IndexFile::kMinorVersion = 0;
+const int IndexFile::kMinorVersion = 1;
 
 IndexFile::IndexFile(llvm::sys::fs::UniqueID UniqueID, const std::string &path,
                      const std::string &contents)

src/indexer.h

@@ -104,8 +104,6 @@ struct FuncDef : NameMixin<FuncDef> {
   // Functions that this function calls.
   std::vector<SymbolRef> callees;
 
-  // Type which declares this one (ie, it is a method)
-  Usr declaring_type = 0;
   int16_t qual_name_offset = 0;
   int16_t short_name_offset = 0;
   int16_t short_name_size = 0;
@@ -125,7 +123,6 @@ MAKE_REFLECT_STRUCT(FuncDef,
                     comments,
                     spell,
                     extent,
-                    declaring_type,
                     bases,
                     vars,
                     callees);
@@ -202,7 +199,6 @@ struct VarDef : NameMixin<VarDef> {
   // Type of the variable.
   Usr type = 0;
 
-  // Function/type which declares this one.
   int16_t qual_name_offset = 0;
   int16_t short_name_offset = 0;
   int16_t short_name_size = 0;

src/serializer.cc

@@ -292,7 +292,6 @@ void Reflect(TVisitor& visitor, IndexFunc& value) {
   REFLECT_MEMBER2("declarations", value.declarations);
   REFLECT_MEMBER2("spell", value.def.spell);
   REFLECT_MEMBER2("extent", value.def.extent);
-  REFLECT_MEMBER2("declaring_type", value.def.declaring_type);
   REFLECT_MEMBER2("bases", value.def.bases);
   REFLECT_MEMBER2("derived", value.derived);
   REFLECT_MEMBER2("vars", value.def.vars);