mark type definition as interesting

main.cpp

@@ -92,6 +92,12 @@ bool IsEqualTo(const Location& o) {
   return (wrapper.value >> 1) == (o.wrapper.value >> 1);
 }
 
+Location WithInteresting(bool interesting) {
+  Location result = *this;
+  result.interesting = interesting;
+  return result;
+}
+
 END_BITFIELD_TYPE()
 
 struct FileDb {
@@ -1058,8 +1064,8 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) {
     type_def->short_name = decl->entityInfo->name;
     type_def->qualified_name = ns->QualifiedName(decl->semanticContainer, type_def->short_name);
 
-    Location decl_loc = db->file_db.Resolve(decl->loc, false /*interesting*/);
+    Location decl_loc = db->file_db.Resolve(decl->loc, true /*interesting*/);
-    type_def->definition = decl_loc;
+    type_def->definition = decl_loc.WithInteresting(false);
     type_def->AddUsage(decl_loc);
     break;
   }
@@ -1082,8 +1088,8 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) {
     // }
 
     assert(decl->isDefinition);
-    Location decl_loc = db->file_db.Resolve(decl->loc, false /*interesting*/);
+    Location decl_loc = db->file_db.Resolve(decl->loc, true /*interesting*/);
-    type_def->definition = decl_loc;
+    type_def->definition = decl_loc.WithInteresting(false);
     type_def->AddUsage(decl_loc);
 
     //type_def->alias_of

tests/class_forward_declaration.cc

@@ -12,7 +12,7 @@ OUTPUT:
       "short_name": "Foo",
       "qualified_name": "Foo",
       "definition": "1:3:7",
-      "uses": ["1:1:7", "1:2:7", "1:3:7", "1:4:7"]
+      "uses": ["1:1:7", "1:2:7", "*1:3:7", "1:4:7"]
     }],
   "functions": [],
   "variables": []

tests/constructors/constructor.cc

@@ -18,7 +18,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "funcs": [0],
-      "uses": ["1:1:7", "1:3:3", "*1:7:3", "*1:8:3", "*1:8:17"]
+      "uses": ["*1:1:7", "1:3:3", "*1:7:3", "*1:8:3", "*1:8:17"]
     }],
   "functions": [{
       "id": 0,

tests/constructors/destructor.cc

@@ -23,7 +23,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "funcs": [0, 1],
-      "uses": ["1:1:7", "1:3:3", "1:4:3", "*1:8:3"]
+      "uses": ["*1:1:7", "1:3:3", "1:4:3", "*1:8:3"]
     }],
   "functions": [{
       "id": 0,

tests/declaration_vs_definition/class.cc

@@ -14,7 +14,7 @@ OUTPUT:
       "short_name": "Foo",
       "qualified_name": "Foo",
       "definition": "1:3:7",
-      "uses": ["1:1:7", "1:2:7", "1:3:7", "1:4:7"]
+      "uses": ["1:1:7", "1:2:7", "*1:3:7", "1:4:7"]
     }],
   "functions": [],
   "variables": []

tests/declaration_vs_definition/class_member.cc

@@ -12,7 +12,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "vars": [0],
-      "uses": ["1:1:7"]
+      "uses": ["*1:1:7"]
     }],
   "functions": [],
   "variables": [{

tests/declaration_vs_definition/class_member_static.cc

@@ -14,7 +14,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "vars": [0],
-      "uses": ["1:1:7", "1:5:5"]
+      "uses": ["*1:1:7", "1:5:5"]
     }],
   "functions": [],
   "variables": [{

tests/declaration_vs_definition/method.cc

@@ -16,7 +16,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "funcs": [0, 1, 2],
-      "uses": ["1:1:7", "1:7:6"]
+      "uses": ["*1:1:7", "1:7:6"]
     }],
   "functions": [{
       "id": 0,

tests/enums/enum_class_decl.cc

@@ -13,7 +13,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:12",
       "vars": [0, 1],
-      "uses": ["1:1:12"]
+      "uses": ["*1:1:12"]
     }],
   "functions": [],
   "variables": [{

tests/enums/enum_decl.cc

@@ -13,7 +13,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:6",
       "vars": [0, 1],
-      "uses": ["1:1:6"]
+      "uses": ["*1:1:6"]
     }],
   "functions": [],
   "variables": [{

tests/enums/enum_inherit.cc

@@ -13,7 +13,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:6",
       "vars": [0, 1],
-      "uses": ["1:1:6"]
+      "uses": ["*1:1:6"]
     }],
   "functions": [],
   "variables": [{

tests/enums/enum_usage.cc

@@ -15,7 +15,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:12",
       "vars": [0, 1],
-      "uses": ["1:1:12", "*1:6:1", "1:6:9"]
+      "uses": ["*1:1:12", "*1:6:1", "1:6:9"]
     }],
   "functions": [],
   "variables": [{

tests/inheritance/class_inherit.cc

@@ -11,7 +11,7 @@ OUTPUT:
       "qualified_name": "Parent",
       "definition": "1:1:7",
       "derived": [1],
-      "uses": ["1:1:7", "*1:2:24"]
+      "uses": ["*1:1:7", "*1:2:24"]
     }, {
       "id": 1,
       "usr": "c:@S@Derived",
@@ -19,7 +19,7 @@ OUTPUT:
       "qualified_name": "Derived",
       "definition": "1:2:7",
       "parents": [0],
-      "uses": ["1:2:7"]
+      "uses": ["*1:2:7"]
     }],
   "functions": [],
   "variables": []

tests/inheritance/class_inherit_templated_parent.cc

@@ -22,7 +22,7 @@ OUTPUT:
       "qualified_name": "Base1",
       "definition": "1:2:7",
       "derived": [2, 5],
-      "uses": ["1:2:7", "*1:8:18", "*1:13:17"]
+      "uses": ["*1:2:7", "*1:8:18", "*1:13:17"]
     }, {
       "id": 1,
       "usr": "c:@ST>1#T@Base2",
@@ -30,7 +30,7 @@ OUTPUT:
       "qualified_name": "Base2",
       "definition": "1:5:7",
       "derived": [3, 5],
-      "uses": ["1:5:7", "*1:11:18", "*1:13:27"]
+      "uses": ["*1:5:7", "*1:11:18", "*1:13:27"]
     }, {
       "id": 2,
       "usr": "c:@ST>1#Ni@Derived1",
@@ -39,7 +39,7 @@ OUTPUT:
       "definition": "1:8:7",
       "parents": [0],
       "derived": [5],
-      "uses": ["1:8:7", "*1:13:43"]
+      "uses": ["*1:8:7", "*1:13:43"]
     }, {
       "id": 3,
       "usr": "c:@ST>1#T@Derived2",
@@ -48,7 +48,7 @@ OUTPUT:
       "definition": "1:11:7",
       "parents": [1],
       "derived": [5],
-      "uses": ["1:11:7", "*1:13:56"]
+      "uses": ["*1:11:7", "*1:13:56"]
     }, {
       "id": 4,
       "usr": "c:class_inherit_templated_parent.cc@154",
@@ -60,7 +60,7 @@ OUTPUT:
       "qualified_name": "Derived",
       "definition": "1:13:7",
       "parents": [0, 1, 2, 3],
-      "uses": ["1:13:7", "*1:13:33", "*1:13:65"]
+      "uses": ["*1:13:7", "*1:13:33", "*1:13:65"]
     }],
   "functions": [],
   "variables": []

tests/inheritance/class_multiple_inherit.cc

@@ -13,7 +13,7 @@ OUTPUT:
       "qualified_name": "Root",
       "definition": "1:1:7",
       "derived": [1, 2],
-      "uses": ["1:1:7", "*1:2:24", "*1:3:24"]
+      "uses": ["*1:1:7", "*1:2:24", "*1:3:24"]
     }, {
       "id": 1,
       "usr": "c:@S@MiddleA",
@@ -22,7 +22,7 @@ OUTPUT:
       "definition": "1:2:7",
       "parents": [0],
       "derived": [3],
-      "uses": ["1:2:7", "*1:4:24"]
+      "uses": ["*1:2:7", "*1:4:24"]
     }, {
       "id": 2,
       "usr": "c:@S@MiddleB",
@@ -31,7 +31,7 @@ OUTPUT:
       "definition": "1:3:7",
       "parents": [0],
       "derived": [3],
-      "uses": ["1:3:7", "*1:4:40"]
+      "uses": ["*1:3:7", "*1:4:40"]
     }, {
       "id": 3,
       "usr": "c:@S@Derived",
@@ -39,7 +39,7 @@ OUTPUT:
       "qualified_name": "Derived",
       "definition": "1:4:7",
       "parents": [1, 2],
-      "uses": ["1:4:7"]
+      "uses": ["*1:4:7"]
     }],
   "functions": [],
   "variables": []

tests/inheritance/function_override.cc

@@ -16,7 +16,7 @@ OUTPUT:
       "definition": "1:1:7",
       "derived": [1],
       "funcs": [0],
-      "uses": ["1:1:7", "*1:4:24"]
+      "uses": ["*1:1:7", "*1:4:24"]
     }, {
       "id": 1,
       "usr": "c:@S@Derived",
@@ -25,7 +25,7 @@ OUTPUT:
       "definition": "1:4:7",
       "parents": [0],
       "funcs": [1],
-      "uses": ["1:4:7"]
+      "uses": ["*1:4:7"]
     }],
   "functions": [{
       "id": 0,

tests/inheritance/interface_pure_virtual.cc

@@ -12,7 +12,7 @@ OUTPUT:
       "qualified_name": "IFoo",
       "definition": "1:1:7",
       "funcs": [0],
-      "uses": ["1:1:7"]
+      "uses": ["*1:1:7"]
     }],
   "functions": [{
       "id": 0,

tests/method_declaration.cc

@@ -16,7 +16,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "funcs": [0],
-      "uses": ["1:1:7"]
+      "uses": ["*1:1:7"]
     }],
   "functions": [{
       "id": 0,

tests/method_definition.cc

@@ -14,7 +14,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "funcs": [0],
-      "uses": ["1:1:7", "1:5:6"]
+      "uses": ["*1:1:7", "1:5:6"]
     }],
   "functions": [{
       "id": 0,

tests/method_inline_declaration.cc

@@ -12,7 +12,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "funcs": [0],
-      "uses": ["1:1:7"]
+      "uses": ["*1:1:7"]
     }],
   "functions": [{
       "id": 0,

tests/namespaces/method_declaration.cc

@@ -14,7 +14,7 @@ OUTPUT:
       "qualified_name": "hello::Foo",
       "definition": "1:2:7",
       "funcs": [0],
-      "uses": ["1:2:7"]
+      "uses": ["*1:2:7"]
     }],
   "functions": [{
       "id": 0,

tests/namespaces/method_definition.cc

@@ -16,7 +16,7 @@ OUTPUT:
       "qualified_name": "hello::Foo",
       "definition": "1:2:7",
       "funcs": [0],
-      "uses": ["1:2:7", "1:6:6"]
+      "uses": ["*1:2:7", "1:6:6"]
     }],
   "functions": [{
       "id": 0,

tests/namespaces/method_inline_declaration.cc

@@ -14,7 +14,7 @@ OUTPUT:
       "qualified_name": "hello::Foo",
       "definition": "1:2:7",
       "funcs": [0],
-      "uses": ["1:2:7"]
+      "uses": ["*1:2:7"]
     }],
   "functions": [{
       "id": 0,

tests/unions/union_decl.cc

@@ -13,7 +13,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "vars": [0, 1],
-      "uses": ["1:1:7"]
+      "uses": ["*1:1:7"]
     }],
   "functions": [],
   "variables": [{

tests/unions/union_usage.cc

@@ -19,7 +19,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "vars": [0, 1],
-      "uses": ["1:1:7", "*1:6:1", "*1:8:10"]
+      "uses": ["*1:1:7", "*1:6:1", "*1:8:10"]
     }],
   "functions": [{
       "id": 0,

tests/usage/func_usage_addr_method.cc

@@ -17,7 +17,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:8",
       "funcs": [0],
-      "uses": ["1:1:8", "1:6:13"]
+      "uses": ["*1:1:8", "1:6:13"]
     }],
   "functions": [{
       "id": 0,

tests/usage/func_usage_call_method.cc

@@ -17,7 +17,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:8",
       "funcs": [0],
-      "uses": ["1:1:8", "*1:6:3"]
+      "uses": ["*1:1:8", "*1:6:3"]
     }],
   "functions": [{
       "id": 0,

tests/usage/func_usage_class_inline_var_def.cc

@@ -16,7 +16,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:5:7",
       "vars": [0],
-      "uses": ["1:5:7"]
+      "uses": ["*1:5:7"]
     }],
   "functions": [{
       "id": 0,

tests/usage/func_usage_forward_decl_method.cc

@@ -16,7 +16,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:8",
       "funcs": [0],
-      "uses": ["1:1:8", "*1:6:3"]
+      "uses": ["*1:1:8", "*1:6:3"]
     }],
   "functions": [{
       "id": 0,

tests/usage/type_usage_as_template_parameter.cc

@@ -23,7 +23,7 @@ OUTPUT:
       "short_name": "S",
       "qualified_name": "S",
       "definition": "1:4:8",
-      "uses": ["1:4:8", "*1:7:19", "*1:9:12", "*1:10:14"]
+      "uses": ["*1:4:8", "*1:7:19", "*1:9:12", "*1:10:14"]
     }],
   "functions": [{
       "id": 0,

tests/usage/type_usage_as_template_parameter_complex.cc

@@ -100,7 +100,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:64:7",
       "funcs": [3],
-      "uses": ["1:64:7", "1:79:21"]
+      "uses": ["*1:64:7", "1:79:21"]
     }],
   "functions": [{
       "id": 0,

tests/usage/type_usage_as_template_parameter_simple.cc

@@ -14,7 +14,7 @@ OUTPUT:
       "short_name": "unique_ptr",
       "qualified_name": "unique_ptr",
       "definition": "1:2:7",
-      "uses": ["1:2:7", "*1:6:8"]
+      "uses": ["*1:2:7", "*1:6:8"]
     }, {
       "id": 1,
       "usr": "c:@S@S",

tests/usage/type_usage_declare_extern.cc

@@ -10,7 +10,7 @@ OUTPUT:
       "short_name": "T",
       "qualified_name": "T",
       "definition": "1:1:8",
-      "uses": ["1:1:8", "*1:3:8"]
+      "uses": ["*1:1:8", "*1:3:8"]
     }],
   "functions": [],
   "variables": [{

tests/usage/type_usage_declare_field.cc

@@ -19,7 +19,7 @@ OUTPUT:
       "short_name": "ImplementedType",
       "qualified_name": "ImplementedType",
       "definition": "1:2:8",
-      "uses": ["1:2:8", "*1:6:3"]
+      "uses": ["*1:2:8", "*1:6:3"]
     }, {
       "id": 2,
       "usr": "c:@S@Foo",
@@ -27,7 +27,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:4:8",
       "vars": [0, 1],
-      "uses": ["1:4:8"]
+      "uses": ["*1:4:8"]
     }],
   "functions": [],
   "variables": [{

tests/usage/type_usage_declare_local.cc

@@ -19,7 +19,7 @@ OUTPUT:
       "short_name": "ImplementedType",
       "qualified_name": "ImplementedType",
       "definition": "1:2:8",
-      "uses": ["1:2:8", "*1:6:3"]
+      "uses": ["*1:2:8", "*1:6:3"]
     }],
   "functions": [{
       "id": 0,

tests/usage/type_usage_declare_param.cc

@@ -16,7 +16,7 @@ OUTPUT:
       "short_name": "ImplementedType",
       "qualified_name": "ImplementedType",
       "definition": "1:2:8",
-      "uses": ["1:2:8", "*1:4:26"]
+      "uses": ["*1:2:8", "*1:4:26"]
     }],
   "functions": [{
       "id": 0,

tests/usage/type_usage_declare_qualifiers.cc

@@ -15,7 +15,7 @@ OUTPUT:
       "short_name": "Type",
       "qualified_name": "Type",
       "definition": "1:1:8",
-      "uses": ["1:1:8", "*1:3:10", "*1:3:26", "*1:4:3", "*1:5:3", "*1:6:9", "*1:7:9"]
+      "uses": ["*1:1:8", "*1:3:10", "*1:3:26", "*1:4:3", "*1:5:3", "*1:6:9", "*1:7:9"]
     }],
   "functions": [{
       "id": 0,

tests/usage/type_usage_on_return_type.cc

@@ -31,7 +31,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:7:7",
       "funcs": [1, 2],
-      "uses": ["1:7:7", "1:12:7", "1:13:6"]
+      "uses": ["*1:7:7", "1:12:7", "1:13:6"]
     }],
   "functions": [{
       "id": 0,

tests/usage/type_usage_typedef_and_using.cc

@@ -11,10 +11,6 @@ void accept3(Foo3*) {}
 
 /*
 
-// TODO: I think we should mark using Foo1 = foo as an interesting usage on
-//       Foo1.
-// TODO: Also mark class Foo {} as an interesting usage of Foo.
-
 OUTPUT:
 {
   "types": [{
@@ -28,7 +24,7 @@ OUTPUT:
       "qualified_name": "Foo1",
       "definition": "1:2:7",
       "alias_of": 0,
-      "uses": ["1:2:7", "*1:4:14", "*1:8:14"]
+      "uses": ["*1:2:7", "*1:4:14", "*1:8:14"]
     }, {
       "id": 2,
       "usr": "c:type_usage_typedef_and_using.cc@T@Foo2",
@@ -36,7 +32,7 @@ OUTPUT:
       "qualified_name": "Foo2",
       "definition": "1:3:13",
       "alias_of": 0,
-      "uses": ["1:3:13", "*1:9:14"]
+      "uses": ["*1:3:13", "*1:9:14"]
     }, {
       "id": 3,
       "usr": "c:@Foo3",
@@ -44,14 +40,14 @@ OUTPUT:
       "qualified_name": "Foo3",
       "definition": "1:4:7",
       "alias_of": 1,
-      "uses": ["1:4:7", "*1:10:14"]
+      "uses": ["*1:4:7", "*1:10:14"]
     }, {
       "id": 4,
       "usr": "c:@Foo4",
       "short_name": "Foo4",
       "qualified_name": "Foo4",
       "definition": "1:5:7",
-      "uses": ["1:5:7"]
+      "uses": ["*1:5:7"]
     }],
   "functions": [{
       "id": 0,

tests/usage/type_usage_typedef_and_using_template.cc

@@ -18,7 +18,7 @@ OUTPUT:
       "qualified_name": "Foo1",
       "definition": "1:4:7",
       "alias_of": 0,
-      "uses": ["1:4:7", "*1:5:13"]
+      "uses": ["*1:4:7", "*1:5:13"]
     }, {
       "id": 2,
       "usr": "c:type_usage_typedef_and_using_template.cc@T@Foo2",
@@ -26,7 +26,7 @@ OUTPUT:
       "qualified_name": "Foo2",
       "definition": "1:5:19",
       "alias_of": 0,
-      "uses": ["1:5:19"]
+      "uses": ["*1:5:19"]
     }],
   "functions": [],
   "variables": []

tests/usage/type_usage_various.cc

@@ -19,7 +19,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "funcs": [0],
-      "uses": ["1:1:7", "*1:2:3", "*1:5:1", "1:5:6", "*1:6:3", "*1:10:8"]
+      "uses": ["*1:1:7", "*1:2:3", "*1:5:1", "1:5:6", "*1:6:3", "*1:10:8"]
     }],
   "functions": [{
       "id": 0,

tests/usage/usage_inside_of_call.cc

@@ -24,7 +24,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:5:8",
       "vars": [1, 0],
-      "uses": ["1:5:8", "1:10:5", "1:14:22", "1:14:40"]
+      "uses": ["*1:5:8", "1:10:5", "1:14:22", "1:14:40"]
     }],
   "functions": [{
       "id": 0,

tests/usage/var_usage_class_member.cc

@@ -27,7 +27,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "vars": [0, 1],
-      "uses": ["1:1:7", "*1:11:3"]
+      "uses": ["*1:1:7", "*1:11:3"]
     }],
   "functions": [{
       "id": 0,

tests/usage/var_usage_class_member_static.cc

@@ -17,7 +17,7 @@ OUTPUT:
       "short_name": "Foo",
       "qualified_name": "Foo",
       "definition": "1:1:8",
-      "uses": ["1:1:8", "1:8:10"]
+      "uses": ["*1:1:8", "1:8:10"]
     }],
   "functions": [{
       "id": 0,

tests/vars/class_member.cc

@@ -11,7 +11,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "vars": [0],
-      "uses": ["1:1:7", "*1:2:3"]
+      "uses": ["*1:1:7", "*1:2:3"]
     }],
   "functions": [],
   "variables": [{

tests/vars/class_static_member.cc

@@ -13,7 +13,7 @@ OUTPUT:
       "qualified_name": "Foo",
       "definition": "1:1:7",
       "vars": [0],
-      "uses": ["1:1:7", "*1:2:10", "*1:4:1", "1:4:6"]
+      "uses": ["*1:1:7", "*1:2:10", "*1:4:1", "1:4:6"]
     }],
   "functions": [],
   "variables": [{

tests/vars/class_static_member_decl_only.cc

@@ -10,7 +10,7 @@ OUTPUT:
       "short_name": "Foo",
       "qualified_name": "Foo",
       "definition": "1:1:7",
-      "uses": ["1:1:7"]
+      "uses": ["*1:1:7"]
     }],
   "functions": [],
   "variables": [{