diff --git a/src/command_line.cc b/src/command_line.cc index 63cafbc3..d6f714a7 100644 --- a/src/command_line.cc +++ b/src/command_line.cc @@ -133,11 +133,11 @@ optional GetDefinitionSpellingOfSymbol(QueryableDatabase* db, std::string GetHoverForSymbol(QueryableDatabase* db, const SymbolIdx& symbol) { switch (symbol.kind) { case SymbolKind::Type: - return db->types[symbol.idx].def.qualified_name; + return db->types[symbol.idx].def.detailed_name; case SymbolKind::Func: - return db->funcs[symbol.idx].def.qualified_name; + return db->funcs[symbol.idx].def.detailed_name; case SymbolKind::Var: - return db->vars[symbol.idx].def.qualified_name; + return db->vars[symbol.idx].def.detailed_name; case SymbolKind::File: case SymbolKind::Invalid: { assert(false && "unexpected"); @@ -352,17 +352,17 @@ lsSymbolInformation GetSymbolInfo(QueryableDatabase* db, WorkingFiles* working_f } case SymbolKind::Type: { QueryableTypeDef* def = symbol.ResolveType(db); - info.name = def->def.qualified_name; + info.name = def->def.detailed_name; info.kind = lsSymbolKind::Class; break; } case SymbolKind::Func: { QueryableFuncDef* def = symbol.ResolveFunc(db); - info.name = def->def.qualified_name; + info.name = def->def.detailed_name; if (def->def.declaring_type.has_value()) { info.kind = lsSymbolKind::Method; - info.containerName = db->types[def->def.declaring_type->id].def.qualified_name; + info.containerName = db->types[def->def.declaring_type->id].def.detailed_name; } else { info.kind = lsSymbolKind::Function; @@ -371,7 +371,7 @@ lsSymbolInformation GetSymbolInfo(QueryableDatabase* db, WorkingFiles* working_f } case SymbolKind::Var: { QueryableVarDef* def = symbol.ResolveVar(db); - info.name += def->def.qualified_name; + info.name += def->def.detailed_name; info.kind = lsSymbolKind::Variable; break; } @@ -1235,17 +1235,17 @@ void QueryDbMainLoop( response.id = msg->id; - std::cerr << "- Considering " << db->qualified_names.size() + std::cerr << "- Considering " << db->detailed_names.size() << " candidates for query " << msg->params.query << std::endl; std::string query = msg->params.query; - for (int i = 0; i < db->qualified_names.size(); ++i) { + for (int i = 0; i < db->detailed_names.size(); ++i) { if (response.result.size() > kMaxWorkspaceSearchResults) { std::cerr << "Query exceeded maximum number of responses (" << kMaxWorkspaceSearchResults << "), output may not contain all results" << std::endl; break; } - if (db->qualified_names[i].find(query) != std::string::npos) { + if (db->detailed_names[i].find(query) != std::string::npos) { lsSymbolInformation info = GetSymbolInfo(db, working_files, db->symbols[i]); optional location = GetDefinitionExtentOfSymbol(db, db->symbols[i]); if (!location) { diff --git a/src/indexer.cc b/src/indexer.cc index 20c0220d..27bc6b04 100644 --- a/src/indexer.cc +++ b/src/indexer.cc @@ -779,13 +779,13 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { // TODO: Verify this gets called multiple times // if (!decl->isRedeclaration) { var_def->def.short_name = decl->entityInfo->name; - var_def->def.qualified_name = + var_def->def.detailed_name = ns->QualifiedName(decl->semanticContainer, var_def->def.short_name); std::string hover = clang::ToString(clang_getTypeSpelling(clang_getCursorType(decl->cursor))); // Include type in qualified name. if (!hover.empty()) - var_def->def.qualified_name = hover + " " + var_def->def.qualified_name; + var_def->def.detailed_name = hover + " " + var_def->def.detailed_name; //} if (decl->isDefinition) { @@ -886,7 +886,7 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { // this may shadow. // if (!decl->isRedeclaration) { func_def->def.short_name = decl->entityInfo->name; - func_def->def.qualified_name = ns->QualifiedName( + func_def->def.detailed_name = ns->QualifiedName( decl->semanticContainer, func_def->def.short_name); //} @@ -899,11 +899,11 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { auto it = std::find(hover.begin(), hover.end(), '('); if (it != hover.end()) { std::string new_qualified_name; - new_qualified_name.resize(hover.size() + func_def->def.qualified_name.size()); + new_qualified_name.resize(hover.size() + func_def->def.detailed_name.size()); std::copy(hover.begin(), it, new_qualified_name.begin()); - std::copy(func_def->def.qualified_name.begin(), func_def->def.qualified_name.end(), new_qualified_name.begin() + std::distance(hover.begin(), it)); - std::copy(it, hover.end(), new_qualified_name.begin() + std::distance(hover.begin(), it) + func_def->def.qualified_name.size()); - func_def->def.qualified_name = new_qualified_name; + std::copy(func_def->def.detailed_name.begin(), func_def->def.detailed_name.end(), new_qualified_name.begin() + std::distance(hover.begin(), it)); + std::copy(it, hover.end(), new_qualified_name.begin() + std::distance(hover.begin(), it) + func_def->def.detailed_name.size()); + func_def->def.detailed_name = new_qualified_name; } // TODO: return type @@ -1037,7 +1037,7 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { type_def->def.alias_of = alias_of.value(); type_def->def.short_name = decl->entityInfo->name; - type_def->def.qualified_name = + type_def->def.detailed_name = ns->QualifiedName(decl->semanticContainer, type_def->def.short_name); type_def->def.definition_spelling = db->id_cache.ResolveSpelling(decl->cursor, false /*interesting*/); @@ -1073,7 +1073,7 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { type_def->def.short_name = ""; } - type_def->def.qualified_name = + type_def->def.detailed_name = ns->QualifiedName(decl->semanticContainer, type_def->def.short_name); // } diff --git a/src/indexer.h b/src/indexer.h index dc8647e3..97e2bc41 100644 --- a/src/indexer.h +++ b/src/indexer.h @@ -113,7 +113,7 @@ struct TypeDefDefinitionData { // General metadata. std::string usr; std::string short_name; - std::string qualified_name; + std::string detailed_name; // While a class/type can technically have a separate declaration/definition, // it doesn't really happen in practice. The declaration never contains @@ -145,7 +145,7 @@ struct TypeDefDefinitionData { bool operator==(const TypeDefDefinitionData& other) const { return usr == other.usr && short_name == other.short_name && - qualified_name == other.qualified_name && + detailed_name == other.detailed_name && definition_spelling == other.definition_spelling && definition_extent == other.definition_extent && alias_of == other.alias_of && @@ -168,7 +168,7 @@ void Reflect(TVisitor& visitor, REFLECT_MEMBER_START(); REFLECT_MEMBER(usr); REFLECT_MEMBER(short_name); - REFLECT_MEMBER(qualified_name); + REFLECT_MEMBER(detailed_name); REFLECT_MEMBER(definition); REFLECT_MEMBER(alias_of); REFLECT_MEMBER(parents); @@ -225,7 +225,7 @@ struct FuncDefDefinitionData { // General metadata. std::string usr; std::string short_name; - std::string qualified_name; + std::string detailed_name; optional definition_spelling; optional definition_extent; @@ -250,7 +250,7 @@ struct FuncDefDefinitionData { const FuncDefDefinitionData& other) const { return usr == other.usr && short_name == other.short_name && - qualified_name == other.qualified_name && + detailed_name == other.detailed_name && definition_spelling == other.definition_spelling && definition_extent == other.definition_extent && declaring_type == other.declaring_type && base == other.base && @@ -275,7 +275,7 @@ void Reflect( REFLECT_MEMBER_START(); REFLECT_MEMBER(usr); REFLECT_MEMBER(short_name); - REFLECT_MEMBER(qualified_name); + REFLECT_MEMBER(detailed_name); REFLECT_MEMBER(definition); REFLECT_MEMBER(declaring_type); REFLECT_MEMBER(base); @@ -332,7 +332,7 @@ struct VarDefDefinitionData { // General metadata. std::string usr; std::string short_name; - std::string qualified_name; + std::string detailed_name; optional declaration; // TODO: definitions should be a list of ranges, since there can be more // than one - when?? @@ -351,7 +351,7 @@ struct VarDefDefinitionData { bool operator==(const VarDefDefinitionData& other) const { return usr == other.usr && short_name == other.short_name && - qualified_name == other.qualified_name && + detailed_name == other.detailed_name && declaration == other.declaration && definition_spelling == other.definition_spelling && definition_extent == other.definition_extent && @@ -374,7 +374,7 @@ void Reflect(TVisitor& visitor, REFLECT_MEMBER_START(); REFLECT_MEMBER(usr); REFLECT_MEMBER(short_name); - REFLECT_MEMBER(qualified_name); + REFLECT_MEMBER(detailed_name); REFLECT_MEMBER(definition_spelling); REFLECT_MEMBER(definition_extent); REFLECT_MEMBER(variable_type); diff --git a/src/query.cc b/src/query.cc index 2f7f2d8e..eb5c72af 100644 --- a/src/query.cc +++ b/src/query.cc @@ -20,7 +20,7 @@ QueryableTypeDef::DefUpdate ToQuery(const IdMap& id_map, const IndexedTypeDef::D assert(!type.short_name.empty()); QueryableTypeDef::DefUpdate result(type.usr); result.short_name = type.short_name; - result.qualified_name = type.qualified_name; + result.detailed_name = type.detailed_name; result.definition_spelling = id_map.ToQuery(type.definition_spelling); result.definition_extent = id_map.ToQuery(type.definition_extent); result.alias_of = id_map.ToQuery(type.alias_of); @@ -35,7 +35,7 @@ QueryableFuncDef::DefUpdate ToQuery(const IdMap& id_map, const IndexedFuncDef::D assert(!func.short_name.empty()); QueryableFuncDef::DefUpdate result(func.usr); result.short_name = func.short_name; - result.qualified_name = func.qualified_name; + result.detailed_name = func.detailed_name; result.definition_spelling = id_map.ToQuery(func.definition_spelling); result.definition_extent = id_map.ToQuery(func.definition_extent); result.declaring_type = id_map.ToQuery(func.declaring_type); @@ -49,7 +49,7 @@ QueryableVarDef::DefUpdate ToQuery(const IdMap& id_map, const IndexedVarDef::Def assert(!var.short_name.empty()); QueryableVarDef::DefUpdate result(var.usr); result.short_name = var.short_name; - result.qualified_name = var.qualified_name; + result.detailed_name = var.detailed_name; result.declaration = id_map.ToQuery(var.declaration); result.definition_spelling = id_map.ToQuery(var.definition_spelling); result.definition_extent = id_map.ToQuery(var.definition_extent); @@ -588,14 +588,14 @@ void IndexUpdate::Merge(const IndexUpdate& update) { -void SetQualifiedNameForWorkspaceSearch(QueryableDatabase* db, size_t* qualified_name_index, SymbolKind kind, size_t symbol_index, const std::string& name) { +void SetDetailedNameForWorkspaceSearch(QueryableDatabase* db, size_t* qualified_name_index, SymbolKind kind, size_t symbol_index, const std::string& name) { if (*qualified_name_index == -1) { - db->qualified_names.push_back(name); + db->detailed_names.push_back(name); db->symbols.push_back(SymbolIdx(kind, symbol_index)); - *qualified_name_index = db->qualified_names.size() - 1; + *qualified_name_index = db->detailed_names.size() - 1; } else { - db->qualified_names[*qualified_name_index] = name; + db->detailed_names[*qualified_name_index] = name; } } @@ -623,7 +623,7 @@ void QueryableDatabase::ImportOrUpdate(const std::vector& updates) { for (auto& def : updates) { - if (def.qualified_name.empty()) + if (def.detailed_name.empty()) continue; auto it = usr_to_symbol.find(def.usr); @@ -634,13 +634,13 @@ void QueryableDatabase::ImportOrUpdate(const std::vectorsecond.idx, def.qualified_name); + SetDetailedNameForWorkspaceSearch(this, &existing.detailed_name_idx, SymbolKind::Type, it->second.idx, def.detailed_name); } } void QueryableDatabase::ImportOrUpdate(const std::vector& updates) { for (auto& def : updates) { - if (def.qualified_name.empty()) + if (def.detailed_name.empty()) continue; auto it = usr_to_symbol.find(def.usr); @@ -651,13 +651,13 @@ void QueryableDatabase::ImportOrUpdate(const std::vectorsecond.idx, def.qualified_name); + SetDetailedNameForWorkspaceSearch(this, &existing.detailed_name_idx, SymbolKind::Func, it->second.idx, def.detailed_name); } } void QueryableDatabase::ImportOrUpdate(const std::vector& updates) { for (auto& def : updates) { - if (def.qualified_name.empty()) + if (def.detailed_name.empty()) continue; auto it = usr_to_symbol.find(def.usr); @@ -669,7 +669,7 @@ void QueryableDatabase::ImportOrUpdate(const std::vectorsecond.idx, def.qualified_name); + SetDetailedNameForWorkspaceSearch(this, &existing.detailed_name_idx, SymbolKind::Var, it->second.idx, def.detailed_name); } } diff --git a/src/query.h b/src/query.h index 09e0fabd..33a8b9f6 100644 --- a/src/query.h +++ b/src/query.h @@ -158,7 +158,7 @@ struct QueryableFile { using DefUpdate = Def; DefUpdate def; - size_t qualified_name_idx = -1; + size_t detailed_name_idx = -1; QueryableFile(const Usr& usr) { def.usr = usr; } }; @@ -173,7 +173,7 @@ struct QueryableTypeDef { std::vector derived; std::vector instantiations; std::vector uses; - size_t qualified_name_idx = -1; + size_t detailed_name_idx = -1; QueryableTypeDef(const Usr& usr) : def(usr) {} }; @@ -188,7 +188,7 @@ struct QueryableFuncDef { std::vector declarations; std::vector derived; std::vector callers; - size_t qualified_name_idx = -1; + size_t detailed_name_idx = -1; QueryableFuncDef(const Usr& usr) : def(usr) {} QueryableFuncDef(const DefUpdate& def) : def(def) {} @@ -200,7 +200,7 @@ struct QueryableVarDef { DefUpdate def; std::vector uses; - size_t qualified_name_idx = -1; + size_t detailed_name_idx = -1; QueryableVarDef(const Usr& usr) : def(usr) {} }; @@ -249,8 +249,8 @@ struct IndexUpdate { // in-memory. struct QueryableDatabase { // Indicies between lookup vectors are related to symbols, ie, index 5 in - // |qualified_names| matches index 5 in |symbols|. - std::vector qualified_names; + // |detailed_names| matches index 5 in |symbols|. + std::vector detailed_names; std::vector symbols; // Raw data storage. diff --git a/src/serializer.cc b/src/serializer.cc index 3a1f5299..693caf21 100644 --- a/src/serializer.cc +++ b/src/serializer.cc @@ -116,7 +116,7 @@ void Reflect(TVisitor& visitor, IndexedTypeDef& value) { REFLECT_MEMBER2("id", value.id); REFLECT_MEMBER2("usr", value.def.usr); REFLECT_MEMBER2("short_name", value.def.short_name); - REFLECT_MEMBER2("qualified_name", value.def.qualified_name); + REFLECT_MEMBER2("detailed_name", value.def.detailed_name); REFLECT_MEMBER2("definition_spelling", value.def.definition_spelling); REFLECT_MEMBER2("definition_extent", value.def.definition_extent); REFLECT_MEMBER2("alias_of", value.def.alias_of); @@ -152,7 +152,7 @@ void Reflect(TVisitor& visitor, IndexedFuncDef& value) { REFLECT_MEMBER2("id", value.id); REFLECT_MEMBER2("usr", value.def.usr); REFLECT_MEMBER2("short_name", value.def.short_name); - REFLECT_MEMBER2("qualified_name", value.def.qualified_name); + REFLECT_MEMBER2("detailed_name", value.def.detailed_name); REFLECT_MEMBER2("declarations", value.declarations); REFLECT_MEMBER2("definition_spelling", value.def.definition_spelling); REFLECT_MEMBER2("definition_extent", value.def.definition_extent); @@ -187,7 +187,7 @@ void Reflect(TVisitor& visitor, IndexedVarDef& value) { REFLECT_MEMBER2("id", value.id); REFLECT_MEMBER2("usr", value.def.usr); REFLECT_MEMBER2("short_name", value.def.short_name); - REFLECT_MEMBER2("qualified_name", value.def.qualified_name); + REFLECT_MEMBER2("detailed_name", value.def.detailed_name); REFLECT_MEMBER2("declaration", value.def.declaration); REFLECT_MEMBER2("definition_spelling", value.def.definition_spelling); REFLECT_MEMBER2("definition_extent", value.def.definition_extent); diff --git a/tests/class_forward_declaration.cc b/tests/class_forward_declaration.cc index 7749a093..55f4f774 100644 --- a/tests/class_forward_declaration.cc +++ b/tests/class_forward_declaration.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "3:7-3:10", "definition_extent": "3:1-3:13", "uses": ["1:7-1:10", "2:7-2:10", "*3:7-3:10", "4:7-4:10"] diff --git a/tests/constructors/constructor.cc b/tests/constructors/constructor.cc index 3798c081..96cb36dd 100644 --- a/tests/constructors/constructor.cc +++ b/tests/constructors/constructor.cc @@ -15,7 +15,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-4:2", "funcs": [0], @@ -26,7 +26,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", - "qualified_name": "void Foo::Foo()", + "detailed_name": "void Foo::Foo()", "definition_spelling": "3:3-3:6", "definition_extent": "3:3-3:11", "declaring_type": 0, @@ -35,7 +35,7 @@ OUTPUT: "id": 1, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "6:6-6:9", "definition_extent": "6:1-9:2", "callees": ["0@7:7-7:8", "0@8:17-8:20"] @@ -44,7 +44,7 @@ OUTPUT: "id": 0, "usr": "c:constructor.cc@56@F@foo#@f", "short_name": "f", - "qualified_name": "Foo f", + "detailed_name": "Foo f", "definition_spelling": "7:7-7:8", "definition_extent": "7:3-7:8", "variable_type": 0, @@ -53,7 +53,7 @@ OUTPUT: "id": 1, "usr": "c:constructor.cc@66@F@foo#@f2", "short_name": "f2", - "qualified_name": "Foo * f2", + "detailed_name": "Foo * f2", "definition_spelling": "8:8-8:10", "definition_extent": "8:3-8:22", "variable_type": 0, diff --git a/tests/constructors/destructor.cc b/tests/constructors/destructor.cc index 4ff00e6d..0086be49 100644 --- a/tests/constructors/destructor.cc +++ b/tests/constructors/destructor.cc @@ -20,7 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-5:2", "funcs": [0, 1], @@ -31,7 +31,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", - "qualified_name": "void Foo::Foo()", + "detailed_name": "void Foo::Foo()", "definition_spelling": "3:3-3:6", "definition_extent": "3:3-3:11", "declaring_type": 0, @@ -40,7 +40,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@F@~Foo#", "short_name": "~Foo", - "qualified_name": "void Foo::~Foo() noexcept", + "detailed_name": "void Foo::~Foo() noexcept", "definition_spelling": "4:3-4:7", "definition_extent": "4:3-4:12", "declaring_type": 0 @@ -48,7 +48,7 @@ OUTPUT: "id": 2, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "7:6-7:9", "definition_extent": "7:1-9:2", "callees": ["0@8:7-8:8"] @@ -57,7 +57,7 @@ OUTPUT: "id": 0, "usr": "c:destructor.cc@70@F@foo#@f", "short_name": "f", - "qualified_name": "Foo f", + "detailed_name": "Foo f", "definition_spelling": "8:7-8:8", "definition_extent": "8:3-8:8", "variable_type": 0, diff --git a/tests/constructors/invalid_reference.cc b/tests/constructors/invalid_reference.cc index 28ae0f85..5dda0e6c 100644 --- a/tests/constructors/invalid_reference.cc +++ b/tests/constructors/invalid_reference.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-1:14", "funcs": [0], @@ -20,7 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FT@>1#TFoo#v#", "short_name": "Foo", - "qualified_name": "void Foo::Foo()", + "detailed_name": "void Foo::Foo()", "definition_spelling": "4:6-4:9", "definition_extent": "4:1-4:11", "declaring_type": 0 diff --git a/tests/declaration_vs_definition/class.cc b/tests/declaration_vs_definition/class.cc index d5bcae12..ab46b5a5 100644 --- a/tests/declaration_vs_definition/class.cc +++ b/tests/declaration_vs_definition/class.cc @@ -12,7 +12,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "3:7-3:10", "definition_extent": "3:1-3:13", "uses": ["1:7-1:10", "2:7-2:10", "*3:7-3:10", "4:7-4:10"] diff --git a/tests/declaration_vs_definition/class_member.cc b/tests/declaration_vs_definition/class_member.cc index 4c636a18..677e299b 100644 --- a/tests/declaration_vs_definition/class_member.cc +++ b/tests/declaration_vs_definition/class_member.cc @@ -9,7 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", "vars": [0], @@ -19,7 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@foo", "short_name": "foo", - "qualified_name": "int Foo::foo", + "detailed_name": "int Foo::foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:3-2:10", "declaring_type": 0, diff --git a/tests/declaration_vs_definition/class_member_static.cc b/tests/declaration_vs_definition/class_member_static.cc index e6ecff9a..d431cf33 100644 --- a/tests/declaration_vs_definition/class_member_static.cc +++ b/tests/declaration_vs_definition/class_member_static.cc @@ -11,7 +11,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", "vars": [0], @@ -21,7 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@foo", "short_name": "foo", - "qualified_name": "int Foo::foo", + "detailed_name": "int Foo::foo", "declaration": "2:14-2:17", "definition_spelling": "5:10-5:13", "definition_extent": "5:1-5:13", diff --git a/tests/declaration_vs_definition/func.cc b/tests/declaration_vs_definition/func.cc index eb661b5e..6770e1b3 100644 --- a/tests/declaration_vs_definition/func.cc +++ b/tests/declaration_vs_definition/func.cc @@ -11,7 +11,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "declarations": ["1:6-1:9", "2:6-2:9", "4:6-4:9"], "definition_spelling": "3:6-3:9", "definition_extent": "3:1-3:14" diff --git a/tests/declaration_vs_definition/method.cc b/tests/declaration_vs_definition/method.cc index e757a3a8..040164db 100644 --- a/tests/declaration_vs_definition/method.cc +++ b/tests/declaration_vs_definition/method.cc @@ -13,7 +13,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-5:2", "funcs": [0, 1, 2], @@ -23,21 +23,21 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@declonly#", "short_name": "declonly", - "qualified_name": "void Foo::declonly()", + "detailed_name": "void Foo::declonly()", "declarations": ["2:8-2:16"], "declaring_type": 0 }, { "id": 1, "usr": "c:@S@Foo@F@purevirtual#", "short_name": "purevirtual", - "qualified_name": "void Foo::purevirtual()", + "detailed_name": "void Foo::purevirtual()", "declarations": ["3:16-3:27"], "declaring_type": 0 }, { "id": 2, "usr": "c:@S@Foo@F@def#", "short_name": "def", - "qualified_name": "void Foo::def()", + "detailed_name": "void Foo::def()", "declarations": ["4:8-4:11"], "definition_spelling": "7:11-7:14", "definition_extent": "7:1-7:19", diff --git a/tests/enums/enum_class_decl.cc b/tests/enums/enum_class_decl.cc index 212aba9e..25ceb902 100644 --- a/tests/enums/enum_class_decl.cc +++ b/tests/enums/enum_class_decl.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:12-1:15", "definition_extent": "1:1-4:2", "vars": [0, 1], @@ -20,7 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo@A", "short_name": "A", - "qualified_name": "Foo Foo::A", + "detailed_name": "Foo Foo::A", "definition_spelling": "2:3-2:4", "definition_extent": "2:3-2:4", "variable_type": 0, @@ -30,7 +30,7 @@ OUTPUT: "id": 1, "usr": "c:@E@Foo@B", "short_name": "B", - "qualified_name": "Foo Foo::B", + "detailed_name": "Foo Foo::B", "definition_spelling": "3:3-3:4", "definition_extent": "3:3-3:9", "variable_type": 0, diff --git a/tests/enums/enum_decl.cc b/tests/enums/enum_decl.cc index 05729179..67ec61f8 100644 --- a/tests/enums/enum_decl.cc +++ b/tests/enums/enum_decl.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-4:2", "vars": [0, 1], @@ -20,7 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo@A", "short_name": "A", - "qualified_name": "Foo Foo::A", + "detailed_name": "Foo Foo::A", "definition_spelling": "2:3-2:4", "definition_extent": "2:3-2:4", "variable_type": 0, @@ -30,7 +30,7 @@ OUTPUT: "id": 1, "usr": "c:@E@Foo@B", "short_name": "B", - "qualified_name": "Foo Foo::B", + "detailed_name": "Foo Foo::B", "definition_spelling": "3:3-3:4", "definition_extent": "3:3-3:9", "variable_type": 0, diff --git a/tests/enums/enum_inherit.cc b/tests/enums/enum_inherit.cc index 5f9a5cda..9ac29f11 100644 --- a/tests/enums/enum_inherit.cc +++ b/tests/enums/enum_inherit.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-4:2", "vars": [0, 1], @@ -20,7 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo@A", "short_name": "A", - "qualified_name": "Foo Foo::A", + "detailed_name": "Foo Foo::A", "definition_spelling": "2:3-2:4", "definition_extent": "2:3-2:4", "variable_type": 0, @@ -30,7 +30,7 @@ OUTPUT: "id": 1, "usr": "c:@E@Foo@B", "short_name": "B", - "qualified_name": "Foo Foo::B", + "detailed_name": "Foo Foo::B", "definition_spelling": "3:3-3:4", "definition_extent": "3:3-3:9", "variable_type": 0, diff --git a/tests/enums/enum_usage.cc b/tests/enums/enum_usage.cc index ef8caf91..6c104e57 100644 --- a/tests/enums/enum_usage.cc +++ b/tests/enums/enum_usage.cc @@ -12,7 +12,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:12-1:15", "definition_extent": "1:1-4:2", "vars": [0, 1], @@ -23,7 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo@A", "short_name": "A", - "qualified_name": "Foo Foo::A", + "detailed_name": "Foo Foo::A", "definition_spelling": "2:3-2:4", "definition_extent": "2:3-2:4", "variable_type": 0, @@ -33,7 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@E@Foo@B", "short_name": "B", - "qualified_name": "Foo Foo::B", + "detailed_name": "Foo Foo::B", "definition_spelling": "3:3-3:4", "definition_extent": "3:3-3:9", "variable_type": 0, @@ -43,7 +43,7 @@ OUTPUT: "id": 2, "usr": "c:@x", "short_name": "x", - "qualified_name": "Foo x", + "detailed_name": "Foo x", "definition_spelling": "6:5-6:6", "definition_extent": "6:1-6:15", "variable_type": 0, diff --git a/tests/foobar.cc b/tests/foobar.cc index 2f54e0e0..8f111f66 100644 --- a/tests/foobar.cc +++ b/tests/foobar.cc @@ -15,7 +15,7 @@ OUTPUT: "id": 0, "usr": "c:@E@A", "short_name": "A", - "qualified_name": "A", + "detailed_name": "A", "definition_spelling": "1:6-1:7", "definition_extent": "1:1-1:10", "uses": ["*1:6-1:7", "*9:5-9:6"] @@ -23,7 +23,7 @@ OUTPUT: "id": 1, "usr": "c:@E@B", "short_name": "B", - "qualified_name": "B", + "detailed_name": "B", "definition_spelling": "2:6-2:7", "definition_extent": "2:1-2:10", "uses": ["*2:6-2:7", "*10:5-10:6"] @@ -31,7 +31,7 @@ OUTPUT: "id": 2, "usr": "c:@ST>1#T@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "5:8-5:11", "definition_extent": "5:1-7:2", "instantiations": [1], @@ -40,7 +40,7 @@ OUTPUT: "id": 3, "usr": "c:@ST>1#T@Foo@S@Inner", "short_name": "Inner", - "qualified_name": "Foo::Inner", + "detailed_name": "Foo::Inner", "definition_spelling": "6:10-6:15", "definition_extent": "6:3-6:18", "instantiations": [0], @@ -50,7 +50,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "Foo::Inner a", + "detailed_name": "Foo::Inner a", "definition_spelling": "9:15-9:16", "definition_extent": "9:1-9:16", "variable_type": 3, @@ -59,7 +59,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "Foo b", + "detailed_name": "Foo b", "definition_spelling": "10:8-10:9", "definition_extent": "10:1-10:9", "variable_type": 2, diff --git a/tests/function_declaration.cc b/tests/function_declaration.cc index 99874464..90dd7e40 100644 --- a/tests/function_declaration.cc +++ b/tests/function_declaration.cc @@ -7,7 +7,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#I#", "short_name": "foo", - "qualified_name": "void foo(int, int)", + "detailed_name": "void foo(int, int)", "declarations": ["1:6-1:9"] }] } diff --git a/tests/function_declaration_definition.cc b/tests/function_declaration_definition.cc index 7ed1fb40..669c5575 100644 --- a/tests/function_declaration_definition.cc +++ b/tests/function_declaration_definition.cc @@ -9,7 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "declarations": ["1:6-1:9"], "definition_spelling": "3:6-3:9", "definition_extent": "3:1-3:14" diff --git a/tests/function_definition.cc b/tests/function_definition.cc index ccb31d88..4def754f 100644 --- a/tests/function_definition.cc +++ b/tests/function_definition.cc @@ -7,7 +7,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-1:14" }] diff --git a/tests/inheritance/class_inherit.cc b/tests/inheritance/class_inherit.cc index 06ba7897..c33f53f3 100644 --- a/tests/inheritance/class_inherit.cc +++ b/tests/inheritance/class_inherit.cc @@ -8,7 +8,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Parent", "short_name": "Parent", - "qualified_name": "Parent", + "detailed_name": "Parent", "definition_spelling": "1:7-1:13", "definition_extent": "1:1-1:16", "derived": [1], @@ -17,7 +17,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Derived", "short_name": "Derived", - "qualified_name": "Derived", + "detailed_name": "Derived", "definition_spelling": "2:7-2:14", "definition_extent": "2:1-2:33", "parents": [0], diff --git a/tests/inheritance/class_inherit_templated_parent.cc b/tests/inheritance/class_inherit_templated_parent.cc index 32eefc26..e214310b 100644 --- a/tests/inheritance/class_inherit_templated_parent.cc +++ b/tests/inheritance/class_inherit_templated_parent.cc @@ -19,7 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#Ni@Base1", "short_name": "Base1", - "qualified_name": "Base1", + "detailed_name": "Base1", "definition_spelling": "2:7-2:12", "definition_extent": "2:1-2:15", "derived": [2, 5], @@ -28,7 +28,7 @@ OUTPUT: "id": 1, "usr": "c:@ST>1#T@Base2", "short_name": "Base2", - "qualified_name": "Base2", + "detailed_name": "Base2", "definition_spelling": "5:7-5:12", "definition_extent": "5:1-5:15", "derived": [3, 5], @@ -37,7 +37,7 @@ OUTPUT: "id": 2, "usr": "c:@ST>1#Ni@Derived1", "short_name": "Derived1", - "qualified_name": "Derived1", + "detailed_name": "Derived1", "definition_spelling": "8:7-8:15", "definition_extent": "8:1-8:29", "parents": [0], @@ -47,7 +47,7 @@ OUTPUT: "id": 3, "usr": "c:@ST>1#T@Derived2", "short_name": "Derived2", - "qualified_name": "Derived2", + "detailed_name": "Derived2", "definition_spelling": "11:7-11:15", "definition_extent": "11:1-11:29", "parents": [1], @@ -61,7 +61,7 @@ OUTPUT: "id": 5, "usr": "c:@S@Derived", "short_name": "Derived", - "qualified_name": "Derived", + "detailed_name": "Derived", "definition_spelling": "13:7-13:14", "definition_extent": "13:1-13:76", "parents": [0, 1, 2, 3], diff --git a/tests/inheritance/class_multiple_inherit.cc b/tests/inheritance/class_multiple_inherit.cc index 102096d2..0819294d 100644 --- a/tests/inheritance/class_multiple_inherit.cc +++ b/tests/inheritance/class_multiple_inherit.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Root", "short_name": "Root", - "qualified_name": "Root", + "detailed_name": "Root", "definition_spelling": "1:7-1:11", "definition_extent": "1:1-1:14", "derived": [1, 2], @@ -19,7 +19,7 @@ OUTPUT: "id": 1, "usr": "c:@S@MiddleA", "short_name": "MiddleA", - "qualified_name": "MiddleA", + "detailed_name": "MiddleA", "definition_spelling": "2:7-2:14", "definition_extent": "2:1-2:31", "parents": [0], @@ -29,7 +29,7 @@ OUTPUT: "id": 2, "usr": "c:@S@MiddleB", "short_name": "MiddleB", - "qualified_name": "MiddleB", + "detailed_name": "MiddleB", "definition_spelling": "3:7-3:14", "definition_extent": "3:1-3:31", "parents": [0], @@ -39,7 +39,7 @@ OUTPUT: "id": 3, "usr": "c:@S@Derived", "short_name": "Derived", - "qualified_name": "Derived", + "detailed_name": "Derived", "definition_spelling": "4:7-4:14", "definition_extent": "4:1-4:50", "parents": [1, 2], diff --git a/tests/inheritance/function_override.cc b/tests/inheritance/function_override.cc index 0256549d..c0bed684 100644 --- a/tests/inheritance/function_override.cc +++ b/tests/inheritance/function_override.cc @@ -12,7 +12,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Root", "short_name": "Root", - "qualified_name": "Root", + "detailed_name": "Root", "definition_spelling": "1:7-1:11", "definition_extent": "1:1-3:2", "derived": [1], @@ -22,7 +22,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Derived", "short_name": "Derived", - "qualified_name": "Derived", + "detailed_name": "Derived", "definition_spelling": "4:7-4:14", "definition_extent": "4:1-6:2", "parents": [0], @@ -33,7 +33,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Root@F@foo#", "short_name": "foo", - "qualified_name": "void Root::foo()", + "detailed_name": "void Root::foo()", "declarations": ["2:16-2:19"], "declaring_type": 0, "derived": [1] @@ -41,7 +41,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Derived@F@foo#", "short_name": "foo", - "qualified_name": "void Derived::foo()", + "detailed_name": "void Derived::foo()", "definition_spelling": "5:8-5:11", "definition_extent": "5:3-5:25", "declaring_type": 1, diff --git a/tests/inheritance/interface_pure_virtual.cc b/tests/inheritance/interface_pure_virtual.cc index 2c4b1d9b..13ba3661 100644 --- a/tests/inheritance/interface_pure_virtual.cc +++ b/tests/inheritance/interface_pure_virtual.cc @@ -9,7 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@S@IFoo", "short_name": "IFoo", - "qualified_name": "IFoo", + "detailed_name": "IFoo", "definition_spelling": "1:7-1:11", "definition_extent": "1:1-3:2", "funcs": [0], @@ -19,7 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@S@IFoo@F@foo#", "short_name": "foo", - "qualified_name": "void IFoo::foo()", + "detailed_name": "void IFoo::foo()", "definition_spelling": "2:16-2:19", "definition_extent": "2:3-2:28", "declaring_type": 0 diff --git a/tests/method_declaration.cc b/tests/method_declaration.cc index 0eddda63..888a50fe 100644 --- a/tests/method_declaration.cc +++ b/tests/method_declaration.cc @@ -13,7 +13,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", "funcs": [0], @@ -23,7 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "void Foo::foo()", + "detailed_name": "void Foo::foo()", "declarations": ["2:8-2:11"], "declaring_type": 0 }] diff --git a/tests/method_definition.cc b/tests/method_definition.cc index 6804929c..657c054c 100644 --- a/tests/method_definition.cc +++ b/tests/method_definition.cc @@ -11,7 +11,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", "funcs": [0], @@ -21,7 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "void Foo::foo()", + "detailed_name": "void Foo::foo()", "declarations": ["2:8-2:11"], "definition_spelling": "5:11-5:14", "definition_extent": "5:1-5:19", diff --git a/tests/method_inline_declaration.cc b/tests/method_inline_declaration.cc index af9ae2aa..4fd36656 100644 --- a/tests/method_inline_declaration.cc +++ b/tests/method_inline_declaration.cc @@ -9,7 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", "funcs": [0], @@ -19,7 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "void Foo::foo()", + "detailed_name": "void Foo::foo()", "definition_spelling": "2:8-2:11", "definition_extent": "2:3-2:16", "declaring_type": 0 diff --git a/tests/multi_file/impl.cc b/tests/multi_file/impl.cc index e640dc69..aabd2e00 100644 --- a/tests/multi_file/impl.cc +++ b/tests/multi_file/impl.cc @@ -11,7 +11,7 @@ OUTPUT: header.h "id": 0, "usr": "c:@S@Base", "short_name": "Base", - "qualified_name": "Base", + "detailed_name": "Base", "definition_spelling": "3:8-3:12", "definition_extent": "3:1-3:15", "derived": [1], @@ -20,7 +20,7 @@ OUTPUT: header.h "id": 1, "usr": "c:@S@SameFileDerived", "short_name": "SameFileDerived", - "qualified_name": "SameFileDerived", + "detailed_name": "SameFileDerived", "definition_spelling": "5:8-5:23", "definition_extent": "5:1-5:33", "parents": [0], @@ -29,7 +29,7 @@ OUTPUT: header.h "id": 2, "usr": "c:@Foo0", "short_name": "Foo0", - "qualified_name": "Foo0", + "detailed_name": "Foo0", "definition_spelling": "7:7-7:11", "definition_extent": "7:1-7:29", "alias_of": 1, @@ -38,7 +38,7 @@ OUTPUT: header.h "id": 3, "usr": "c:@ST>1#T@Foo2", "short_name": "Foo2", - "qualified_name": "Foo2", + "detailed_name": "Foo2", "definition_spelling": "13:8-13:12", "definition_extent": "13:1-13:15", "uses": ["*13:8-13:12"] @@ -46,7 +46,7 @@ OUTPUT: header.h "id": 4, "usr": "c:@E@Foo3", "short_name": "Foo3", - "qualified_name": "Foo3", + "detailed_name": "Foo3", "definition_spelling": "15:6-15:10", "definition_extent": "15:1-15:22", "vars": [0, 1, 2], @@ -56,7 +56,7 @@ OUTPUT: header.h "id": 0, "usr": "c:@FT@>1#TFoo1#v#", "short_name": "Foo1", - "qualified_name": "void Foo1()", + "detailed_name": "void Foo1()", "definition_spelling": "10:6-10:10", "definition_extent": "10:1-10:15" }], @@ -64,7 +64,7 @@ OUTPUT: header.h "id": 0, "usr": "c:@E@Foo3@A", "short_name": "A", - "qualified_name": "Foo3 Foo3::A", + "detailed_name": "Foo3 Foo3::A", "definition_spelling": "15:13-15:14", "definition_extent": "15:13-15:14", "variable_type": 4, @@ -74,7 +74,7 @@ OUTPUT: header.h "id": 1, "usr": "c:@E@Foo3@B", "short_name": "B", - "qualified_name": "Foo3 Foo3::B", + "detailed_name": "Foo3 Foo3::B", "definition_spelling": "15:16-15:17", "definition_extent": "15:16-15:17", "variable_type": 4, @@ -84,7 +84,7 @@ OUTPUT: header.h "id": 2, "usr": "c:@E@Foo3@C", "short_name": "C", - "qualified_name": "Foo3 Foo3::C", + "detailed_name": "Foo3 Foo3::C", "definition_spelling": "15:19-15:20", "definition_extent": "15:19-15:20", "variable_type": 4, @@ -94,7 +94,7 @@ OUTPUT: header.h "id": 3, "usr": "c:@Foo4", "short_name": "Foo4", - "qualified_name": "int Foo4", + "detailed_name": "int Foo4", "definition_spelling": "17:5-17:9", "definition_extent": "17:1-17:9", "uses": ["17:5-17:9"] @@ -102,7 +102,7 @@ OUTPUT: header.h "id": 4, "usr": "c:header.h@Foo5", "short_name": "Foo5", - "qualified_name": "int Foo5", + "detailed_name": "int Foo5", "definition_spelling": "18:12-18:16", "definition_extent": "18:1-18:16", "uses": ["18:12-18:16"] @@ -115,7 +115,7 @@ OUTPUT: impl.cc "id": 0, "usr": "c:@F@Impl#", "short_name": "Impl", - "qualified_name": "void Impl()", + "detailed_name": "void Impl()", "definition_spelling": "3:6-3:10", "definition_extent": "3:1-5:2", "callees": ["1@4:3-4:7"] diff --git a/tests/multi_file/simple_impl.cc b/tests/multi_file/simple_impl.cc index d0fc961b..4250e685 100644 --- a/tests/multi_file/simple_impl.cc +++ b/tests/multi_file/simple_impl.cc @@ -11,7 +11,7 @@ OUTPUT: simple_header.h "id": 0, "usr": "c:@F@header#", "short_name": "header", - "qualified_name": "void header()", + "detailed_name": "void header()", "declarations": ["3:6-3:12"] }] } @@ -22,7 +22,7 @@ OUTPUT: simple_impl.cc "id": 0, "usr": "c:@F@impl#", "short_name": "impl", - "qualified_name": "void impl()", + "detailed_name": "void impl()", "definition_spelling": "3:6-3:10", "definition_extent": "3:1-5:2", "callees": ["1@4:3-4:9"] diff --git a/tests/multi_file/static.cc b/tests/multi_file/static.cc index 049e6b5d..d9efd4e5 100644 --- a/tests/multi_file/static.cc +++ b/tests/multi_file/static.cc @@ -9,7 +9,7 @@ OUTPUT: static.h "id": 0, "usr": "c:@S@Buffer", "short_name": "Buffer", - "qualified_name": "Buffer", + "detailed_name": "Buffer", "definition_spelling": "3:8-3:14", "definition_extent": "3:1-5:2", "funcs": [0], @@ -19,7 +19,7 @@ OUTPUT: static.h "id": 0, "usr": "c:@S@Buffer@F@CreateSharedBuffer#S", "short_name": "CreateSharedBuffer", - "qualified_name": "void Buffer::CreateSharedBuffer()", + "detailed_name": "void Buffer::CreateSharedBuffer()", "declarations": ["4:15-4:33"], "declaring_type": 0 }] @@ -37,7 +37,7 @@ OUTPUT: static.cc "id": 0, "usr": "c:@S@Buffer@F@CreateSharedBuffer#S", "short_name": "CreateSharedBuffer", - "qualified_name": "void Buffer::CreateSharedBuffer()", + "detailed_name": "void Buffer::CreateSharedBuffer()", "definition_spelling": "3:14-3:32", "definition_extent": "3:1-3:37", "declaring_type": 0 diff --git a/tests/namespaces/anonymous_function.cc b/tests/namespaces/anonymous_function.cc index 5f58b3c4..c20ef5ef 100644 --- a/tests/namespaces/anonymous_function.cc +++ b/tests/namespaces/anonymous_function.cc @@ -9,7 +9,7 @@ OUTPUT: "id": 0, "usr": "c:anonymous_function.cc@aN@F@foo#", "short_name": "foo", - "qualified_name": "void ::foo()", + "detailed_name": "void ::foo()", "declarations": ["2:6-2:9"] }] } diff --git a/tests/namespaces/function_declaration.cc b/tests/namespaces/function_declaration.cc index 01455461..d7769c64 100644 --- a/tests/namespaces/function_declaration.cc +++ b/tests/namespaces/function_declaration.cc @@ -9,7 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@F@foo#I#I#", "short_name": "foo", - "qualified_name": "void hello::foo(int, int)", + "detailed_name": "void hello::foo(int, int)", "declarations": ["2:6-2:9"] }] } diff --git a/tests/namespaces/function_definition.cc b/tests/namespaces/function_definition.cc index 942b878b..fea89dbc 100644 --- a/tests/namespaces/function_definition.cc +++ b/tests/namespaces/function_definition.cc @@ -9,7 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@F@foo#", "short_name": "foo", - "qualified_name": "void hello::foo()", + "detailed_name": "void hello::foo()", "definition_spelling": "2:6-2:9", "definition_extent": "2:1-2:14" }] diff --git a/tests/namespaces/method_declaration.cc b/tests/namespaces/method_declaration.cc index 96d5f68c..dcac3f0c 100644 --- a/tests/namespaces/method_declaration.cc +++ b/tests/namespaces/method_declaration.cc @@ -11,7 +11,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@S@Foo", "short_name": "Foo", - "qualified_name": "hello::Foo", + "detailed_name": "hello::Foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:1-4:2", "funcs": [0], @@ -21,7 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "void hello::Foo::foo()", + "detailed_name": "void hello::Foo::foo()", "declarations": ["3:8-3:11"], "declaring_type": 0 }] diff --git a/tests/namespaces/method_definition.cc b/tests/namespaces/method_definition.cc index 1dfe1217..247ad45a 100644 --- a/tests/namespaces/method_definition.cc +++ b/tests/namespaces/method_definition.cc @@ -13,7 +13,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@S@Foo", "short_name": "Foo", - "qualified_name": "hello::Foo", + "detailed_name": "hello::Foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:1-4:2", "funcs": [0], @@ -23,7 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "void hello::Foo::foo()", + "detailed_name": "void hello::Foo::foo()", "declarations": ["3:8-3:11"], "definition_spelling": "6:11-6:14", "definition_extent": "6:1-6:19", diff --git a/tests/namespaces/method_inline_declaration.cc b/tests/namespaces/method_inline_declaration.cc index baf49ab2..69e919b2 100644 --- a/tests/namespaces/method_inline_declaration.cc +++ b/tests/namespaces/method_inline_declaration.cc @@ -11,7 +11,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@S@Foo", "short_name": "Foo", - "qualified_name": "hello::Foo", + "detailed_name": "hello::Foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:1-4:2", "funcs": [0], @@ -21,7 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "void hello::Foo::foo()", + "detailed_name": "void hello::Foo::foo()", "definition_spelling": "3:8-3:11", "definition_extent": "3:3-3:16", "declaring_type": 0 diff --git a/tests/namespaces/namespace_reference.cc b/tests/namespaces/namespace_reference.cc index 36109fb4..17566a6a 100644 --- a/tests/namespaces/namespace_reference.cc +++ b/tests/namespaces/namespace_reference.cc @@ -16,7 +16,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@F@Accept#I#", "short_name": "Accept", - "qualified_name": "void ns::Accept(int)", + "detailed_name": "void ns::Accept(int)", "definition_spelling": "3:8-3:14", "definition_extent": "3:3-3:24", "callers": ["1@7:7-7:13", "1@9:3-9:9"] @@ -24,7 +24,7 @@ OUTPUT: "id": 1, "usr": "c:@F@Runner#", "short_name": "Runner", - "qualified_name": "void Runner()", + "detailed_name": "void Runner()", "definition_spelling": "6:6-6:12", "definition_extent": "6:1-10:2", "callees": ["0@7:7-7:13", "0@9:3-9:9"] @@ -33,7 +33,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@Foo", "short_name": "Foo", - "qualified_name": "int ns::Foo", + "detailed_name": "int ns::Foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:3-2:10", "uses": ["2:7-2:10", "7:18-7:21", "9:10-9:13"] @@ -41,7 +41,7 @@ OUTPUT: "id": 1, "usr": "c:namespace_reference.cc@42@N@ns@F@Accept#I#@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "3:19-3:20", "definition_extent": "3:15-3:20", "uses": ["3:19-3:20"] diff --git a/tests/outline/outline.cc b/tests/outline/outline.cc index 0d1bc6f8..a36cb354 100644 --- a/tests/outline/outline.cc +++ b/tests/outline/outline.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@S@MergeableUpdate", "short_name": "MergeableUpdate", - "qualified_name": "MergeableUpdate", + "detailed_name": "MergeableUpdate", "definition_spelling": "3:8-3:23", "definition_extent": "3:1-7:2", "vars": [0, 1, 2], @@ -29,7 +29,7 @@ OUTPUT: "id": 0, "usr": "c:@S@MergeableUpdate@FI@a", "short_name": "a", - "qualified_name": "int MergeableUpdate::a", + "detailed_name": "int MergeableUpdate::a", "definition_spelling": "4:7-4:8", "definition_extent": "4:3-4:8", "declaring_type": 0, @@ -38,7 +38,7 @@ OUTPUT: "id": 1, "usr": "c:@S@MergeableUpdate@FI@b", "short_name": "b", - "qualified_name": "int MergeableUpdate::b", + "detailed_name": "int MergeableUpdate::b", "definition_spelling": "5:7-5:8", "definition_extent": "5:3-5:8", "declaring_type": 0, @@ -47,7 +47,7 @@ OUTPUT: "id": 2, "usr": "c:@S@MergeableUpdate@FI@to_add", "short_name": "to_add", - "qualified_name": "std::vector MergeableUpdate::to_add", + "detailed_name": "std::vector MergeableUpdate::to_add", "definition_spelling": "6:20-6:26", "definition_extent": "6:3-6:26", "variable_type": 1, diff --git a/tests/outline/outline2.cc b/tests/outline/outline2.cc index fad9db6f..0330ea87 100644 --- a/tests/outline/outline2.cc +++ b/tests/outline/outline2.cc @@ -19,7 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@S@CompilationEntry", "short_name": "CompilationEntry", - "qualified_name": "CompilationEntry", + "detailed_name": "CompilationEntry", "definition_spelling": "6:8-6:24", "definition_extent": "6:1-10:2", "vars": [0, 1, 2], @@ -39,14 +39,14 @@ OUTPUT: "id": 0, "usr": "c:@F@LoadCompilationEntriesFromDirectory#&1$@N@std@S@basic_string>#C#$@N@std@S@char_traits>#C#$@N@std@S@allocator>#C#", "short_name": "LoadCompilationEntriesFromDirectory", - "qualified_name": "std::vector LoadCompilationEntriesFromDirectory(const std::string &)", + "detailed_name": "std::vector LoadCompilationEntriesFromDirectory(const std::string &)", "declarations": ["12:31-12:66"] }], "vars": [{ "id": 0, "usr": "c:@S@CompilationEntry@FI@directory", "short_name": "directory", - "qualified_name": "std::string CompilationEntry::directory", + "detailed_name": "std::string CompilationEntry::directory", "definition_spelling": "7:15-7:24", "definition_extent": "7:3-7:24", "variable_type": 1, @@ -56,7 +56,7 @@ OUTPUT: "id": 1, "usr": "c:@S@CompilationEntry@FI@filename", "short_name": "filename", - "qualified_name": "std::string CompilationEntry::filename", + "detailed_name": "std::string CompilationEntry::filename", "definition_spelling": "8:15-8:23", "definition_extent": "8:3-8:23", "variable_type": 1, @@ -66,7 +66,7 @@ OUTPUT: "id": 2, "usr": "c:@S@CompilationEntry@FI@args", "short_name": "args", - "qualified_name": "std::vector CompilationEntry::args", + "detailed_name": "std::vector CompilationEntry::args", "definition_spelling": "9:28-9:32", "definition_extent": "9:3-9:32", "variable_type": 2, diff --git a/tests/templates/func_specialized_template_param.cc b/tests/templates/func_specialized_template_param.cc index 5661c80e..16aba2d6 100644 --- a/tests/templates/func_specialized_template_param.cc +++ b/tests/templates/func_specialized_template_param.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Template", "short_name": "Template", - "qualified_name": "Template", + "detailed_name": "Template", "definition_spelling": "2:7-2:15", "definition_extent": "2:1-2:18", "uses": ["*2:7-2:15", "5:12-5:20", "*8:15-8:23"] @@ -22,7 +22,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "4:8-4:11", "definition_extent": "4:1-6:2", "funcs": [0], @@ -32,7 +32,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Bar#&$@S@Template>#d#", "short_name": "Bar", - "qualified_name": "void Foo::Bar(Template &)", + "detailed_name": "void Foo::Bar(Template &)", "declarations": ["5:8-5:11"], "definition_spelling": "8:11-8:14", "definition_extent": "8:1-8:36", diff --git a/tests/templates/implicit_variable_instantiation.cc b/tests/templates/implicit_variable_instantiation.cc index 95aff8fe..2ab52cd8 100644 --- a/tests/templates/implicit_variable_instantiation.cc +++ b/tests/templates/implicit_variable_instantiation.cc @@ -21,7 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@E@VarType", "short_name": "VarType", - "qualified_name": "ns::VarType", + "detailed_name": "ns::VarType", "definition_spelling": "2:8-2:15", "definition_extent": "2:3-2:18", "instantiations": [0], @@ -30,7 +30,7 @@ OUTPUT: "id": 1, "usr": "c:@N@ns@ST>1#T@Holder", "short_name": "Holder", - "qualified_name": "ns::Holder", + "detailed_name": "ns::Holder", "definition_spelling": "5:10-5:16", "definition_extent": "5:3-7:4", "vars": [0], @@ -40,7 +40,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@ST>1#T@Holder@static_var", "short_name": "static_var", - "qualified_name": "const ns::VarType ns::Holder::static_var", + "detailed_name": "const ns::VarType ns::Holder::static_var", "declaration": "6:30-6:40", "definition_spelling": "10:37-10:47", "definition_extent": "9:3-10:47", @@ -51,7 +51,7 @@ OUTPUT: "id": 1, "usr": "c:@N@ns@Foo", "short_name": "Foo", - "qualified_name": "int ns::Foo", + "detailed_name": "int ns::Foo", "definition_spelling": "13:7-13:10", "definition_extent": "13:3-13:36", "uses": ["13:7-13:10"] @@ -59,7 +59,7 @@ OUTPUT: "id": 2, "usr": "c:@N@ns@Foo2", "short_name": "Foo2", - "qualified_name": "int ns::Foo2", + "detailed_name": "int ns::Foo2", "definition_spelling": "14:7-14:11", "definition_extent": "14:3-14:37", "uses": ["14:7-14:11"] diff --git a/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc b/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc index 2f6b4da5..338b1160 100644 --- a/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc +++ b/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc @@ -18,7 +18,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@ST>1#T@Foo", "short_name": "Foo", - "qualified_name": "ns::Foo", + "detailed_name": "ns::Foo", "definition_spelling": "3:10-3:13", "definition_extent": "3:3-8:4", "funcs": [0], @@ -28,7 +28,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@ST>1#T@Foo@FT@>1#Tfoo#I#S", "short_name": "foo", - "qualified_name": "int ns::Foo::foo()", + "detailed_name": "int ns::Foo::foo()", "definition_spelling": "5:16-5:19", "definition_extent": "5:5-7:6", "declaring_type": 0, @@ -38,7 +38,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@a", "short_name": "a", - "qualified_name": "int ns::a", + "detailed_name": "int ns::a", "definition_spelling": "10:7-10:8", "definition_extent": "10:3-10:33", "uses": ["10:7-10:8"] @@ -46,7 +46,7 @@ OUTPUT: "id": 1, "usr": "c:@N@ns@b", "short_name": "b", - "qualified_name": "int ns::b", + "detailed_name": "int ns::b", "definition_spelling": "11:7-11:8", "definition_extent": "11:3-11:35", "uses": ["11:7-11:8"] diff --git a/tests/templates/namespace_template_type_usage_folded_into_one.cc b/tests/templates/namespace_template_type_usage_folded_into_one.cc index 7f8d74a2..db9ccf73 100644 --- a/tests/templates/namespace_template_type_usage_folded_into_one.cc +++ b/tests/templates/namespace_template_type_usage_folded_into_one.cc @@ -13,7 +13,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@ST>1#T@Foo", "short_name": "Foo", - "qualified_name": "ns::Foo", + "detailed_name": "ns::Foo", "definition_spelling": "3:9-3:12", "definition_extent": "3:3-3:15", "instantiations": [0, 1], @@ -23,7 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@a", "short_name": "a", - "qualified_name": "Foo ns::a", + "detailed_name": "Foo ns::a", "definition_spelling": "5:12-5:13", "definition_extent": "5:3-5:13", "variable_type": 0, @@ -32,7 +32,7 @@ OUTPUT: "id": 1, "usr": "c:@N@ns@b", "short_name": "b", - "qualified_name": "Foo ns::b", + "detailed_name": "Foo ns::b", "definition_spelling": "6:13-6:14", "definition_extent": "6:3-6:14", "variable_type": 0, diff --git a/tests/templates/specialized_func_definition.cc b/tests/templates/specialized_func_definition.cc index 64074723..db5d3a0f 100644 --- a/tests/templates/specialized_func_definition.cc +++ b/tests/templates/specialized_func_definition.cc @@ -19,7 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Template", "short_name": "Template", - "qualified_name": "Template", + "detailed_name": "Template", "definition_spelling": "2:7-2:15", "definition_extent": "2:1-4:2", "funcs": [0], @@ -29,7 +29,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Template@F@Foo#", "short_name": "Foo", - "qualified_name": "void Template::Foo()", + "detailed_name": "void Template::Foo()", "declarations": ["3:8-3:11", "9:22-9:25"], "definition_spelling": "7:19-7:22", "definition_extent": "6:1-7:24", diff --git a/tests/templates/template_class_func_usage_folded_into_one.cc b/tests/templates/template_class_func_usage_folded_into_one.cc index 11fd8e38..d5dbaff2 100644 --- a/tests/templates/template_class_func_usage_folded_into_one.cc +++ b/tests/templates/template_class_func_usage_folded_into_one.cc @@ -15,7 +15,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "2:8-2:11", "definition_extent": "2:1-6:2", "funcs": [0], @@ -25,7 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo@F@foo#S", "short_name": "foo", - "qualified_name": "int Foo::foo()", + "detailed_name": "int Foo::foo()", "definition_spelling": "3:14-3:17", "definition_extent": "3:3-5:4", "declaring_type": 0, @@ -35,7 +35,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "8:5-8:6", "definition_extent": "8:1-8:24", "uses": ["8:5-8:6"] @@ -43,7 +43,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "int b", + "detailed_name": "int b", "definition_spelling": "9:5-9:6", "definition_extent": "9:1-9:25", "uses": ["9:5-9:6"] diff --git a/tests/templates/template_class_template_func_usage_folded_into_one.cc b/tests/templates/template_class_template_func_usage_folded_into_one.cc index 94801e2a..7aa66ef8 100644 --- a/tests/templates/template_class_template_func_usage_folded_into_one.cc +++ b/tests/templates/template_class_template_func_usage_folded_into_one.cc @@ -16,7 +16,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "2:8-2:11", "definition_extent": "2:1-7:2", "funcs": [0], @@ -26,7 +26,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo@FT@>1#Tfoo#I#S", "short_name": "foo", - "qualified_name": "int Foo::foo()", + "detailed_name": "int Foo::foo()", "definition_spelling": "4:14-4:17", "definition_extent": "4:3-6:4", "declaring_type": 0, @@ -36,7 +36,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "9:5-9:6", "definition_extent": "9:1-9:31", "uses": ["9:5-9:6"] @@ -44,7 +44,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "int b", + "detailed_name": "int b", "definition_spelling": "10:5-10:6", "definition_extent": "10:1-10:33", "uses": ["10:5-10:6"] diff --git a/tests/templates/template_class_type_usage_folded_into_one.cc b/tests/templates/template_class_type_usage_folded_into_one.cc index 8be7387f..8aeb4a34 100644 --- a/tests/templates/template_class_type_usage_folded_into_one.cc +++ b/tests/templates/template_class_type_usage_folded_into_one.cc @@ -34,7 +34,7 @@ OUTPUT: "id": 0, "usr": "c:@E@A", "short_name": "A", - "qualified_name": "A", + "detailed_name": "A", "definition_spelling": "1:6-1:7", "definition_extent": "1:1-1:10", "uses": ["*1:6-1:7", "*9:5-9:6"] @@ -42,7 +42,7 @@ OUTPUT: "id": 1, "usr": "c:@E@B", "short_name": "B", - "qualified_name": "B", + "detailed_name": "B", "definition_spelling": "2:6-2:7", "definition_extent": "2:1-2:10", "uses": ["*2:6-2:7", "*10:5-10:6"] @@ -50,7 +50,7 @@ OUTPUT: "id": 2, "usr": "c:@ST>1#T@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "5:8-5:11", "definition_extent": "5:1-7:2", "uses": ["*5:8-5:11", "*9:1-9:4", "*10:1-10:4"] @@ -58,7 +58,7 @@ OUTPUT: "id": 3, "usr": "c:@ST>1#T@Foo@S@Inner", "short_name": "Inner", - "qualified_name": "Foo::Inner", + "detailed_name": "Foo::Inner", "definition_spelling": "6:10-6:15", "definition_extent": "6:3-6:18", "instantiations": [0, 1], @@ -68,7 +68,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "Foo::Inner a", + "detailed_name": "Foo::Inner a", "definition_spelling": "9:15-9:16", "definition_extent": "9:1-9:16", "variable_type": 3, @@ -77,7 +77,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "Foo::Inner b", + "detailed_name": "Foo::Inner b", "definition_spelling": "10:15-10:16", "definition_extent": "10:1-10:16", "variable_type": 3, diff --git a/tests/templates/template_class_var_usage_folded_into_one.cc b/tests/templates/template_class_var_usage_folded_into_one.cc index 1ab69001..78ee504f 100644 --- a/tests/templates/template_class_var_usage_folded_into_one.cc +++ b/tests/templates/template_class_var_usage_folded_into_one.cc @@ -13,7 +13,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "2:8-2:11", "definition_extent": "2:1-4:2", "uses": ["*2:8-2:11", "6:9-6:12", "7:9-7:12"] @@ -22,14 +22,14 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo@var", "short_name": "var", - "qualified_name": "const int Foo::var", + "detailed_name": "const int Foo::var", "declaration": "3:24-3:27", "uses": ["3:24-3:27", "6:19-6:22", "7:20-7:23"] }, { "id": 1, "usr": "c:@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "6:5-6:6", "definition_extent": "6:1-6:22", "uses": ["6:5-6:6"] @@ -37,7 +37,7 @@ OUTPUT: "id": 2, "usr": "c:@b", "short_name": "b", - "qualified_name": "int b", + "detailed_name": "int b", "definition_spelling": "7:5-7:6", "definition_extent": "7:1-7:23", "uses": ["7:5-7:6"] diff --git a/tests/templates/template_func_usage_folded_into_one.cc b/tests/templates/template_func_usage_folded_into_one.cc index 0a72c089..dad74234 100644 --- a/tests/templates/template_func_usage_folded_into_one.cc +++ b/tests/templates/template_func_usage_folded_into_one.cc @@ -16,7 +16,7 @@ OUTPUT: "id": 0, "usr": "c:template_func_usage_folded_into_one.cc@FT@>1#Tfoo#I#", "short_name": "foo", - "qualified_name": "int foo()", + "detailed_name": "int foo()", "definition_spelling": "2:12-2:15", "definition_extent": "2:1-4:2", "callers": ["-1@6:9-6:12", "-1@7:9-7:12"] @@ -25,7 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "6:5-6:6", "definition_extent": "6:1-6:19", "uses": ["6:5-6:6"] @@ -33,7 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "int b", + "detailed_name": "int b", "definition_spelling": "7:5-7:6", "definition_extent": "7:1-7:20", "uses": ["7:5-7:6"] diff --git a/tests/templates/template_type_usage_folded_into_one.cc b/tests/templates/template_type_usage_folded_into_one.cc index ea975a1a..1a5b14d9 100644 --- a/tests/templates/template_type_usage_folded_into_one.cc +++ b/tests/templates/template_type_usage_folded_into_one.cc @@ -11,7 +11,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "2:7-2:10", "definition_extent": "2:1-2:13", "instantiations": [0, 1], @@ -21,7 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "Foo a", + "detailed_name": "Foo a", "definition_spelling": "4:10-4:11", "definition_extent": "4:1-4:11", "variable_type": 0, @@ -30,7 +30,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "Foo b", + "detailed_name": "Foo b", "definition_spelling": "5:11-5:12", "definition_extent": "5:1-5:12", "variable_type": 0, diff --git a/tests/templates/template_var_usage_folded_into_one.cc b/tests/templates/template_var_usage_folded_into_one.cc index 779b3191..f12d7b10 100644 --- a/tests/templates/template_var_usage_folded_into_one.cc +++ b/tests/templates/template_var_usage_folded_into_one.cc @@ -34,7 +34,7 @@ OUTPUT: "id": 0, "usr": "c:@E@A", "short_name": "A", - "qualified_name": "A", + "detailed_name": "A", "definition_spelling": "1:6-1:7", "definition_extent": "1:1-1:10", "uses": ["*1:6-1:7", "7:13-7:14"] @@ -42,7 +42,7 @@ OUTPUT: "id": 1, "usr": "c:@E@B", "short_name": "B", - "qualified_name": "B", + "detailed_name": "B", "definition_spelling": "2:6-2:7", "definition_extent": "2:1-2:10", "uses": ["*2:6-2:7", "8:13-8:14"] @@ -55,7 +55,7 @@ OUTPUT: "id": 0, "usr": "c:@VT>1#T@var", "short_name": "var", - "qualified_name": "T var", + "detailed_name": "T var", "definition_spelling": "5:3-5:6", "definition_extent": "5:1-5:10", "uses": ["5:3-5:6", "7:9-7:12", "8:9-8:12"] @@ -63,7 +63,7 @@ OUTPUT: "id": 1, "usr": "c:@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "7:5-7:6", "definition_extent": "7:1-7:15", "uses": ["7:5-7:6"] @@ -71,7 +71,7 @@ OUTPUT: "id": 2, "usr": "c:@b", "short_name": "b", - "qualified_name": "int b", + "detailed_name": "int b", "definition_spelling": "8:5-8:6", "definition_extent": "8:1-8:15", "uses": ["8:5-8:6"] diff --git a/tests/types/anonymous_struct.cc b/tests/types/anonymous_struct.cc index 6b66f6e0..5b3a842e 100644 --- a/tests/types/anonymous_struct.cc +++ b/tests/types/anonymous_struct.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@U@vector3", "short_name": "vector3", - "qualified_name": "vector3", + "detailed_name": "vector3", "definition_spelling": "1:7-1:14", "definition_extent": "1:1-4:2", "vars": [3], @@ -19,7 +19,7 @@ OUTPUT: "id": 1, "usr": "c:@U@vector3@Sa", "short_name": "", - "qualified_name": "vector3::", + "detailed_name": "vector3::", "definition_spelling": "2:3-2:9", "definition_extent": "2:3-2:28", "vars": [0, 1, 2], @@ -29,7 +29,7 @@ OUTPUT: "id": 0, "usr": "c:@U@vector3@Sa@FI@x", "short_name": "x", - "qualified_name": "float x", + "detailed_name": "float x", "definition_spelling": "2:18-2:19", "definition_extent": "2:12-2:19", "declaring_type": 1, @@ -38,7 +38,7 @@ OUTPUT: "id": 1, "usr": "c:@U@vector3@Sa@FI@y", "short_name": "y", - "qualified_name": "float y", + "detailed_name": "float y", "definition_spelling": "2:21-2:22", "definition_extent": "2:12-2:22", "declaring_type": 1, @@ -47,7 +47,7 @@ OUTPUT: "id": 2, "usr": "c:@U@vector3@Sa@FI@z", "short_name": "z", - "qualified_name": "float z", + "detailed_name": "float z", "definition_spelling": "2:24-2:25", "definition_extent": "2:12-2:25", "declaring_type": 1, @@ -56,7 +56,7 @@ OUTPUT: "id": 3, "usr": "c:@U@vector3@FI@v", "short_name": "v", - "qualified_name": "float [3] vector3::v", + "detailed_name": "float [3] vector3::v", "definition_spelling": "3:9-3:10", "definition_extent": "3:3-3:13", "declaring_type": 0, diff --git a/tests/unions/union_decl.cc b/tests/unions/union_decl.cc index d3adab61..c549f978 100644 --- a/tests/unions/union_decl.cc +++ b/tests/unions/union_decl.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@U@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-4:2", "vars": [0, 1], @@ -20,7 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@U@Foo@FI@a", "short_name": "a", - "qualified_name": "int Foo::a", + "detailed_name": "int Foo::a", "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "declaring_type": 0, @@ -29,7 +29,7 @@ OUTPUT: "id": 1, "usr": "c:@U@Foo@FI@b", "short_name": "b", - "qualified_name": "bool Foo::b", + "detailed_name": "bool Foo::b", "definition_spelling": "3:8-3:9", "definition_extent": "3:3-3:9", "declaring_type": 0, diff --git a/tests/unions/union_usage.cc b/tests/unions/union_usage.cc index 8c542bfb..f79aa637 100644 --- a/tests/unions/union_usage.cc +++ b/tests/unions/union_usage.cc @@ -18,7 +18,7 @@ OUTPUT: "id": 0, "usr": "c:@U@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-4:2", "vars": [0, 1], @@ -29,7 +29,7 @@ OUTPUT: "id": 0, "usr": "c:@F@act#*$@U@Foo#", "short_name": "act", - "qualified_name": "void act(Foo *)", + "detailed_name": "void act(Foo *)", "definition_spelling": "8:6-8:9", "definition_extent": "8:1-10:2" }], @@ -37,7 +37,7 @@ OUTPUT: "id": 0, "usr": "c:@U@Foo@FI@a", "short_name": "a", - "qualified_name": "int Foo::a", + "detailed_name": "int Foo::a", "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:12", "declaring_type": 0, @@ -46,7 +46,7 @@ OUTPUT: "id": 1, "usr": "c:@U@Foo@FI@b", "short_name": "b", - "qualified_name": "bool Foo::b", + "detailed_name": "bool Foo::b", "definition_spelling": "3:8-3:9", "definition_extent": "3:3-3:13", "declaring_type": 0, @@ -55,7 +55,7 @@ OUTPUT: "id": 2, "usr": "c:@f", "short_name": "f", - "qualified_name": "Foo f", + "detailed_name": "Foo f", "definition_spelling": "6:5-6:6", "definition_extent": "6:1-6:6", "variable_type": 0, diff --git a/tests/usage/func_called_from_constructor.cc b/tests/usage/func_called_from_constructor.cc index 9c531f99..e4e26390 100644 --- a/tests/usage/func_called_from_constructor.cc +++ b/tests/usage/func_called_from_constructor.cc @@ -15,7 +15,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "3:8-3:11", "definition_extent": "3:1-5:2", "funcs": [1], @@ -25,7 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "void called()", + "detailed_name": "void called()", "definition_spelling": "1:6-1:12", "definition_extent": "1:1-1:17", "callers": ["1@8:3-8:9"] @@ -33,7 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", - "qualified_name": "void Foo::Foo()", + "detailed_name": "void Foo::Foo()", "declarations": ["4:3-4:6"], "definition_spelling": "7:6-7:9", "definition_extent": "7:1-9:2", diff --git a/tests/usage/func_called_from_macro_argument.cc b/tests/usage/func_called_from_macro_argument.cc index 13f47e80..86d4bfe1 100644 --- a/tests/usage/func_called_from_macro_argument.cc +++ b/tests/usage/func_called_from_macro_argument.cc @@ -13,14 +13,14 @@ OUTPUT: "id": 0, "usr": "c:@F@called#b#b#", "short_name": "called", - "qualified_name": "bool called(bool, bool)", + "detailed_name": "bool called(bool, bool)", "declarations": ["3:6-3:12"], "callers": ["1@6:14-6:20"] }, { "id": 1, "usr": "c:@F@caller#", "short_name": "caller", - "qualified_name": "void caller()", + "detailed_name": "void caller()", "definition_spelling": "5:6-5:12", "definition_extent": "5:1-7:2", "callees": ["0@6:14-6:20"] diff --git a/tests/usage/func_called_from_template.cc b/tests/usage/func_called_from_template.cc index fa3a0d54..4b34b39a 100644 --- a/tests/usage/func_called_from_template.cc +++ b/tests/usage/func_called_from_template.cc @@ -18,14 +18,14 @@ OUTPUT: "id": 0, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "void called()", + "detailed_name": "void called()", "declarations": ["1:6-1:12"], "callers": ["1@5:3-5:9"] }, { "id": 1, "usr": "c:@FT@>1#Tcaller#v#", "short_name": "caller", - "qualified_name": "void caller()", + "detailed_name": "void caller()", "definition_spelling": "4:6-4:12", "definition_extent": "4:1-6:2", "callers": ["2@9:3-9:9"], @@ -34,7 +34,7 @@ OUTPUT: "id": 2, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "8:6-8:9", "definition_extent": "8:1-10:2", "callees": ["1@9:3-9:9"] diff --git a/tests/usage/func_called_implicit_ctor.cc b/tests/usage/func_called_implicit_ctor.cc index b50250f3..4b3c6d42 100644 --- a/tests/usage/func_called_implicit_ctor.cc +++ b/tests/usage/func_called_implicit_ctor.cc @@ -15,7 +15,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Wrapper", "short_name": "Wrapper", - "qualified_name": "Wrapper", + "detailed_name": "Wrapper", "definition_spelling": "1:8-1:15", "definition_extent": "1:1-3:2", "funcs": [0], @@ -25,7 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Wrapper@F@Wrapper#I#", "short_name": "Wrapper", - "qualified_name": "void Wrapper::Wrapper(int)", + "detailed_name": "void Wrapper::Wrapper(int)", "declarations": ["2:3-2:10"], "declaring_type": 0, "callers": ["2@8:10-8:16"] @@ -33,7 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "int called()", + "detailed_name": "int called()", "definition_spelling": "5:5-5:11", "definition_extent": "5:1-5:27", "callers": ["2@8:10-8:16"] @@ -41,7 +41,7 @@ OUTPUT: "id": 2, "usr": "c:@F@caller#", "short_name": "caller", - "qualified_name": "Wrapper caller()", + "detailed_name": "Wrapper caller()", "definition_spelling": "7:9-7:15", "definition_extent": "7:1-9:2", "callees": ["0@8:10-8:16", "1@8:10-8:16"] diff --git a/tests/usage/func_usage_addr_func.cc b/tests/usage/func_usage_addr_func.cc index b0ed3734..0bf2261f 100644 --- a/tests/usage/func_usage_addr_func.cc +++ b/tests/usage/func_usage_addr_func.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@consume#*v#", "short_name": "consume", - "qualified_name": "void consume(void *)", + "detailed_name": "void consume(void *)", "definition_spelling": "1:6-1:13", "definition_extent": "1:1-1:23", "callers": ["2@7:3-7:10"] @@ -22,7 +22,7 @@ OUTPUT: "id": 1, "usr": "c:@F@used#", "short_name": "used", - "qualified_name": "void used()", + "detailed_name": "void used()", "definition_spelling": "3:6-3:10", "definition_extent": "3:1-3:15", "callers": ["2@6:13-6:17", "2@7:12-7:16"] @@ -30,7 +30,7 @@ OUTPUT: "id": 2, "usr": "c:@F@user#", "short_name": "user", - "qualified_name": "void user()", + "detailed_name": "void user()", "definition_spelling": "5:6-5:10", "definition_extent": "5:1-8:2", "callees": ["1@6:13-6:17", "0@7:3-7:10", "1@7:12-7:16"] @@ -39,7 +39,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_addr_func.cc@61@F@user#@x", "short_name": "x", - "qualified_name": "void (*)() x", + "detailed_name": "void (*)() x", "definition_spelling": "6:8-6:9", "definition_extent": "6:3-6:17", "uses": ["6:8-6:9"] diff --git a/tests/usage/func_usage_addr_method.cc b/tests/usage/func_usage_addr_method.cc index 49e480fc..08157b87 100644 --- a/tests/usage/func_usage_addr_method.cc +++ b/tests/usage/func_usage_addr_method.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-3:2", "funcs": [0], @@ -24,7 +24,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Used#", "short_name": "Used", - "qualified_name": "void Foo::Used()", + "detailed_name": "void Foo::Used()", "declarations": ["2:8-2:12"], "declaring_type": 0, "callers": ["1@6:18-6:22"] @@ -32,7 +32,7 @@ OUTPUT: "id": 1, "usr": "c:@F@user#", "short_name": "user", - "qualified_name": "void user()", + "detailed_name": "void user()", "definition_spelling": "5:6-5:10", "definition_extent": "5:1-7:2", "callees": ["0@6:18-6:22"] @@ -41,7 +41,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_addr_method.cc@53@F@user#@x", "short_name": "x", - "qualified_name": "void (Foo::*)() x", + "detailed_name": "void (Foo::*)() x", "definition_spelling": "6:8-6:9", "definition_extent": "6:3-6:22", "uses": ["6:8-6:9"] diff --git a/tests/usage/func_usage_call_func.cc b/tests/usage/func_usage_call_func.cc index c2749ee5..ece26390 100644 --- a/tests/usage/func_usage_call_func.cc +++ b/tests/usage/func_usage_call_func.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "void called()", + "detailed_name": "void called()", "definition_spelling": "1:6-1:12", "definition_extent": "1:1-1:17", "callers": ["1@3:3-3:9"] @@ -18,7 +18,7 @@ OUTPUT: "id": 1, "usr": "c:@F@caller#", "short_name": "caller", - "qualified_name": "void caller()", + "detailed_name": "void caller()", "definition_spelling": "2:6-2:12", "definition_extent": "2:1-4:2", "callees": ["0@3:3-3:9"] diff --git a/tests/usage/func_usage_call_method.cc b/tests/usage/func_usage_call_method.cc index 38345ed5..10af8e3b 100644 --- a/tests/usage/func_usage_call_method.cc +++ b/tests/usage/func_usage_call_method.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-3:2", "funcs": [0], @@ -25,7 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Used#", "short_name": "Used", - "qualified_name": "void Foo::Used()", + "detailed_name": "void Foo::Used()", "declarations": ["2:8-2:12"], "declaring_type": 0, "callers": ["1@7:6-7:10"] @@ -33,7 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@F@user#", "short_name": "user", - "qualified_name": "void user()", + "detailed_name": "void user()", "definition_spelling": "5:6-5:10", "definition_extent": "5:1-8:2", "callees": ["0@7:6-7:10"] @@ -42,7 +42,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_call_method.cc@53@F@user#@f", "short_name": "f", - "qualified_name": "Foo * f", + "detailed_name": "Foo * f", "definition_spelling": "6:8-6:9", "definition_extent": "6:3-6:19", "variable_type": 0, diff --git a/tests/usage/func_usage_class_inline_var_def.cc b/tests/usage/func_usage_class_inline_var_def.cc index 4af366eb..cad03e81 100644 --- a/tests/usage/func_usage_class_inline_var_def.cc +++ b/tests/usage/func_usage_class_inline_var_def.cc @@ -13,7 +13,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "5:7-5:10", "definition_extent": "5:1-7:2", "vars": [0], @@ -23,7 +23,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_class_inline_var_def.cc@F@helper#", "short_name": "helper", - "qualified_name": "int helper()", + "detailed_name": "int helper()", "definition_spelling": "1:12-1:18", "definition_extent": "1:1-3:2", "callers": ["-1@6:11-6:17"] @@ -32,7 +32,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@x", "short_name": "x", - "qualified_name": "int Foo::x", + "detailed_name": "int Foo::x", "definition_spelling": "6:7-6:8", "definition_extent": "6:3-6:19", "declaring_type": 0, diff --git a/tests/usage/func_usage_forward_decl_func.cc b/tests/usage/func_usage_forward_decl_func.cc index 2ad6afa0..0d37c8bf 100644 --- a/tests/usage/func_usage_forward_decl_func.cc +++ b/tests/usage/func_usage_forward_decl_func.cc @@ -10,14 +10,14 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "declarations": ["1:6-1:9"], "callers": ["1@4:3-4:6"] }, { "id": 1, "usr": "c:@F@usage#", "short_name": "usage", - "qualified_name": "void usage()", + "detailed_name": "void usage()", "definition_spelling": "3:6-3:11", "definition_extent": "3:1-5:2", "callees": ["0@4:3-4:6"] diff --git a/tests/usage/func_usage_forward_decl_method.cc b/tests/usage/func_usage_forward_decl_method.cc index 9128124d..1213ba7c 100644 --- a/tests/usage/func_usage_forward_decl_method.cc +++ b/tests/usage/func_usage_forward_decl_method.cc @@ -13,7 +13,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-3:2", "funcs": [0], @@ -24,7 +24,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "void Foo::foo()", + "detailed_name": "void Foo::foo()", "declarations": ["2:8-2:11"], "declaring_type": 0, "callers": ["1@7:6-7:9"] @@ -32,7 +32,7 @@ OUTPUT: "id": 1, "usr": "c:@F@usage#", "short_name": "usage", - "qualified_name": "void usage()", + "detailed_name": "void usage()", "definition_spelling": "5:6-5:11", "definition_extent": "5:1-8:2", "callees": ["0@7:6-7:9"] @@ -41,7 +41,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_forward_decl_method.cc@53@F@usage#@f", "short_name": "f", - "qualified_name": "Foo * f", + "detailed_name": "Foo * f", "definition_spelling": "6:8-6:9", "definition_extent": "6:3-6:19", "variable_type": 0, diff --git a/tests/usage/func_usage_template_func.cc b/tests/usage/func_usage_template_func.cc index 956ff252..aecc9fce 100644 --- a/tests/usage/func_usage_template_func.cc +++ b/tests/usage/func_usage_template_func.cc @@ -13,14 +13,14 @@ OUTPUT: "id": 0, "usr": "c:@FT@>1#Taccept#t0.0#v#", "short_name": "accept", - "qualified_name": "void accept(T)", + "detailed_name": "void accept(T)", "declarations": ["2:6-2:12"], "callers": ["1@5:3-5:9", "1@6:3-6:9"] }, { "id": 1, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "4:6-4:9", "definition_extent": "4:1-7:2", "callees": ["0@5:3-5:9", "0@6:3-6:9"] diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc index 8b1cabd0..9577accd 100644 --- a/tests/usage/type_usage_as_template_parameter.cc +++ b/tests/usage/type_usage_as_template_parameter.cc @@ -22,7 +22,7 @@ OUTPUT: "id": 1, "usr": "c:@S@S", "short_name": "S", - "qualified_name": "S", + "detailed_name": "S", "definition_spelling": "4:8-4:9", "definition_extent": "4:1-4:12", "uses": ["*4:8-4:9", "*7:19-7:20", "*9:12-9:13", "*10:14-10:15"] @@ -31,7 +31,7 @@ OUTPUT: "id": 0, "usr": "c:@F@return_type#", "short_name": "return_type", - "qualified_name": "unique_ptr *return_type()", + "detailed_name": "unique_ptr *return_type()", "definition_spelling": "9:16-9:27", "definition_extent": "9:1-12:2" }], @@ -39,7 +39,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_as_template_parameter.cc@f0", "short_name": "f0", - "qualified_name": "unique_ptr f0", + "detailed_name": "unique_ptr f0", "definition_spelling": "6:25-6:27", "definition_extent": "6:1-6:27", "variable_type": 0, @@ -48,7 +48,7 @@ OUTPUT: "id": 1, "usr": "c:type_usage_as_template_parameter.cc@f1", "short_name": "f1", - "qualified_name": "unique_ptr f1", + "detailed_name": "unique_ptr f1", "definition_spelling": "7:22-7:24", "definition_extent": "7:1-7:24", "variable_type": 0, @@ -57,7 +57,7 @@ OUTPUT: "id": 2, "usr": "c:type_usage_as_template_parameter.cc@150@F@return_type#@local", "short_name": "local", - "qualified_name": "unique_ptr * local", + "detailed_name": "unique_ptr * local", "definition_spelling": "10:18-10:23", "definition_extent": "10:3-10:23", "variable_type": 0, diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc index d8e182db..52a5708e 100644 --- a/tests/usage/type_usage_as_template_parameter_complex.cc +++ b/tests/usage/type_usage_as_template_parameter_complex.cc @@ -98,7 +98,7 @@ OUTPUT: "id": 3, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "64:7-64:10", "definition_extent": "64:1-66:2", "funcs": [3], @@ -108,28 +108,28 @@ OUTPUT: "id": 0, "usr": "c:@F@as_return_type#*$@S@unique_ptr>#$@S@S1#$@S@S2#", "short_name": "as_return_type", - "qualified_name": "unique_ptr, S2> *as_return_type(unique_ptr *)", + "detailed_name": "unique_ptr, S2> *as_return_type(unique_ptr *)", "definition_spelling": "33:37-33:51", "definition_extent": "33:1-33:92" }, { "id": 1, "usr": "c:@F@no_return_type#I#", "short_name": "no_return_type", - "qualified_name": "void no_return_type(int)", + "detailed_name": "void no_return_type(int)", "definition_spelling": "40:6-40:20", "definition_extent": "40:1-40:28" }, { "id": 2, "usr": "c:@F@empty#", "short_name": "empty", - "qualified_name": "void empty()", + "detailed_name": "void empty()", "definition_spelling": "53:6-53:11", "definition_extent": "53:1-55:2" }, { "id": 3, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "unique_ptr *Foo::foo()", + "detailed_name": "unique_ptr *Foo::foo()", "declarations": ["65:23-65:26"], "definition_spelling": "79:26-79:29", "definition_extent": "79:1-79:51", @@ -139,7 +139,7 @@ OUTPUT: "id": 0, "usr": "c:@f", "short_name": "f", - "qualified_name": "unique_ptr, S2> f", + "detailed_name": "unique_ptr, S2> f", "declaration": "15:43-15:44", "variable_type": 0, "uses": ["15:43-15:44"] @@ -147,7 +147,7 @@ OUTPUT: "id": 1, "usr": "c:type_usage_as_template_parameter_complex.cc@1062@F@empty#@local", "short_name": "local", - "qualified_name": "unique_ptr, S2> * local", + "detailed_name": "unique_ptr, S2> * local", "definition_spelling": "54:39-54:44", "definition_extent": "54:3-54:44", "variable_type": 0, diff --git a/tests/usage/type_usage_as_template_parameter_simple.cc b/tests/usage/type_usage_as_template_parameter_simple.cc index 3c326918..3f05462d 100644 --- a/tests/usage/type_usage_as_template_parameter_simple.cc +++ b/tests/usage/type_usage_as_template_parameter_simple.cc @@ -12,7 +12,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@unique_ptr", "short_name": "unique_ptr", - "qualified_name": "unique_ptr", + "detailed_name": "unique_ptr", "definition_spelling": "2:7-2:17", "definition_extent": "2:1-2:20", "instantiations": [0], @@ -26,7 +26,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_as_template_parameter_simple.cc@foo", "short_name": "foo", - "qualified_name": "unique_ptr foo", + "detailed_name": "unique_ptr foo", "definition_spelling": "6:22-6:25", "definition_extent": "6:1-6:25", "variable_type": 0, diff --git a/tests/usage/type_usage_declare_extern.cc b/tests/usage/type_usage_declare_extern.cc index f277ce57..4afbbec2 100644 --- a/tests/usage/type_usage_declare_extern.cc +++ b/tests/usage/type_usage_declare_extern.cc @@ -8,7 +8,7 @@ OUTPUT: "id": 0, "usr": "c:@S@T", "short_name": "T", - "qualified_name": "T", + "detailed_name": "T", "definition_spelling": "1:8-1:9", "definition_extent": "1:1-1:12", "instantiations": [0], @@ -18,7 +18,7 @@ OUTPUT: "id": 0, "usr": "c:@t", "short_name": "t", - "qualified_name": "T t", + "detailed_name": "T t", "declaration": "3:10-3:11", "variable_type": 0, "uses": ["3:10-3:11"] diff --git a/tests/usage/type_usage_declare_field.cc b/tests/usage/type_usage_declare_field.cc index 475b0067..0041faa2 100644 --- a/tests/usage/type_usage_declare_field.cc +++ b/tests/usage/type_usage_declare_field.cc @@ -18,7 +18,7 @@ OUTPUT: "id": 1, "usr": "c:@S@ImplementedType", "short_name": "ImplementedType", - "qualified_name": "ImplementedType", + "detailed_name": "ImplementedType", "definition_spelling": "2:8-2:23", "definition_extent": "2:1-2:26", "instantiations": [1], @@ -27,7 +27,7 @@ OUTPUT: "id": 2, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "4:8-4:11", "definition_extent": "4:1-7:2", "vars": [0, 1], @@ -37,7 +37,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@a", "short_name": "a", - "qualified_name": "ForwardType * Foo::a", + "detailed_name": "ForwardType * Foo::a", "definition_spelling": "5:16-5:17", "definition_extent": "5:3-5:17", "variable_type": 0, @@ -47,7 +47,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@FI@b", "short_name": "b", - "qualified_name": "ImplementedType Foo::b", + "detailed_name": "ImplementedType Foo::b", "definition_spelling": "6:19-6:20", "definition_extent": "6:3-6:20", "variable_type": 1, diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc index 069c9648..7b359db0 100644 --- a/tests/usage/type_usage_declare_local.cc +++ b/tests/usage/type_usage_declare_local.cc @@ -18,7 +18,7 @@ OUTPUT: "id": 1, "usr": "c:@S@ImplementedType", "short_name": "ImplementedType", - "qualified_name": "ImplementedType", + "detailed_name": "ImplementedType", "definition_spelling": "2:8-2:23", "definition_extent": "2:1-2:26", "instantiations": [1], @@ -28,7 +28,7 @@ OUTPUT: "id": 0, "usr": "c:@F@Foo#", "short_name": "Foo", - "qualified_name": "void Foo()", + "detailed_name": "void Foo()", "definition_spelling": "4:6-4:9", "definition_extent": "4:1-7:2" }], @@ -36,7 +36,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_declare_local.cc@67@F@Foo#@a", "short_name": "a", - "qualified_name": "ForwardType * a", + "detailed_name": "ForwardType * a", "definition_spelling": "5:16-5:17", "definition_extent": "5:3-5:17", "variable_type": 0, @@ -45,7 +45,7 @@ OUTPUT: "id": 1, "usr": "c:type_usage_declare_local.cc@86@F@Foo#@b", "short_name": "b", - "qualified_name": "ImplementedType b", + "detailed_name": "ImplementedType b", "definition_spelling": "6:19-6:20", "definition_extent": "6:3-6:20", "variable_type": 1, diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc index 998c4d1a..a163ca0e 100644 --- a/tests/usage/type_usage_declare_param.cc +++ b/tests/usage/type_usage_declare_param.cc @@ -15,7 +15,7 @@ OUTPUT: "id": 1, "usr": "c:@S@ImplementedType", "short_name": "ImplementedType", - "qualified_name": "ImplementedType", + "detailed_name": "ImplementedType", "definition_spelling": "2:8-2:23", "definition_extent": "2:1-2:26", "instantiations": [1], @@ -25,7 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#*$@S@ForwardType#$@S@ImplementedType#", "short_name": "foo", - "qualified_name": "void foo(ForwardType *, ImplementedType)", + "detailed_name": "void foo(ForwardType *, ImplementedType)", "definition_spelling": "4:6-4:9", "definition_extent": "4:1-4:47" }], @@ -33,7 +33,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_declare_param.cc@60@F@foo#*$@S@ForwardType#$@S@ImplementedType#@f", "short_name": "f", - "qualified_name": "ForwardType * f", + "detailed_name": "ForwardType * f", "definition_spelling": "4:23-4:24", "definition_extent": "4:10-4:24", "variable_type": 0, @@ -42,7 +42,7 @@ OUTPUT: "id": 1, "usr": "c:type_usage_declare_param.cc@76@F@foo#*$@S@ForwardType#$@S@ImplementedType#@a", "short_name": "a", - "qualified_name": "ImplementedType a", + "detailed_name": "ImplementedType a", "definition_spelling": "4:42-4:43", "definition_extent": "4:26-4:43", "variable_type": 1, diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc index c1593816..53c316e8 100644 --- a/tests/usage/type_usage_declare_param_prototype.cc +++ b/tests/usage/type_usage_declare_param_prototype.cc @@ -21,7 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#*$@S@Foo#S0_#", "short_name": "foo", - "qualified_name": "void foo(Foo *, Foo *)", + "detailed_name": "void foo(Foo *, Foo *)", "declarations": ["3:6-3:9"], "definition_spelling": "4:6-4:9", "definition_extent": "4:1-4:26" @@ -30,7 +30,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_declare_param_prototype.cc@49@F@foo#*$@S@Foo#S0_#@f", "short_name": "f", - "qualified_name": "Foo * f", + "detailed_name": "Foo * f", "definition_spelling": "4:15-4:16", "definition_extent": "4:10-4:16", "variable_type": 0, diff --git a/tests/usage/type_usage_declare_param_unnamed.cc b/tests/usage/type_usage_declare_param_unnamed.cc index f3578a75..c084c2a1 100644 --- a/tests/usage/type_usage_declare_param_unnamed.cc +++ b/tests/usage/type_usage_declare_param_unnamed.cc @@ -12,7 +12,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#*$@S@ForwardType#", "short_name": "foo", - "qualified_name": "void foo(ForwardType *)", + "detailed_name": "void foo(ForwardType *)", "definition_spelling": "2:6-2:9", "definition_extent": "2:1-2:26" }] diff --git a/tests/usage/type_usage_declare_qualifiers.cc b/tests/usage/type_usage_declare_qualifiers.cc index 33701ce5..451f02ff 100644 --- a/tests/usage/type_usage_declare_qualifiers.cc +++ b/tests/usage/type_usage_declare_qualifiers.cc @@ -13,7 +13,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Type", "short_name": "Type", - "qualified_name": "Type", + "detailed_name": "Type", "definition_spelling": "1:8-1:12", "definition_extent": "1:1-1:15", "instantiations": [0, 1, 2, 3, 4, 5], @@ -23,7 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#&$@S@Type#&1S1_#", "short_name": "foo", - "qualified_name": "void foo(Type &, const Type &)", + "detailed_name": "void foo(Type &, const Type &)", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-8:2" }], @@ -31,7 +31,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_declare_qualifiers.cc@28@F@foo#&$@S@Type#&1S1_#@a0", "short_name": "a0", - "qualified_name": "Type & a0", + "detailed_name": "Type & a0", "definition_spelling": "3:16-3:18", "definition_extent": "3:10-3:18", "variable_type": 0, @@ -40,7 +40,7 @@ OUTPUT: "id": 1, "usr": "c:type_usage_declare_qualifiers.cc@38@F@foo#&$@S@Type#&1S1_#@a1", "short_name": "a1", - "qualified_name": "const Type & a1", + "detailed_name": "const Type & a1", "definition_spelling": "3:32-3:34", "definition_extent": "3:20-3:34", "variable_type": 0, @@ -49,7 +49,7 @@ OUTPUT: "id": 2, "usr": "c:type_usage_declare_qualifiers.cc@59@F@foo#&$@S@Type#&1S1_#@a2", "short_name": "a2", - "qualified_name": "Type a2", + "detailed_name": "Type a2", "definition_spelling": "4:8-4:10", "definition_extent": "4:3-4:10", "variable_type": 0, @@ -58,7 +58,7 @@ OUTPUT: "id": 3, "usr": "c:type_usage_declare_qualifiers.cc@71@F@foo#&$@S@Type#&1S1_#@a3", "short_name": "a3", - "qualified_name": "Type * a3", + "detailed_name": "Type * a3", "definition_spelling": "5:9-5:11", "definition_extent": "5:3-5:11", "variable_type": 0, @@ -67,7 +67,7 @@ OUTPUT: "id": 4, "usr": "c:type_usage_declare_qualifiers.cc@84@F@foo#&$@S@Type#&1S1_#@a4", "short_name": "a4", - "qualified_name": "const Type * a4", + "detailed_name": "const Type * a4", "definition_spelling": "6:15-6:17", "definition_extent": "6:3-6:17", "variable_type": 0, @@ -76,7 +76,7 @@ OUTPUT: "id": 5, "usr": "c:type_usage_declare_qualifiers.cc@103@F@foo#&$@S@Type#&1S1_#@a5", "short_name": "a5", - "qualified_name": "const Type * a5", + "detailed_name": "const Type * a5", "definition_spelling": "7:21-7:23", "definition_extent": "7:3-7:23", "variable_type": 0, diff --git a/tests/usage/type_usage_declare_static.cc b/tests/usage/type_usage_declare_static.cc index d2611efc..f5102d50 100644 --- a/tests/usage/type_usage_declare_static.cc +++ b/tests/usage/type_usage_declare_static.cc @@ -13,7 +13,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_declare_static.cc@t", "short_name": "t", - "qualified_name": "Type t", + "detailed_name": "Type t", "definition_spelling": "2:13-2:14", "definition_extent": "2:1-2:14", "variable_type": 0, diff --git a/tests/usage/type_usage_on_return_type.cc b/tests/usage/type_usage_on_return_type.cc index 0f82d29f..2aa7c7ff 100644 --- a/tests/usage/type_usage_on_return_type.cc +++ b/tests/usage/type_usage_on_return_type.cc @@ -28,7 +28,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "7:7-7:10", "definition_extent": "7:1-10:2", "funcs": [1, 2], @@ -38,7 +38,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "Type *foo()", + "detailed_name": "Type *foo()", "declarations": ["3:7-3:10", "4:7-4:10"], "definition_spelling": "5:7-5:10", "definition_extent": "5:1-5:15" @@ -46,7 +46,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@F@Get#I#", "short_name": "Get", - "qualified_name": "Type *Foo::Get(int)", + "detailed_name": "Type *Foo::Get(int)", "declarations": ["8:9-8:12"], "definition_spelling": "12:12-12:15", "definition_extent": "12:1-12:23", @@ -55,7 +55,7 @@ OUTPUT: "id": 2, "usr": "c:@S@Foo@F@Empty#", "short_name": "Empty", - "qualified_name": "void Foo::Empty()", + "detailed_name": "void Foo::Empty()", "declarations": ["9:8-9:13"], "definition_spelling": "13:11-13:16", "definition_extent": "13:1-13:21", @@ -64,13 +64,13 @@ OUTPUT: "id": 3, "usr": "c:@F@external#", "short_name": "external", - "qualified_name": "const Type &external()", + "detailed_name": "const Type &external()", "declarations": ["15:20-15:28"] }, { "id": 4, "usr": "c:type_usage_on_return_type.cc@F@bar#", "short_name": "bar", - "qualified_name": "Type *bar()", + "detailed_name": "Type *bar()", "declarations": ["17:14-17:17"], "definition_spelling": "18:14-18:17", "definition_extent": "18:1-18:22" diff --git a/tests/usage/type_usage_typedef_and_using.cc b/tests/usage/type_usage_typedef_and_using.cc index 061f67ef..da6f1c40 100644 --- a/tests/usage/type_usage_typedef_and_using.cc +++ b/tests/usage/type_usage_typedef_and_using.cc @@ -20,7 +20,7 @@ OUTPUT: "id": 1, "usr": "c:@Foo1", "short_name": "Foo1", - "qualified_name": "Foo1", + "detailed_name": "Foo1", "definition_spelling": "2:7-2:11", "definition_extent": "2:1-2:18", "alias_of": 0, @@ -29,7 +29,7 @@ OUTPUT: "id": 2, "usr": "c:type_usage_typedef_and_using.cc@T@Foo2", "short_name": "Foo2", - "qualified_name": "Foo2", + "detailed_name": "Foo2", "definition_spelling": "3:13-3:17", "definition_extent": "3:1-3:17", "alias_of": 0, @@ -38,7 +38,7 @@ OUTPUT: "id": 3, "usr": "c:@Foo3", "short_name": "Foo3", - "qualified_name": "Foo3", + "detailed_name": "Foo3", "definition_spelling": "4:7-4:11", "definition_extent": "4:1-4:18", "alias_of": 1, @@ -47,7 +47,7 @@ OUTPUT: "id": 4, "usr": "c:@Foo4", "short_name": "Foo4", - "qualified_name": "Foo4", + "detailed_name": "Foo4", "definition_spelling": "5:7-5:11", "definition_extent": "5:1-5:17", "uses": ["*5:7-5:11"] @@ -56,28 +56,28 @@ OUTPUT: "id": 0, "usr": "c:@F@accept#*$@S@Foo#", "short_name": "accept", - "qualified_name": "void accept(Foo *)", + "detailed_name": "void accept(Foo *)", "definition_spelling": "7:6-7:12", "definition_extent": "7:1-7:21" }, { "id": 1, "usr": "c:@F@accept1#**$@S@Foo#", "short_name": "accept1", - "qualified_name": "void accept1(Foo1 *)", + "detailed_name": "void accept1(Foo1 *)", "definition_spelling": "8:6-8:13", "definition_extent": "8:1-8:23" }, { "id": 2, "usr": "c:@F@accept2#*$@S@Foo#", "short_name": "accept2", - "qualified_name": "void accept2(Foo2 *)", + "detailed_name": "void accept2(Foo2 *)", "definition_spelling": "9:6-9:13", "definition_extent": "9:1-9:23" }, { "id": 3, "usr": "c:@F@accept3#**$@S@Foo#", "short_name": "accept3", - "qualified_name": "void accept3(Foo3 *)", + "detailed_name": "void accept3(Foo3 *)", "definition_spelling": "10:6-10:13", "definition_extent": "10:1-10:23" }] diff --git a/tests/usage/type_usage_typedef_and_using_template.cc b/tests/usage/type_usage_typedef_and_using_template.cc index 4de139e3..f64c4a9d 100644 --- a/tests/usage/type_usage_typedef_and_using_template.cc +++ b/tests/usage/type_usage_typedef_and_using_template.cc @@ -15,7 +15,7 @@ OUTPUT: "id": 1, "usr": "c:@Foo1", "short_name": "Foo1", - "qualified_name": "Foo1", + "detailed_name": "Foo1", "definition_spelling": "4:7-4:11", "definition_extent": "4:1-4:22", "alias_of": 0, @@ -24,7 +24,7 @@ OUTPUT: "id": 2, "usr": "c:type_usage_typedef_and_using_template.cc@T@Foo2", "short_name": "Foo2", - "qualified_name": "Foo2", + "detailed_name": "Foo2", "definition_spelling": "5:19-5:23", "definition_extent": "5:1-5:23", "alias_of": 0, diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc index a49a8bf0..08e19151 100644 --- a/tests/usage/type_usage_various.cc +++ b/tests/usage/type_usage_various.cc @@ -16,7 +16,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", "funcs": [0], @@ -27,7 +27,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@make#", "short_name": "make", - "qualified_name": "Foo *Foo::make()", + "detailed_name": "Foo *Foo::make()", "declarations": ["2:8-2:12"], "definition_spelling": "5:11-5:15", "definition_extent": "5:1-8:2", @@ -37,7 +37,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_various.cc@57@S@Foo@F@make#@f", "short_name": "f", - "qualified_name": "Foo f", + "detailed_name": "Foo f", "definition_spelling": "6:7-6:8", "definition_extent": "6:3-6:8", "variable_type": 0, @@ -46,7 +46,7 @@ OUTPUT: "id": 1, "usr": "c:@foo", "short_name": "foo", - "qualified_name": "Foo foo", + "detailed_name": "Foo foo", "declaration": "10:12-10:15", "variable_type": 0, "uses": ["10:12-10:15"] diff --git a/tests/usage/usage_inside_of_call.cc b/tests/usage/usage_inside_of_call.cc index 2298d9c2..be010886 100644 --- a/tests/usage/usage_inside_of_call.cc +++ b/tests/usage/usage_inside_of_call.cc @@ -21,7 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "5:8-5:11", "definition_extent": "5:1-8:2", "vars": [1, 0], @@ -31,21 +31,21 @@ OUTPUT: "id": 0, "usr": "c:@F@called#I#", "short_name": "called", - "qualified_name": "void called(int)", + "detailed_name": "void called(int)", "declarations": ["1:6-1:12"], "callers": ["2@14:3-14:9"] }, { "id": 1, "usr": "c:@F@gen#", "short_name": "gen", - "qualified_name": "int gen()", + "detailed_name": "int gen()", "declarations": ["3:5-3:8"], "callers": ["2@14:14-14:17"] }, { "id": 2, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "12:6-12:9", "definition_extent": "12:1-15:2", "callees": ["0@14:3-14:9", "1@14:14-14:17"] @@ -54,7 +54,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@static_var", "short_name": "static_var", - "qualified_name": "int Foo::static_var", + "detailed_name": "int Foo::static_var", "declaration": "6:14-6:24", "definition_spelling": "10:10-10:20", "definition_extent": "10:1-10:24", @@ -64,7 +64,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@FI@field_var", "short_name": "field_var", - "qualified_name": "int Foo::field_var", + "detailed_name": "int Foo::field_var", "definition_spelling": "7:7-7:16", "definition_extent": "7:3-7:16", "declaring_type": 0, @@ -73,7 +73,7 @@ OUTPUT: "id": 2, "usr": "c:usage_inside_of_call.cc@145@F@foo#@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "13:7-13:8", "definition_extent": "13:3-13:12", "uses": ["13:7-13:8", "14:10-14:11"] diff --git a/tests/usage/usage_inside_of_call_simple.cc b/tests/usage/usage_inside_of_call_simple.cc index 02985b15..8bb1470b 100644 --- a/tests/usage/usage_inside_of_call_simple.cc +++ b/tests/usage/usage_inside_of_call_simple.cc @@ -13,14 +13,14 @@ OUTPUT: "id": 0, "usr": "c:@F@called#I#", "short_name": "called", - "qualified_name": "void called(int)", + "detailed_name": "void called(int)", "declarations": ["1:6-1:12"], "callers": ["2@6:3-6:9"] }, { "id": 1, "usr": "c:@F@gen#", "short_name": "gen", - "qualified_name": "int gen()", + "detailed_name": "int gen()", "definition_spelling": "3:5-3:8", "definition_extent": "3:1-3:24", "callers": ["2@6:10-6:13", "2@6:18-6:21"] @@ -28,7 +28,7 @@ OUTPUT: "id": 2, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "5:6-5:9", "definition_extent": "5:1-7:2", "callees": ["0@6:3-6:9", "1@6:10-6:13", "1@6:18-6:21"] diff --git a/tests/usage/var_usage_call_function.cc b/tests/usage/var_usage_call_function.cc index 66a37f64..2d411d1d 100644 --- a/tests/usage/var_usage_call_function.cc +++ b/tests/usage/var_usage_call_function.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "void called()", + "detailed_name": "void called()", "definition_spelling": "1:6-1:12", "definition_extent": "1:1-1:17", "callers": ["1@4:13-4:19", "1@7:3-7:9"] @@ -22,7 +22,7 @@ OUTPUT: "id": 1, "usr": "c:@F@caller#", "short_name": "caller", - "qualified_name": "void caller()", + "detailed_name": "void caller()", "definition_spelling": "3:6-3:12", "definition_extent": "3:1-8:2", "callees": ["0@4:13-4:19", "0@7:3-7:9"] @@ -31,7 +31,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_call_function.cc@39@F@caller#@x", "short_name": "x", - "qualified_name": "void (*)() x", + "detailed_name": "void (*)() x", "definition_spelling": "4:8-4:9", "definition_extent": "4:3-4:19", "uses": ["4:8-4:9", "5:3-5:4"] diff --git a/tests/usage/var_usage_class_member.cc b/tests/usage/var_usage_class_member.cc index a8daa08b..c98db108 100644 --- a/tests/usage/var_usage_class_member.cc +++ b/tests/usage/var_usage_class_member.cc @@ -24,7 +24,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-5:2", "vars": [0, 1], @@ -35,21 +35,21 @@ OUTPUT: "id": 0, "usr": "c:@F@accept#I#", "short_name": "accept", - "qualified_name": "void accept(int)", + "detailed_name": "void accept(int)", "declarations": ["7:6-7:12"], "callers": ["2@14:3-14:9", "2@15:3-15:9", "2@17:3-17:9"] }, { "id": 1, "usr": "c:@F@accept#*I#", "short_name": "accept", - "qualified_name": "void accept(int *)", + "detailed_name": "void accept(int *)", "declarations": ["8:6-8:12"], "callers": ["2@16:3-16:9"] }, { "id": 2, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "10:6-10:9", "definition_extent": "10:1-18:2", "callees": ["0@14:3-14:9", "0@15:3-15:9", "1@16:3-16:9", "0@17:3-17:9"] @@ -58,7 +58,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@x", "short_name": "x", - "qualified_name": "int Foo::x", + "detailed_name": "int Foo::x", "definition_spelling": "3:7-3:8", "definition_extent": "3:3-3:8", "declaring_type": 0, @@ -67,7 +67,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@FI@y", "short_name": "y", - "qualified_name": "int Foo::y", + "detailed_name": "int Foo::y", "definition_spelling": "4:7-4:8", "definition_extent": "4:3-4:8", "declaring_type": 0, @@ -76,7 +76,7 @@ OUTPUT: "id": 2, "usr": "c:var_usage_class_member.cc@105@F@foo#@f", "short_name": "f", - "qualified_name": "Foo f", + "detailed_name": "Foo f", "definition_spelling": "11:7-11:8", "definition_extent": "11:3-11:8", "variable_type": 0, diff --git a/tests/usage/var_usage_class_member_static.cc b/tests/usage/var_usage_class_member_static.cc index 9a9c6bf8..bd1edc2b 100644 --- a/tests/usage/var_usage_class_member_static.cc +++ b/tests/usage/var_usage_class_member_static.cc @@ -15,7 +15,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:8-1:11", "definition_extent": "1:1-3:2", "uses": ["*1:8-1:11", "8:10-8:13"] @@ -24,14 +24,14 @@ OUTPUT: "id": 0, "usr": "c:@F@accept#I#", "short_name": "accept", - "qualified_name": "void accept(int)", + "detailed_name": "void accept(int)", "declarations": ["5:6-5:12"], "callers": ["1@8:3-8:9"] }, { "id": 1, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "7:6-7:9", "definition_extent": "7:1-9:2", "callees": ["0@8:3-8:9"] @@ -40,7 +40,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@x", "short_name": "x", - "qualified_name": "int Foo::x", + "detailed_name": "int Foo::x", "declaration": "2:14-2:15", "uses": ["2:14-2:15", "8:15-8:16"] }] diff --git a/tests/usage/var_usage_cstyle_cast.cc b/tests/usage/var_usage_cstyle_cast.cc index 1060a420..281daea5 100644 --- a/tests/usage/var_usage_cstyle_cast.cc +++ b/tests/usage/var_usage_cstyle_cast.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@E@VarType", "short_name": "VarType", - "qualified_name": "VarType", + "detailed_name": "VarType", "definition_spelling": "1:6-1:13", "definition_extent": "1:1-1:16", "instantiations": [0], @@ -23,7 +23,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Holder", "short_name": "Holder", - "qualified_name": "Holder", + "detailed_name": "Holder", "definition_spelling": "3:8-3:14", "definition_extent": "3:1-5:2", "vars": [0], @@ -33,7 +33,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Holder@static_var", "short_name": "static_var", - "qualified_name": "const VarType Holder::static_var", + "detailed_name": "const VarType Holder::static_var", "declaration": "4:28-4:38", "definition_spelling": "7:23-7:33", "definition_extent": "7:1-7:33", diff --git a/tests/usage/var_usage_extern.cc b/tests/usage/var_usage_extern.cc index 72ac718a..2095d452 100644 --- a/tests/usage/var_usage_extern.cc +++ b/tests/usage/var_usage_extern.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-5:2" }], @@ -18,7 +18,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "declaration": "1:12-1:13", "uses": ["1:12-1:13", "4:3-4:4"] }] diff --git a/tests/usage/var_usage_func_parameter.cc b/tests/usage/var_usage_func_parameter.cc index ef6a390b..3f8be1b9 100644 --- a/tests/usage/var_usage_func_parameter.cc +++ b/tests/usage/var_usage_func_parameter.cc @@ -8,7 +8,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#", "short_name": "foo", - "qualified_name": "void foo(int)", + "detailed_name": "void foo(int)", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-3:2" }], @@ -16,7 +16,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_func_parameter.cc@9@F@foo#I#@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "1:14-1:15", "definition_extent": "1:10-1:15", "uses": ["1:14-1:15", "2:3-2:4"] diff --git a/tests/usage/var_usage_local.cc b/tests/usage/var_usage_local.cc index caf0a7cb..1654fc8a 100644 --- a/tests/usage/var_usage_local.cc +++ b/tests/usage/var_usage_local.cc @@ -9,7 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-4:2" }], @@ -17,7 +17,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_local.cc@16@F@foo#@x", "short_name": "x", - "qualified_name": "int x", + "detailed_name": "int x", "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "uses": ["2:7-2:8", "3:3-3:4"] diff --git a/tests/usage/var_usage_shadowed_local.cc b/tests/usage/var_usage_shadowed_local.cc index ae152c89..cdb4a511 100644 --- a/tests/usage/var_usage_shadowed_local.cc +++ b/tests/usage/var_usage_shadowed_local.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-9:2" }], @@ -22,7 +22,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_shadowed_local.cc@16@F@foo#@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "uses": ["2:7-2:8", "3:3-3:4", "8:3-8:4"] @@ -30,7 +30,7 @@ OUTPUT: "id": 1, "usr": "c:var_usage_shadowed_local.cc@43@F@foo#@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "5:9-5:10", "definition_extent": "5:5-5:10", "uses": ["5:9-5:10", "6:5-6:6"] diff --git a/tests/usage/var_usage_shadowed_parameter.cc b/tests/usage/var_usage_shadowed_parameter.cc index b410a5e8..174a652c 100644 --- a/tests/usage/var_usage_shadowed_parameter.cc +++ b/tests/usage/var_usage_shadowed_parameter.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#", "short_name": "foo", - "qualified_name": "void foo(int)", + "detailed_name": "void foo(int)", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-8:2" }], @@ -22,7 +22,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_shadowed_parameter.cc@9@F@foo#I#@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "1:14-1:15", "definition_extent": "1:10-1:15", "uses": ["1:14-1:15", "2:3-2:4", "7:3-7:4"] @@ -30,7 +30,7 @@ OUTPUT: "id": 1, "usr": "c:var_usage_shadowed_parameter.cc@38@F@foo#I#@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "4:9-4:10", "definition_extent": "4:5-4:10", "uses": ["4:9-4:10", "5:5-5:6"] diff --git a/tests/usage/var_usage_static.cc b/tests/usage/var_usage_static.cc index 3122c008..ae18e5aa 100644 --- a/tests/usage/var_usage_static.cc +++ b/tests/usage/var_usage_static.cc @@ -11,7 +11,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-5:2" }], @@ -19,7 +19,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_static.cc@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "1:12-1:13", "definition_extent": "1:1-1:13", "uses": ["1:12-1:13", "4:3-4:4"] diff --git a/tests/vars/class_member.cc b/tests/vars/class_member.cc index 145ce7d5..0cb7b587 100644 --- a/tests/vars/class_member.cc +++ b/tests/vars/class_member.cc @@ -8,7 +8,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", "vars": [0], @@ -19,7 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@member", "short_name": "member", - "qualified_name": "Foo * Foo::member", + "detailed_name": "Foo * Foo::member", "definition_spelling": "2:8-2:14", "definition_extent": "2:3-2:14", "variable_type": 0, diff --git a/tests/vars/class_static_member.cc b/tests/vars/class_static_member.cc index 9613d55a..6a927a06 100644 --- a/tests/vars/class_static_member.cc +++ b/tests/vars/class_static_member.cc @@ -10,7 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", "vars": [0], @@ -21,7 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@member", "short_name": "member", - "qualified_name": "Foo * Foo::member", + "detailed_name": "Foo * Foo::member", "declaration": "2:15-2:21", "definition_spelling": "4:11-4:17", "definition_extent": "4:1-4:27", diff --git a/tests/vars/class_static_member_decl_only.cc b/tests/vars/class_static_member_decl_only.cc index 82cce811..b0856257 100644 --- a/tests/vars/class_static_member_decl_only.cc +++ b/tests/vars/class_static_member_decl_only.cc @@ -8,7 +8,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo", "short_name": "Foo", - "qualified_name": "Foo", + "detailed_name": "Foo", "definition_spelling": "1:7-1:10", "definition_extent": "1:1-3:2", "uses": ["*1:7-1:10"] @@ -17,7 +17,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@member", "short_name": "member", - "qualified_name": "int Foo::member", + "detailed_name": "int Foo::member", "declaration": "2:14-2:20", "uses": ["2:14-2:20"] }] diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc index 63161338..75c24b48 100644 --- a/tests/vars/function_local.cc +++ b/tests/vars/function_local.cc @@ -17,7 +17,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-5:2" }], @@ -25,7 +25,7 @@ OUTPUT: "id": 0, "usr": "c:function_local.cc@31@F@foo#@a", "short_name": "a", - "qualified_name": "Foo * a", + "detailed_name": "Foo * a", "definition_spelling": "4:8-4:9", "definition_extent": "4:3-4:9", "variable_type": 0, diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc index 9328998e..91c6edd3 100644 --- a/tests/vars/function_param.cc +++ b/tests/vars/function_param.cc @@ -15,7 +15,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#*$@S@Foo#S0_#", "short_name": "foo", - "qualified_name": "void foo(Foo *, Foo *)", + "detailed_name": "void foo(Foo *, Foo *)", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-3:30" }], @@ -23,7 +23,7 @@ OUTPUT: "id": 0, "usr": "c:function_param.cc@24@F@foo#*$@S@Foo#S0_#@p0", "short_name": "p0", - "qualified_name": "Foo * p0", + "detailed_name": "Foo * p0", "definition_spelling": "3:15-3:17", "definition_extent": "3:10-3:17", "variable_type": 0, @@ -32,7 +32,7 @@ OUTPUT: "id": 1, "usr": "c:function_param.cc@33@F@foo#*$@S@Foo#S0_#@p1", "short_name": "p1", - "qualified_name": "Foo * p1", + "detailed_name": "Foo * p1", "definition_spelling": "3:24-3:26", "definition_extent": "3:19-3:26", "variable_type": 0, diff --git a/tests/vars/function_param_unnamed.cc b/tests/vars/function_param_unnamed.cc index 7781a057..228e2617 100644 --- a/tests/vars/function_param_unnamed.cc +++ b/tests/vars/function_param_unnamed.cc @@ -6,7 +6,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#I#", "short_name": "foo", - "qualified_name": "void foo(int, int)", + "detailed_name": "void foo(int, int)", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-1:22" }] diff --git a/tests/vars/function_shadow_local.cc b/tests/vars/function_shadow_local.cc index 9e8e98b3..a28fdbfe 100644 --- a/tests/vars/function_shadow_local.cc +++ b/tests/vars/function_shadow_local.cc @@ -14,7 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "void foo()", + "detailed_name": "void foo()", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-9:2" }], @@ -22,7 +22,7 @@ OUTPUT: "id": 0, "usr": "c:function_shadow_local.cc@16@F@foo#@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "uses": ["2:7-2:8", "3:3-3:4", "8:3-8:4"] @@ -30,7 +30,7 @@ OUTPUT: "id": 1, "usr": "c:function_shadow_local.cc@43@F@foo#@a", "short_name": "a", - "qualified_name": "int a", + "detailed_name": "int a", "definition_spelling": "5:9-5:10", "definition_extent": "5:5-5:10", "uses": ["5:9-5:10", "6:5-6:6"] diff --git a/tests/vars/function_shadow_param.cc b/tests/vars/function_shadow_param.cc index 2965fb4d..6ea78ccd 100644 --- a/tests/vars/function_shadow_param.cc +++ b/tests/vars/function_shadow_param.cc @@ -8,7 +8,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#", "short_name": "foo", - "qualified_name": "void foo(int)", + "detailed_name": "void foo(int)", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-3:2" }], @@ -16,7 +16,7 @@ OUTPUT: "id": 0, "usr": "c:function_shadow_param.cc@9@F@foo#I#@p", "short_name": "p", - "qualified_name": "int p", + "detailed_name": "int p", "definition_spelling": "1:14-1:15", "definition_extent": "1:10-1:15", "uses": ["1:14-1:15"] @@ -24,7 +24,7 @@ OUTPUT: "id": 1, "usr": "c:function_shadow_param.cc@21@F@foo#I#@p", "short_name": "p", - "qualified_name": "int p", + "detailed_name": "int p", "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "uses": ["2:7-2:8"] diff --git a/tests/vars/global_variable.cc b/tests/vars/global_variable.cc index 1d58213b..9c01be9d 100644 --- a/tests/vars/global_variable.cc +++ b/tests/vars/global_variable.cc @@ -6,7 +6,7 @@ OUTPUT: "id": 0, "usr": "c:global_variable.cc@global", "short_name": "global", - "qualified_name": "int global", + "detailed_name": "int global", "definition_spelling": "1:12-1:18", "definition_extent": "1:1-1:22", "uses": ["1:12-1:18"] diff --git a/tests/vars/global_variable_decl_only.cc b/tests/vars/global_variable_decl_only.cc index d2ec014b..f66005c2 100644 --- a/tests/vars/global_variable_decl_only.cc +++ b/tests/vars/global_variable_decl_only.cc @@ -6,7 +6,7 @@ OUTPUT: "id": 0, "usr": "c:@global", "short_name": "global", - "qualified_name": "int global", + "detailed_name": "int global", "declaration": "1:12-1:18", "uses": ["1:12-1:18"] }]