diff --git a/src/command_line.cc b/src/command_line.cc index b6f9335e..63cafbc3 100644 --- a/src/command_line.cc +++ b/src/command_line.cc @@ -2,6 +2,7 @@ #include "cache.h" #include "code_completion.h" #include "file_consumer.h" +#include "fuzzy.h" #include "indexer.h" #include "query.h" #include "language_server_api.h" @@ -134,9 +135,9 @@ std::string GetHoverForSymbol(QueryableDatabase* db, const SymbolIdx& symbol) { case SymbolKind::Type: return db->types[symbol.idx].def.qualified_name; case SymbolKind::Func: - return db->funcs[symbol.idx].def.hover; + return db->funcs[symbol.idx].def.qualified_name; case SymbolKind::Var: - return db->vars[symbol.idx].def.hover; + return db->vars[symbol.idx].def.qualified_name; case SymbolKind::File: case SymbolKind::Invalid: { assert(false && "unexpected"); @@ -1262,7 +1263,7 @@ void QueryDbMainLoop( } } - std::cerr << "- Found " << response.result.size() << " results" << std::endl; + std::cerr << "- Found " << response.result.size() << " results for query " << query << std::endl; SendOutMessageToClient(language_client, response); break; } diff --git a/src/indexer.cc b/src/indexer.cc index ad710c44..20c0220d 100644 --- a/src/indexer.cc +++ b/src/indexer.cc @@ -781,11 +781,11 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { var_def->def.short_name = decl->entityInfo->name; var_def->def.qualified_name = ns->QualifiedName(decl->semanticContainer, var_def->def.short_name); - var_def->def.hover = clang::ToString(clang_getTypeSpelling(clang_getCursorType(decl->cursor))); + std::string hover = clang::ToString(clang_getTypeSpelling(clang_getCursorType(decl->cursor))); // Include type in qualified name. - if (!var_def->def.hover.empty()) - var_def->def.qualified_name = var_def->def.hover + " " + var_def->def.qualified_name; + if (!hover.empty()) + var_def->def.qualified_name = hover + " " + var_def->def.qualified_name; //} if (decl->isDefinition) { @@ -891,18 +891,18 @@ void indexDeclaration(CXClientData client_data, const CXIdxDeclInfo* decl) { //} // TODO: we should build this ourselves. It doesn't include parameter names for functions. - func_def->def.hover = decl_cursor.get_type_description(); + std::string hover = decl_cursor.get_type_description(); // Update qualified name to include function signature // TODO: make this less hideous - auto it = std::find(func_def->def.hover.begin(), func_def->def.hover.end(), '('); - if (it != func_def->def.hover.end()) { + auto it = std::find(hover.begin(), hover.end(), '('); + if (it != hover.end()) { std::string new_qualified_name; - new_qualified_name.resize(func_def->def.hover.size() + func_def->def.qualified_name.size() + 1); - std::copy(func_def->def.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(func_def->def.hover.begin(), it)); - std::copy(it, func_def->def.hover.end(), new_qualified_name.begin() + std::distance(func_def->def.hover.begin(), it) + func_def->def.qualified_name.size()); + new_qualified_name.resize(hover.size() + func_def->def.qualified_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; } diff --git a/src/indexer.h b/src/indexer.h index 1bf210c2..dc8647e3 100644 --- a/src/indexer.h +++ b/src/indexer.h @@ -226,7 +226,6 @@ struct FuncDefDefinitionData { std::string usr; std::string short_name; std::string qualified_name; - std::string hover; optional definition_spelling; optional definition_extent; @@ -252,7 +251,6 @@ struct FuncDefDefinitionData { other) const { return usr == other.usr && short_name == other.short_name && qualified_name == other.qualified_name && - hover == other.hover && definition_spelling == other.definition_spelling && definition_extent == other.definition_extent && declaring_type == other.declaring_type && base == other.base && @@ -278,7 +276,6 @@ void Reflect( REFLECT_MEMBER(usr); REFLECT_MEMBER(short_name); REFLECT_MEMBER(qualified_name); - REFLECT_MEMBER(hover); REFLECT_MEMBER(definition); REFLECT_MEMBER(declaring_type); REFLECT_MEMBER(base); @@ -336,7 +333,6 @@ struct VarDefDefinitionData { std::string usr; std::string short_name; std::string qualified_name; - std::string hover; optional declaration; // TODO: definitions should be a list of ranges, since there can be more // than one - when?? @@ -356,7 +352,6 @@ struct VarDefDefinitionData { other) const { return usr == other.usr && short_name == other.short_name && qualified_name == other.qualified_name && - hover == other.hover && declaration == other.declaration && definition_spelling == other.definition_spelling && definition_extent == other.definition_extent && @@ -380,7 +375,6 @@ void Reflect(TVisitor& visitor, REFLECT_MEMBER(usr); REFLECT_MEMBER(short_name); REFLECT_MEMBER(qualified_name); - REFLECT_MEMBER(hover); REFLECT_MEMBER(definition_spelling); REFLECT_MEMBER(definition_extent); REFLECT_MEMBER(variable_type); diff --git a/src/query.cc b/src/query.cc index 8b4289d5..2f7f2d8e 100644 --- a/src/query.cc +++ b/src/query.cc @@ -36,7 +36,6 @@ QueryableFuncDef::DefUpdate ToQuery(const IdMap& id_map, const IndexedFuncDef::D QueryableFuncDef::DefUpdate result(func.usr); result.short_name = func.short_name; result.qualified_name = func.qualified_name; - result.hover = func.hover; 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); @@ -51,7 +50,6 @@ QueryableVarDef::DefUpdate ToQuery(const IdMap& id_map, const IndexedVarDef::Def QueryableVarDef::DefUpdate result(var.usr); result.short_name = var.short_name; result.qualified_name = var.qualified_name; - result.hover = var.hover; 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); diff --git a/src/serializer.cc b/src/serializer.cc index 32428943..3a1f5299 100644 --- a/src/serializer.cc +++ b/src/serializer.cc @@ -153,7 +153,6 @@ void Reflect(TVisitor& visitor, IndexedFuncDef& value) { REFLECT_MEMBER2("usr", value.def.usr); REFLECT_MEMBER2("short_name", value.def.short_name); REFLECT_MEMBER2("qualified_name", value.def.qualified_name); - REFLECT_MEMBER2("hover", value.def.hover); REFLECT_MEMBER2("declarations", value.declarations); REFLECT_MEMBER2("definition_spelling", value.def.definition_spelling); REFLECT_MEMBER2("definition_extent", value.def.definition_extent); @@ -189,7 +188,6 @@ void Reflect(TVisitor& visitor, IndexedVarDef& value) { REFLECT_MEMBER2("usr", value.def.usr); REFLECT_MEMBER2("short_name", value.def.short_name); REFLECT_MEMBER2("qualified_name", value.def.qualified_name); - REFLECT_MEMBER2("hover", value.def.hover); 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/src/test.cc b/src/test.cc index 2c0a03e1..e0bea964 100644 --- a/src/test.cc +++ b/src/test.cc @@ -113,6 +113,7 @@ IndexedFile* FindDbForPathEnding(const std::string& path, const std::vector= 3.9.1 + bool update_all = false; for (std::string path : GetFilesInFolder("tests", true /*recursive*/, true /*add_folder_to_path*/)) { //if (path != "tests/templates/specialized_func_definition.cc") continue; @@ -197,9 +198,20 @@ void RunTests() { DiffDocuments(path, expected_path, expected, actual); std::cout << std::endl; std::cout << std::endl; - std::cout << "[Enter to continue]"; - std::cin.get(); - std::cin.get(); + std::cout << "[Enter to continue - type u to update test, a to update all]"; + char c = 'u'; + if (!update_all) { + c = std::cin.get(); + std::cin.get(); + } + + if (c == 'a') + update_all = true; + + if (update_all || c == 'u') { + UpdateTestExpectation(path, expected_output, ToString(actual) + "\n"); + } + } } } diff --git a/src/utils.cc b/src/utils.cc index 953e5dfa..738fcd2a 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -183,6 +183,22 @@ std::unordered_map ParseTestExpectation(std::string fi return result; } +void UpdateTestExpectation(const std::string& filename, const std::string& expectation, const std::string& actual) { + // Read the entire file into a string. + std::ifstream in(filename); + std::string str; + str.assign(std::istreambuf_iterator(in), std::istreambuf_iterator()); + in.close(); + + // Replace expectation + auto it = str.find(expectation); + str.replace(it, expectation.size(), actual); + + // Write it back out. + std::ofstream of(filename, std::ios::out | std::ios::trunc); + of.write(str.c_str(), str.size()); + of.close(); +} void Fail(const std::string& message) { std::cerr << "Fatal error: " << message << std::endl; diff --git a/src/utils.h b/src/utils.h index b7f9647a..e29490fb 100644 --- a/src/utils.h +++ b/src/utils.h @@ -17,6 +17,7 @@ std::string ReplaceAll(const std::string& source, const std::string& from, const std::vector GetFilesInFolder(std::string folder, bool recursive, bool add_folder_to_path); std::vector ReadLines(std::string filename); std::unordered_map ParseTestExpectation(std::string filename); +void UpdateTestExpectation(const std::string& filename, const std::string& expectation, const std::string& actual); void Fail(const std::string& message); diff --git a/tests/constructors/constructor.cc b/tests/constructors/constructor.cc index 6dbd7329..3798c081 100644 --- a/tests/constructors/constructor.cc +++ b/tests/constructors/constructor.cc @@ -26,8 +26,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", - "qualified_name": "Foo::Foo", - "hover": "void ()", + "qualified_name": "void Foo::Foo()", "definition_spelling": "3:3-3:6", "definition_extent": "3:3-3:11", "declaring_type": 0, @@ -36,8 +35,7 @@ OUTPUT: "id": 1, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_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"] @@ -46,8 +44,7 @@ OUTPUT: "id": 0, "usr": "c:constructor.cc@56@F@foo#@f", "short_name": "f", - "qualified_name": "f", - "hover": "Foo", + "qualified_name": "Foo f", "definition_spelling": "7:7-7:8", "definition_extent": "7:3-7:8", "variable_type": 0, @@ -56,8 +53,7 @@ OUTPUT: "id": 1, "usr": "c:constructor.cc@66@F@foo#@f2", "short_name": "f2", - "qualified_name": "f2", - "hover": "Foo *", + "qualified_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 a6888853..4ff00e6d 100644 --- a/tests/constructors/destructor.cc +++ b/tests/constructors/destructor.cc @@ -31,8 +31,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", - "qualified_name": "Foo::Foo", - "hover": "void ()", + "qualified_name": "void Foo::Foo()", "definition_spelling": "3:3-3:6", "definition_extent": "3:3-3:11", "declaring_type": 0, @@ -41,8 +40,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@F@~Foo#", "short_name": "~Foo", - "hover": "void () noexcept", - "qualified_name": "Foo::~Foo", + "qualified_name": "void Foo::~Foo() noexcept", "definition_spelling": "4:3-4:7", "definition_extent": "4:3-4:12", "declaring_type": 0 @@ -50,8 +48,7 @@ OUTPUT: "id": 2, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_name": "void foo()", "definition_spelling": "7:6-7:9", "definition_extent": "7:1-9:2", "callees": ["0@8:7-8:8"] @@ -60,8 +57,7 @@ OUTPUT: "id": 0, "usr": "c:destructor.cc@70@F@foo#@f", "short_name": "f", - "qualified_name": "f", - "hover": "Foo", + "qualified_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 9f4a2319..28ae0f85 100644 --- a/tests/constructors/invalid_reference.cc +++ b/tests/constructors/invalid_reference.cc @@ -20,8 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FT@>1#TFoo#v#", "short_name": "Foo", - "qualified_name": "Foo::Foo", - "hover": "void ()", + "qualified_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_member.cc b/tests/declaration_vs_definition/class_member.cc index 11f3e8b4..4c636a18 100644 --- a/tests/declaration_vs_definition/class_member.cc +++ b/tests/declaration_vs_definition/class_member.cc @@ -19,8 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@foo", "short_name": "foo", - "qualified_name": "Foo::foo", - "hover": "int", + "qualified_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 fca402fa..e6ecff9a 100644 --- a/tests/declaration_vs_definition/class_member_static.cc +++ b/tests/declaration_vs_definition/class_member_static.cc @@ -21,8 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@foo", "short_name": "foo", - "qualified_name": "Foo::foo", - "hover": "int", + "qualified_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 7d55be7a..eb661b5e 100644 --- a/tests/declaration_vs_definition/func.cc +++ b/tests/declaration_vs_definition/func.cc @@ -11,8 +11,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_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 6bfa9ddc..e757a3a8 100644 --- a/tests/declaration_vs_definition/method.cc +++ b/tests/declaration_vs_definition/method.cc @@ -23,24 +23,21 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@declonly#", "short_name": "declonly", - "qualified_name": "Foo::declonly", - "hover": "void ()", + "qualified_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": "Foo::purevirtual", - "hover": "void ()", + "qualified_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": "Foo::def", - "hover": "void ()", + "qualified_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 e40b58fe..212aba9e 100644 --- a/tests/enums/enum_class_decl.cc +++ b/tests/enums/enum_class_decl.cc @@ -20,8 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo@A", "short_name": "A", - "qualified_name": "Foo::A", - "hover": "Foo", + "qualified_name": "Foo Foo::A", "definition_spelling": "2:3-2:4", "definition_extent": "2:3-2:4", "variable_type": 0, @@ -31,8 +30,7 @@ OUTPUT: "id": 1, "usr": "c:@E@Foo@B", "short_name": "B", - "qualified_name": "Foo::B", - "hover": "Foo", + "qualified_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 f09b1400..05729179 100644 --- a/tests/enums/enum_decl.cc +++ b/tests/enums/enum_decl.cc @@ -20,8 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo@A", "short_name": "A", - "qualified_name": "Foo::A", - "hover": "Foo", + "qualified_name": "Foo Foo::A", "definition_spelling": "2:3-2:4", "definition_extent": "2:3-2:4", "variable_type": 0, @@ -31,8 +30,7 @@ OUTPUT: "id": 1, "usr": "c:@E@Foo@B", "short_name": "B", - "qualified_name": "Foo::B", - "hover": "Foo", + "qualified_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 a67f688a..5f9a5cda 100644 --- a/tests/enums/enum_inherit.cc +++ b/tests/enums/enum_inherit.cc @@ -20,8 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo@A", "short_name": "A", - "qualified_name": "Foo::A", - "hover": "Foo", + "qualified_name": "Foo Foo::A", "definition_spelling": "2:3-2:4", "definition_extent": "2:3-2:4", "variable_type": 0, @@ -31,8 +30,7 @@ OUTPUT: "id": 1, "usr": "c:@E@Foo@B", "short_name": "B", - "qualified_name": "Foo::B", - "hover": "Foo", + "qualified_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 9c3b056f..ef8caf91 100644 --- a/tests/enums/enum_usage.cc +++ b/tests/enums/enum_usage.cc @@ -23,8 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@E@Foo@A", "short_name": "A", - "qualified_name": "Foo::A", - "hover": "Foo", + "qualified_name": "Foo Foo::A", "definition_spelling": "2:3-2:4", "definition_extent": "2:3-2:4", "variable_type": 0, @@ -34,8 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@E@Foo@B", "short_name": "B", - "qualified_name": "Foo::B", - "hover": "Foo", + "qualified_name": "Foo Foo::B", "definition_spelling": "3:3-3:4", "definition_extent": "3:3-3:9", "variable_type": 0, @@ -45,8 +43,7 @@ OUTPUT: "id": 2, "usr": "c:@x", "short_name": "x", - "qualified_name": "x", - "hover": "Foo", + "qualified_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 2591b767..2f54e0e0 100644 --- a/tests/foobar.cc +++ b/tests/foobar.cc @@ -50,8 +50,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "a", - "hover": "Foo::Inner", + "qualified_name": "Foo::Inner a", "definition_spelling": "9:15-9:16", "definition_extent": "9:1-9:16", "variable_type": 3, @@ -60,8 +59,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "b", - "hover": "Foo", + "qualified_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 e3b707d8..99874464 100644 --- a/tests/function_declaration.cc +++ b/tests/function_declaration.cc @@ -7,8 +7,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#I#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (int, int)", + "qualified_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 a62fd551..7ed1fb40 100644 --- a/tests/function_declaration_definition.cc +++ b/tests/function_declaration_definition.cc @@ -9,8 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_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 cc26db9e..ccb31d88 100644 --- a/tests/function_definition.cc +++ b/tests/function_definition.cc @@ -7,8 +7,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_name": "void foo()", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-1:14" }] diff --git a/tests/inheritance/function_override.cc b/tests/inheritance/function_override.cc index 065815dd..0256549d 100644 --- a/tests/inheritance/function_override.cc +++ b/tests/inheritance/function_override.cc @@ -33,8 +33,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Root@F@foo#", "short_name": "foo", - "qualified_name": "Root::foo", - "hover": "void ()", + "qualified_name": "void Root::foo()", "declarations": ["2:16-2:19"], "declaring_type": 0, "derived": [1] @@ -42,8 +41,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Derived@F@foo#", "short_name": "foo", - "qualified_name": "Derived::foo", - "hover": "void ()", + "qualified_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 2a2e4655..2c4b1d9b 100644 --- a/tests/inheritance/interface_pure_virtual.cc +++ b/tests/inheritance/interface_pure_virtual.cc @@ -19,8 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@S@IFoo@F@foo#", "short_name": "foo", - "qualified_name": "IFoo::foo", - "hover": "void ()", + "qualified_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 2838707d..0eddda63 100644 --- a/tests/method_declaration.cc +++ b/tests/method_declaration.cc @@ -23,8 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "Foo::foo", - "hover": "void ()", + "qualified_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 d7d0aecf..6804929c 100644 --- a/tests/method_definition.cc +++ b/tests/method_definition.cc @@ -21,8 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "Foo::foo", - "hover": "void ()", + "qualified_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 7d247d54..af9ae2aa 100644 --- a/tests/method_inline_declaration.cc +++ b/tests/method_inline_declaration.cc @@ -19,8 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "Foo::foo", - "hover": "void ()", + "qualified_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 a2e30c1a..e640dc69 100644 --- a/tests/multi_file/impl.cc +++ b/tests/multi_file/impl.cc @@ -56,8 +56,7 @@ OUTPUT: header.h "id": 0, "usr": "c:@FT@>1#TFoo1#v#", "short_name": "Foo1", - "qualified_name": "Foo1", - "hover": "void ()", + "qualified_name": "void Foo1()", "definition_spelling": "10:6-10:10", "definition_extent": "10:1-10:15" }], @@ -65,8 +64,7 @@ OUTPUT: header.h "id": 0, "usr": "c:@E@Foo3@A", "short_name": "A", - "qualified_name": "Foo3::A", - "hover": "Foo3", + "qualified_name": "Foo3 Foo3::A", "definition_spelling": "15:13-15:14", "definition_extent": "15:13-15:14", "variable_type": 4, @@ -76,8 +74,7 @@ OUTPUT: header.h "id": 1, "usr": "c:@E@Foo3@B", "short_name": "B", - "qualified_name": "Foo3::B", - "hover": "Foo3", + "qualified_name": "Foo3 Foo3::B", "definition_spelling": "15:16-15:17", "definition_extent": "15:16-15:17", "variable_type": 4, @@ -87,8 +84,7 @@ OUTPUT: header.h "id": 2, "usr": "c:@E@Foo3@C", "short_name": "C", - "qualified_name": "Foo3::C", - "hover": "Foo3", + "qualified_name": "Foo3 Foo3::C", "definition_spelling": "15:19-15:20", "definition_extent": "15:19-15:20", "variable_type": 4, @@ -98,8 +94,7 @@ OUTPUT: header.h "id": 3, "usr": "c:@Foo4", "short_name": "Foo4", - "qualified_name": "Foo4", - "hover": "int", + "qualified_name": "int Foo4", "definition_spelling": "17:5-17:9", "definition_extent": "17:1-17:9", "uses": ["17:5-17:9"] @@ -107,14 +102,12 @@ OUTPUT: header.h "id": 4, "usr": "c:header.h@Foo5", "short_name": "Foo5", - "qualified_name": "Foo5", - "hover": "int", + "qualified_name": "int Foo5", "definition_spelling": "18:12-18:16", "definition_extent": "18:1-18:16", "uses": ["18:12-18:16"] }] } - OUTPUT: impl.cc { "dependencies": ["C:/Users/jacob/Desktop/superindex/indexer/tests/multi_file/header.h"], @@ -122,8 +115,7 @@ OUTPUT: impl.cc "id": 0, "usr": "c:@F@Impl#", "short_name": "Impl", - "qualified_name": "Impl", - "hover": "void ()", + "qualified_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 eb7f28df..d0fc961b 100644 --- a/tests/multi_file/simple_impl.cc +++ b/tests/multi_file/simple_impl.cc @@ -11,12 +11,10 @@ OUTPUT: simple_header.h "id": 0, "usr": "c:@F@header#", "short_name": "header", - "qualified_name": "header", - "hover": "void ()", + "qualified_name": "void header()", "declarations": ["3:6-3:12"] }] } - OUTPUT: simple_impl.cc { "dependencies": ["C:/Users/jacob/Desktop/superindex/indexer/tests/multi_file/simple_header.h"], @@ -24,8 +22,7 @@ OUTPUT: simple_impl.cc "id": 0, "usr": "c:@F@impl#", "short_name": "impl", - "qualified_name": "impl", - "hover": "void ()", + "qualified_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 9673a065..049e6b5d 100644 --- a/tests/multi_file/static.cc +++ b/tests/multi_file/static.cc @@ -19,13 +19,11 @@ OUTPUT: static.h "id": 0, "usr": "c:@S@Buffer@F@CreateSharedBuffer#S", "short_name": "CreateSharedBuffer", - "qualified_name": "Buffer::CreateSharedBuffer", - "hover": "void ()", + "qualified_name": "void Buffer::CreateSharedBuffer()", "declarations": ["4:15-4:33"], "declaring_type": 0 }] } - OUTPUT: static.cc { "dependencies": ["C:/Users/jacob/Desktop/superindex/indexer/tests/multi_file/static.h"], @@ -39,8 +37,7 @@ OUTPUT: static.cc "id": 0, "usr": "c:@S@Buffer@F@CreateSharedBuffer#S", "short_name": "CreateSharedBuffer", - "qualified_name": "Buffer::CreateSharedBuffer", - "hover": "void ()", + "qualified_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 5f78fffb..5f58b3c4 100644 --- a/tests/namespaces/anonymous_function.cc +++ b/tests/namespaces/anonymous_function.cc @@ -9,8 +9,7 @@ OUTPUT: "id": 0, "usr": "c:anonymous_function.cc@aN@F@foo#", "short_name": "foo", - "qualified_name": "::foo", - "hover": "void ()", + "qualified_name": "void ::foo()", "declarations": ["2:6-2:9"] }] } diff --git a/tests/namespaces/function_declaration.cc b/tests/namespaces/function_declaration.cc index 01041044..01455461 100644 --- a/tests/namespaces/function_declaration.cc +++ b/tests/namespaces/function_declaration.cc @@ -9,8 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@F@foo#I#I#", "short_name": "foo", - "qualified_name": "hello::foo", - "hover": "void (int, int)", + "qualified_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 cf153272..942b878b 100644 --- a/tests/namespaces/function_definition.cc +++ b/tests/namespaces/function_definition.cc @@ -9,8 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@F@foo#", "short_name": "foo", - "qualified_name": "hello::foo", - "hover": "void ()", + "qualified_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 28e9c836..96d5f68c 100644 --- a/tests/namespaces/method_declaration.cc +++ b/tests/namespaces/method_declaration.cc @@ -21,8 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "hello::Foo::foo", - "hover": "void ()", + "qualified_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 80e66ba9..1dfe1217 100644 --- a/tests/namespaces/method_definition.cc +++ b/tests/namespaces/method_definition.cc @@ -23,8 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "hello::Foo::foo", - "hover": "void ()", + "qualified_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 998fa3ea..baf49ab2 100644 --- a/tests/namespaces/method_inline_declaration.cc +++ b/tests/namespaces/method_inline_declaration.cc @@ -21,8 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@N@hello@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "hello::Foo::foo", - "hover": "void ()", + "qualified_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 93c62f53..36109fb4 100644 --- a/tests/namespaces/namespace_reference.cc +++ b/tests/namespaces/namespace_reference.cc @@ -16,8 +16,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@F@Accept#I#", "short_name": "Accept", - "qualified_name": "ns::Accept", - "hover": "void (int)", + "qualified_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"] @@ -25,8 +24,7 @@ OUTPUT: "id": 1, "usr": "c:@F@Runner#", "short_name": "Runner", - "qualified_name": "Runner", - "hover": "void ()", + "qualified_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"] @@ -35,8 +33,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@Foo", "short_name": "Foo", - "qualified_name": "ns::Foo", - "hover": "int", + "qualified_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"] @@ -44,8 +41,7 @@ OUTPUT: "id": 1, "usr": "c:namespace_reference.cc@42@N@ns@F@Accept#I#@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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 368b4d72..0d1bc6f8 100644 --- a/tests/outline/outline.cc +++ b/tests/outline/outline.cc @@ -29,8 +29,7 @@ OUTPUT: "id": 0, "usr": "c:@S@MergeableUpdate@FI@a", "short_name": "a", - "qualified_name": "MergeableUpdate::a", - "hover": "int", + "qualified_name": "int MergeableUpdate::a", "definition_spelling": "4:7-4:8", "definition_extent": "4:3-4:8", "declaring_type": 0, @@ -39,8 +38,7 @@ OUTPUT: "id": 1, "usr": "c:@S@MergeableUpdate@FI@b", "short_name": "b", - "qualified_name": "MergeableUpdate::b", - "hover": "int", + "qualified_name": "int MergeableUpdate::b", "definition_spelling": "5:7-5:8", "definition_extent": "5:3-5:8", "declaring_type": 0, @@ -49,8 +47,7 @@ OUTPUT: "id": 2, "usr": "c:@S@MergeableUpdate@FI@to_add", "short_name": "to_add", - "qualified_name": "MergeableUpdate::to_add", - "hover": "std::vector", + "qualified_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 287b4cc9..fad9db6f 100644 --- a/tests/outline/outline2.cc +++ b/tests/outline/outline2.cc @@ -39,16 +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": "LoadCompilationEntriesFromDirectory", - "hover": "std::vector (const std::string &)", + "qualified_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": "CompilationEntry::directory", - "hover": "std::string", + "qualified_name": "std::string CompilationEntry::directory", "definition_spelling": "7:15-7:24", "definition_extent": "7:3-7:24", "variable_type": 1, @@ -58,8 +56,7 @@ OUTPUT: "id": 1, "usr": "c:@S@CompilationEntry@FI@filename", "short_name": "filename", - "qualified_name": "CompilationEntry::filename", - "hover": "std::string", + "qualified_name": "std::string CompilationEntry::filename", "definition_spelling": "8:15-8:23", "definition_extent": "8:3-8:23", "variable_type": 1, @@ -69,8 +66,7 @@ OUTPUT: "id": 2, "usr": "c:@S@CompilationEntry@FI@args", "short_name": "args", - "qualified_name": "CompilationEntry::args", - "hover": "std::vector", + "qualified_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 d2ba6bf0..5661c80e 100644 --- a/tests/templates/func_specialized_template_param.cc +++ b/tests/templates/func_specialized_template_param.cc @@ -32,8 +32,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Bar#&$@S@Template>#d#", "short_name": "Bar", - "qualified_name": "Foo::Bar", - "hover": "void (Template &)", + "qualified_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 c2529459..95aff8fe 100644 --- a/tests/templates/implicit_variable_instantiation.cc +++ b/tests/templates/implicit_variable_instantiation.cc @@ -40,8 +40,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@ST>1#T@Holder@static_var", "short_name": "static_var", - "qualified_name": "ns::Holder::static_var", - "hover": "const ns::VarType", + "qualified_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", @@ -52,8 +51,7 @@ OUTPUT: "id": 1, "usr": "c:@N@ns@Foo", "short_name": "Foo", - "qualified_name": "ns::Foo", - "hover": "int", + "qualified_name": "int ns::Foo", "definition_spelling": "13:7-13:10", "definition_extent": "13:3-13:36", "uses": ["13:7-13:10"] @@ -61,8 +59,7 @@ OUTPUT: "id": 2, "usr": "c:@N@ns@Foo2", "short_name": "Foo2", - "qualified_name": "ns::Foo2", - "hover": "int", + "qualified_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 f94749bf..2f6b4da5 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 @@ -28,8 +28,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@ST>1#T@Foo@FT@>1#Tfoo#I#S", "short_name": "foo", - "qualified_name": "ns::Foo::foo", - "hover": "int ()", + "qualified_name": "int ns::Foo::foo()", "definition_spelling": "5:16-5:19", "definition_extent": "5:5-7:6", "declaring_type": 0, @@ -39,8 +38,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@a", "short_name": "a", - "qualified_name": "ns::a", - "hover": "int", + "qualified_name": "int ns::a", "definition_spelling": "10:7-10:8", "definition_extent": "10:3-10:33", "uses": ["10:7-10:8"] @@ -48,8 +46,7 @@ OUTPUT: "id": 1, "usr": "c:@N@ns@b", "short_name": "b", - "qualified_name": "ns::b", - "hover": "int", + "qualified_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 00e79a43..7f8d74a2 100644 --- a/tests/templates/namespace_template_type_usage_folded_into_one.cc +++ b/tests/templates/namespace_template_type_usage_folded_into_one.cc @@ -23,8 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@N@ns@a", "short_name": "a", - "qualified_name": "ns::a", - "hover": "Foo", + "qualified_name": "Foo ns::a", "definition_spelling": "5:12-5:13", "definition_extent": "5:3-5:13", "variable_type": 0, @@ -33,8 +32,7 @@ OUTPUT: "id": 1, "usr": "c:@N@ns@b", "short_name": "b", - "qualified_name": "ns::b", - "hover": "Foo", + "qualified_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 7c8b4a4f..64074723 100644 --- a/tests/templates/specialized_func_definition.cc +++ b/tests/templates/specialized_func_definition.cc @@ -29,9 +29,8 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Template@F@Foo#", "short_name": "Foo", - "qualified_name": "Template::Foo", + "qualified_name": "void Template::Foo()", "declarations": ["3:8-3:11", "9:22-9:25"], - "hover": "void ()", "definition_spelling": "7:19-7:22", "definition_extent": "6:1-7:24", "declaring_type": 0 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 9b3aefcc..11fd8e38 100644 --- a/tests/templates/template_class_func_usage_folded_into_one.cc +++ b/tests/templates/template_class_func_usage_folded_into_one.cc @@ -25,8 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo@F@foo#S", "short_name": "foo", - "qualified_name": "Foo::foo", - "hover": "int ()", + "qualified_name": "int Foo::foo()", "definition_spelling": "3:14-3:17", "definition_extent": "3:3-5:4", "declaring_type": 0, @@ -36,8 +35,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_name": "int a", "definition_spelling": "8:5-8:6", "definition_extent": "8:1-8:24", "uses": ["8:5-8:6"] @@ -45,8 +43,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "b", - "hover": "int", + "qualified_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 40a1cb2f..94801e2a 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 @@ -26,8 +26,7 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo@FT@>1#Tfoo#I#S", "short_name": "foo", - "qualified_name": "Foo::foo", - "hover": "int ()", + "qualified_name": "int Foo::foo()", "definition_spelling": "4:14-4:17", "definition_extent": "4:3-6:4", "declaring_type": 0, @@ -37,8 +36,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_name": "int a", "definition_spelling": "9:5-9:6", "definition_extent": "9:1-9:31", "uses": ["9:5-9:6"] @@ -46,8 +44,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "b", - "hover": "int", + "qualified_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 d2061abb..8be7387f 100644 --- a/tests/templates/template_class_type_usage_folded_into_one.cc +++ b/tests/templates/template_class_type_usage_folded_into_one.cc @@ -68,8 +68,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "a", - "hover": "Foo::Inner", + "qualified_name": "Foo::Inner a", "definition_spelling": "9:15-9:16", "definition_extent": "9:1-9:16", "variable_type": 3, @@ -78,8 +77,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "b", - "hover": "Foo::Inner", + "qualified_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 ada70f4a..1ab69001 100644 --- a/tests/templates/template_class_var_usage_folded_into_one.cc +++ b/tests/templates/template_class_var_usage_folded_into_one.cc @@ -22,16 +22,14 @@ OUTPUT: "id": 0, "usr": "c:@ST>1#T@Foo@var", "short_name": "var", - "qualified_name": "Foo::var", - "hover": "const int", + "qualified_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": "a", - "hover": "int", + "qualified_name": "int a", "definition_spelling": "6:5-6:6", "definition_extent": "6:1-6:22", "uses": ["6:5-6:6"] @@ -39,8 +37,7 @@ OUTPUT: "id": 2, "usr": "c:@b", "short_name": "b", - "qualified_name": "b", - "hover": "int", + "qualified_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 f8af5456..0a72c089 100644 --- a/tests/templates/template_func_usage_folded_into_one.cc +++ b/tests/templates/template_func_usage_folded_into_one.cc @@ -16,8 +16,7 @@ OUTPUT: "id": 0, "usr": "c:template_func_usage_folded_into_one.cc@FT@>1#Tfoo#I#", "short_name": "foo", - "qualified_name": "foo", - "hover": "int ()", + "qualified_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"] @@ -26,8 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_name": "int a", "definition_spelling": "6:5-6:6", "definition_extent": "6:1-6:19", "uses": ["6:5-6:6"] @@ -35,8 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "b", - "hover": "int", + "qualified_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 8016b982..ea975a1a 100644 --- a/tests/templates/template_type_usage_folded_into_one.cc +++ b/tests/templates/template_type_usage_folded_into_one.cc @@ -21,8 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "a", - "hover": "Foo", + "qualified_name": "Foo a", "definition_spelling": "4:10-4:11", "definition_extent": "4:1-4:11", "variable_type": 0, @@ -31,8 +30,7 @@ OUTPUT: "id": 1, "usr": "c:@b", "short_name": "b", - "qualified_name": "b", - "hover": "Foo", + "qualified_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 30793e20..779b3191 100644 --- a/tests/templates/template_var_usage_folded_into_one.cc +++ b/tests/templates/template_var_usage_folded_into_one.cc @@ -55,8 +55,7 @@ OUTPUT: "id": 0, "usr": "c:@VT>1#T@var", "short_name": "var", - "qualified_name": "var", - "hover": "T", + "qualified_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"] @@ -64,8 +63,7 @@ OUTPUT: "id": 1, "usr": "c:@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_name": "int a", "definition_spelling": "7:5-7:6", "definition_extent": "7:1-7:15", "uses": ["7:5-7:6"] @@ -73,8 +71,7 @@ OUTPUT: "id": 2, "usr": "c:@b", "short_name": "b", - "qualified_name": "b", - "hover": "int", + "qualified_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 5f23d706..6b66f6e0 100644 --- a/tests/types/anonymous_struct.cc +++ b/tests/types/anonymous_struct.cc @@ -29,8 +29,7 @@ OUTPUT: "id": 0, "usr": "c:@U@vector3@Sa@FI@x", "short_name": "x", - "qualified_name": "x", - "hover": "float", + "qualified_name": "float x", "definition_spelling": "2:18-2:19", "definition_extent": "2:12-2:19", "declaring_type": 1, @@ -39,8 +38,7 @@ OUTPUT: "id": 1, "usr": "c:@U@vector3@Sa@FI@y", "short_name": "y", - "qualified_name": "y", - "hover": "float", + "qualified_name": "float y", "definition_spelling": "2:21-2:22", "definition_extent": "2:12-2:22", "declaring_type": 1, @@ -49,8 +47,7 @@ OUTPUT: "id": 2, "usr": "c:@U@vector3@Sa@FI@z", "short_name": "z", - "qualified_name": "z", - "hover": "float", + "qualified_name": "float z", "definition_spelling": "2:24-2:25", "definition_extent": "2:12-2:25", "declaring_type": 1, @@ -59,8 +56,7 @@ OUTPUT: "id": 3, "usr": "c:@U@vector3@FI@v", "short_name": "v", - "qualified_name": "vector3::v", - "hover": "float [3]", + "qualified_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 903679e9..d3adab61 100644 --- a/tests/unions/union_decl.cc +++ b/tests/unions/union_decl.cc @@ -20,8 +20,7 @@ OUTPUT: "id": 0, "usr": "c:@U@Foo@FI@a", "short_name": "a", - "qualified_name": "Foo::a", - "hover": "int", + "qualified_name": "int Foo::a", "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:8", "declaring_type": 0, @@ -30,8 +29,7 @@ OUTPUT: "id": 1, "usr": "c:@U@Foo@FI@b", "short_name": "b", - "qualified_name": "Foo::b", - "hover": "bool", + "qualified_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 19df56a4..8c542bfb 100644 --- a/tests/unions/union_usage.cc +++ b/tests/unions/union_usage.cc @@ -29,8 +29,7 @@ OUTPUT: "id": 0, "usr": "c:@F@act#*$@U@Foo#", "short_name": "act", - "qualified_name": "act", - "hover": "void (Foo *)", + "qualified_name": "void act(Foo *)", "definition_spelling": "8:6-8:9", "definition_extent": "8:1-10:2" }], @@ -38,8 +37,7 @@ OUTPUT: "id": 0, "usr": "c:@U@Foo@FI@a", "short_name": "a", - "qualified_name": "Foo::a", - "hover": "int", + "qualified_name": "int Foo::a", "definition_spelling": "2:7-2:8", "definition_extent": "2:3-2:12", "declaring_type": 0, @@ -48,8 +46,7 @@ OUTPUT: "id": 1, "usr": "c:@U@Foo@FI@b", "short_name": "b", - "qualified_name": "Foo::b", - "hover": "bool", + "qualified_name": "bool Foo::b", "definition_spelling": "3:8-3:9", "definition_extent": "3:3-3:13", "declaring_type": 0, @@ -58,8 +55,7 @@ OUTPUT: "id": 2, "usr": "c:@f", "short_name": "f", - "qualified_name": "f", - "hover": "Foo", + "qualified_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 bc551b77..9c531f99 100644 --- a/tests/usage/func_called_from_constructor.cc +++ b/tests/usage/func_called_from_constructor.cc @@ -25,8 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "called", - "hover": "void ()", + "qualified_name": "void called()", "definition_spelling": "1:6-1:12", "definition_extent": "1:1-1:17", "callers": ["1@8:3-8:9"] @@ -34,8 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@F@Foo#", "short_name": "Foo", - "qualified_name": "Foo::Foo", - "hover": "void ()", + "qualified_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 6495bcff..13f47e80 100644 --- a/tests/usage/func_called_from_macro_argument.cc +++ b/tests/usage/func_called_from_macro_argument.cc @@ -13,16 +13,14 @@ OUTPUT: "id": 0, "usr": "c:@F@called#b#b#", "short_name": "called", - "qualified_name": "called", - "hover": "bool (bool, bool)", + "qualified_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": "caller", - "hover": "void ()", + "qualified_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 c20139c2..fa3a0d54 100644 --- a/tests/usage/func_called_from_template.cc +++ b/tests/usage/func_called_from_template.cc @@ -18,16 +18,14 @@ OUTPUT: "id": 0, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "called", - "hover": "void ()", + "qualified_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": "caller", - "hover": "void ()", + "qualified_name": "void caller()", "definition_spelling": "4:6-4:12", "definition_extent": "4:1-6:2", "callers": ["2@9:3-9:9"], @@ -36,8 +34,7 @@ OUTPUT: "id": 2, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_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 acce815f..b50250f3 100644 --- a/tests/usage/func_called_implicit_ctor.cc +++ b/tests/usage/func_called_implicit_ctor.cc @@ -25,8 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Wrapper@F@Wrapper#I#", "short_name": "Wrapper", - "qualified_name": "Wrapper::Wrapper", - "hover": "void (int)", + "qualified_name": "void Wrapper::Wrapper(int)", "declarations": ["2:3-2:10"], "declaring_type": 0, "callers": ["2@8:10-8:16"] @@ -34,8 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "called", - "hover": "int ()", + "qualified_name": "int called()", "definition_spelling": "5:5-5:11", "definition_extent": "5:1-5:27", "callers": ["2@8:10-8:16"] @@ -43,8 +41,7 @@ OUTPUT: "id": 2, "usr": "c:@F@caller#", "short_name": "caller", - "qualified_name": "caller", - "hover": "Wrapper ()", + "qualified_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 0fa2b36f..b0ed3734 100644 --- a/tests/usage/func_usage_addr_func.cc +++ b/tests/usage/func_usage_addr_func.cc @@ -14,8 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@consume#*v#", "short_name": "consume", - "qualified_name": "consume", - "hover": "void (void *)", + "qualified_name": "void consume(void *)", "definition_spelling": "1:6-1:13", "definition_extent": "1:1-1:23", "callers": ["2@7:3-7:10"] @@ -23,8 +22,7 @@ OUTPUT: "id": 1, "usr": "c:@F@used#", "short_name": "used", - "qualified_name": "used", - "hover": "void ()", + "qualified_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"] @@ -32,8 +30,7 @@ OUTPUT: "id": 2, "usr": "c:@F@user#", "short_name": "user", - "qualified_name": "user", - "hover": "void ()", + "qualified_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"] @@ -42,8 +39,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_addr_func.cc@61@F@user#@x", "short_name": "x", - "qualified_name": "x", - "hover": "void (*)()", + "qualified_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 4f41de50..49e480fc 100644 --- a/tests/usage/func_usage_addr_method.cc +++ b/tests/usage/func_usage_addr_method.cc @@ -24,8 +24,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Used#", "short_name": "Used", - "qualified_name": "Foo::Used", - "hover": "void ()", + "qualified_name": "void Foo::Used()", "declarations": ["2:8-2:12"], "declaring_type": 0, "callers": ["1@6:18-6:22"] @@ -33,8 +32,7 @@ OUTPUT: "id": 1, "usr": "c:@F@user#", "short_name": "user", - "qualified_name": "user", - "hover": "void ()", + "qualified_name": "void user()", "definition_spelling": "5:6-5:10", "definition_extent": "5:1-7:2", "callees": ["0@6:18-6:22"] @@ -43,8 +41,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_addr_method.cc@53@F@user#@x", "short_name": "x", - "qualified_name": "x", - "hover": "void (Foo::*)()", + "qualified_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 15984f3f..c2749ee5 100644 --- a/tests/usage/func_usage_call_func.cc +++ b/tests/usage/func_usage_call_func.cc @@ -10,8 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "called", - "hover": "void ()", + "qualified_name": "void called()", "definition_spelling": "1:6-1:12", "definition_extent": "1:1-1:17", "callers": ["1@3:3-3:9"] @@ -19,8 +18,7 @@ OUTPUT: "id": 1, "usr": "c:@F@caller#", "short_name": "caller", - "qualified_name": "caller", - "hover": "void ()", + "qualified_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 bf3225b5..38345ed5 100644 --- a/tests/usage/func_usage_call_method.cc +++ b/tests/usage/func_usage_call_method.cc @@ -25,8 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@Used#", "short_name": "Used", - "qualified_name": "Foo::Used", - "hover": "void ()", + "qualified_name": "void Foo::Used()", "declarations": ["2:8-2:12"], "declaring_type": 0, "callers": ["1@7:6-7:10"] @@ -34,8 +33,7 @@ OUTPUT: "id": 1, "usr": "c:@F@user#", "short_name": "user", - "qualified_name": "user", - "hover": "void ()", + "qualified_name": "void user()", "definition_spelling": "5:6-5:10", "definition_extent": "5:1-8:2", "callees": ["0@7:6-7:10"] @@ -44,8 +42,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_call_method.cc@53@F@user#@f", "short_name": "f", - "qualified_name": "f", - "hover": "Foo *", + "qualified_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 cb4eb011..4af366eb 100644 --- a/tests/usage/func_usage_class_inline_var_def.cc +++ b/tests/usage/func_usage_class_inline_var_def.cc @@ -23,8 +23,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_class_inline_var_def.cc@F@helper#", "short_name": "helper", - "qualified_name": "helper", - "hover": "int ()", + "qualified_name": "int helper()", "definition_spelling": "1:12-1:18", "definition_extent": "1:1-3:2", "callers": ["-1@6:11-6:17"] @@ -33,8 +32,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@x", "short_name": "x", - "qualified_name": "Foo::x", - "hover": "int", + "qualified_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 2723ccfd..2ad6afa0 100644 --- a/tests/usage/func_usage_forward_decl_func.cc +++ b/tests/usage/func_usage_forward_decl_func.cc @@ -10,16 +10,14 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_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": "usage", - "hover": "void ()", + "qualified_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 581b4578..9128124d 100644 --- a/tests/usage/func_usage_forward_decl_method.cc +++ b/tests/usage/func_usage_forward_decl_method.cc @@ -24,8 +24,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@foo#", "short_name": "foo", - "qualified_name": "Foo::foo", - "hover": "void ()", + "qualified_name": "void Foo::foo()", "declarations": ["2:8-2:11"], "declaring_type": 0, "callers": ["1@7:6-7:9"] @@ -33,8 +32,7 @@ OUTPUT: "id": 1, "usr": "c:@F@usage#", "short_name": "usage", - "qualified_name": "usage", - "hover": "void ()", + "qualified_name": "void usage()", "definition_spelling": "5:6-5:11", "definition_extent": "5:1-8:2", "callees": ["0@7:6-7:9"] @@ -43,8 +41,7 @@ OUTPUT: "id": 0, "usr": "c:func_usage_forward_decl_method.cc@53@F@usage#@f", "short_name": "f", - "qualified_name": "f", - "hover": "Foo *", + "qualified_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 13455dff..956ff252 100644 --- a/tests/usage/func_usage_template_func.cc +++ b/tests/usage/func_usage_template_func.cc @@ -13,16 +13,14 @@ OUTPUT: "id": 0, "usr": "c:@FT@>1#Taccept#t0.0#v#", "short_name": "accept", - "qualified_name": "accept", - "hover": "void (T)", + "qualified_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": "foo", - "hover": "void ()", + "qualified_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 83e6ab04..8b1cabd0 100644 --- a/tests/usage/type_usage_as_template_parameter.cc +++ b/tests/usage/type_usage_as_template_parameter.cc @@ -31,8 +31,7 @@ OUTPUT: "id": 0, "usr": "c:@F@return_type#", "short_name": "return_type", - "qualified_name": "return_type", - "hover": "unique_ptr *()", + "qualified_name": "unique_ptr *return_type()", "definition_spelling": "9:16-9:27", "definition_extent": "9:1-12:2" }], @@ -40,8 +39,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_as_template_parameter.cc@f0", "short_name": "f0", - "qualified_name": "f0", - "hover": "unique_ptr", + "qualified_name": "unique_ptr f0", "definition_spelling": "6:25-6:27", "definition_extent": "6:1-6:27", "variable_type": 0, @@ -50,8 +48,7 @@ OUTPUT: "id": 1, "usr": "c:type_usage_as_template_parameter.cc@f1", "short_name": "f1", - "qualified_name": "f1", - "hover": "unique_ptr", + "qualified_name": "unique_ptr f1", "definition_spelling": "7:22-7:24", "definition_extent": "7:1-7:24", "variable_type": 0, @@ -60,8 +57,7 @@ OUTPUT: "id": 2, "usr": "c:type_usage_as_template_parameter.cc@150@F@return_type#@local", "short_name": "local", - "qualified_name": "local", - "hover": "unique_ptr *", + "qualified_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 4e10697b..d8e182db 100644 --- a/tests/usage/type_usage_as_template_parameter_complex.cc +++ b/tests/usage/type_usage_as_template_parameter_complex.cc @@ -108,32 +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": "as_return_type", - "hover": "unique_ptr, S2> *(unique_ptr *)", + "qualified_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": "no_return_type", - "hover": "void (int)", + "qualified_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": "empty", - "hover": "void ()", + "qualified_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": "Foo::foo", - "hover": "unique_ptr *()", + "qualified_name": "unique_ptr *Foo::foo()", "declarations": ["65:23-65:26"], "definition_spelling": "79:26-79:29", "definition_extent": "79:1-79:51", @@ -143,8 +139,7 @@ OUTPUT: "id": 0, "usr": "c:@f", "short_name": "f", - "qualified_name": "f", - "hover": "unique_ptr, S2>", + "qualified_name": "unique_ptr, S2> f", "declaration": "15:43-15:44", "variable_type": 0, "uses": ["15:43-15:44"] @@ -152,8 +147,7 @@ OUTPUT: "id": 1, "usr": "c:type_usage_as_template_parameter_complex.cc@1062@F@empty#@local", "short_name": "local", - "qualified_name": "local", - "hover": "unique_ptr, S2> *", + "qualified_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 9b6eafad..3c326918 100644 --- a/tests/usage/type_usage_as_template_parameter_simple.cc +++ b/tests/usage/type_usage_as_template_parameter_simple.cc @@ -26,8 +26,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_as_template_parameter_simple.cc@foo", "short_name": "foo", - "qualified_name": "foo", - "hover": "unique_ptr", + "qualified_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 3dc5e44f..f277ce57 100644 --- a/tests/usage/type_usage_declare_extern.cc +++ b/tests/usage/type_usage_declare_extern.cc @@ -18,8 +18,7 @@ OUTPUT: "id": 0, "usr": "c:@t", "short_name": "t", - "qualified_name": "t", - "hover": "T", + "qualified_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 3d23e066..475b0067 100644 --- a/tests/usage/type_usage_declare_field.cc +++ b/tests/usage/type_usage_declare_field.cc @@ -37,8 +37,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@a", "short_name": "a", - "qualified_name": "Foo::a", - "hover": "ForwardType *", + "qualified_name": "ForwardType * Foo::a", "definition_spelling": "5:16-5:17", "definition_extent": "5:3-5:17", "variable_type": 0, @@ -48,8 +47,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@FI@b", "short_name": "b", - "qualified_name": "Foo::b", - "hover": "ImplementedType", + "qualified_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 19656bd3..069c9648 100644 --- a/tests/usage/type_usage_declare_local.cc +++ b/tests/usage/type_usage_declare_local.cc @@ -28,8 +28,7 @@ OUTPUT: "id": 0, "usr": "c:@F@Foo#", "short_name": "Foo", - "qualified_name": "Foo", - "hover": "void ()", + "qualified_name": "void Foo()", "definition_spelling": "4:6-4:9", "definition_extent": "4:1-7:2" }], @@ -37,8 +36,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_declare_local.cc@67@F@Foo#@a", "short_name": "a", - "qualified_name": "a", - "hover": "ForwardType *", + "qualified_name": "ForwardType * a", "definition_spelling": "5:16-5:17", "definition_extent": "5:3-5:17", "variable_type": 0, @@ -47,8 +45,7 @@ OUTPUT: "id": 1, "usr": "c:type_usage_declare_local.cc@86@F@Foo#@b", "short_name": "b", - "qualified_name": "b", - "hover": "ImplementedType", + "qualified_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 b639850d..998c4d1a 100644 --- a/tests/usage/type_usage_declare_param.cc +++ b/tests/usage/type_usage_declare_param.cc @@ -25,8 +25,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#*$@S@ForwardType#$@S@ImplementedType#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (ForwardType *, ImplementedType)", + "qualified_name": "void foo(ForwardType *, ImplementedType)", "definition_spelling": "4:6-4:9", "definition_extent": "4:1-4:47" }], @@ -34,8 +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": "f", - "hover": "ForwardType *", + "qualified_name": "ForwardType * f", "definition_spelling": "4:23-4:24", "definition_extent": "4:10-4:24", "variable_type": 0, @@ -44,8 +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": "a", - "hover": "ImplementedType", + "qualified_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 8f9821b5..c1593816 100644 --- a/tests/usage/type_usage_declare_param_prototype.cc +++ b/tests/usage/type_usage_declare_param_prototype.cc @@ -21,8 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#*$@S@Foo#S0_#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (Foo *, Foo *)", + "qualified_name": "void foo(Foo *, Foo *)", "declarations": ["3:6-3:9"], "definition_spelling": "4:6-4:9", "definition_extent": "4:1-4:26" @@ -31,8 +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": "f", - "hover": "Foo *", + "qualified_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 2d63baf8..f3578a75 100644 --- a/tests/usage/type_usage_declare_param_unnamed.cc +++ b/tests/usage/type_usage_declare_param_unnamed.cc @@ -12,8 +12,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#*$@S@ForwardType#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (ForwardType *)", + "qualified_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 0dbe3671..33701ce5 100644 --- a/tests/usage/type_usage_declare_qualifiers.cc +++ b/tests/usage/type_usage_declare_qualifiers.cc @@ -23,8 +23,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#&$@S@Type#&1S1_#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (Type &, const Type &)", + "qualified_name": "void foo(Type &, const Type &)", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-8:2" }], @@ -32,8 +31,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_declare_qualifiers.cc@28@F@foo#&$@S@Type#&1S1_#@a0", "short_name": "a0", - "qualified_name": "a0", - "hover": "Type &", + "qualified_name": "Type & a0", "definition_spelling": "3:16-3:18", "definition_extent": "3:10-3:18", "variable_type": 0, @@ -42,8 +40,7 @@ OUTPUT: "id": 1, "usr": "c:type_usage_declare_qualifiers.cc@38@F@foo#&$@S@Type#&1S1_#@a1", "short_name": "a1", - "qualified_name": "a1", - "hover": "const Type &", + "qualified_name": "const Type & a1", "definition_spelling": "3:32-3:34", "definition_extent": "3:20-3:34", "variable_type": 0, @@ -52,8 +49,7 @@ OUTPUT: "id": 2, "usr": "c:type_usage_declare_qualifiers.cc@59@F@foo#&$@S@Type#&1S1_#@a2", "short_name": "a2", - "qualified_name": "a2", - "hover": "Type", + "qualified_name": "Type a2", "definition_spelling": "4:8-4:10", "definition_extent": "4:3-4:10", "variable_type": 0, @@ -62,8 +58,7 @@ OUTPUT: "id": 3, "usr": "c:type_usage_declare_qualifiers.cc@71@F@foo#&$@S@Type#&1S1_#@a3", "short_name": "a3", - "qualified_name": "a3", - "hover": "Type *", + "qualified_name": "Type * a3", "definition_spelling": "5:9-5:11", "definition_extent": "5:3-5:11", "variable_type": 0, @@ -72,8 +67,7 @@ OUTPUT: "id": 4, "usr": "c:type_usage_declare_qualifiers.cc@84@F@foo#&$@S@Type#&1S1_#@a4", "short_name": "a4", - "qualified_name": "a4", - "hover": "const Type *", + "qualified_name": "const Type * a4", "definition_spelling": "6:15-6:17", "definition_extent": "6:3-6:17", "variable_type": 0, @@ -82,8 +76,7 @@ OUTPUT: "id": 5, "usr": "c:type_usage_declare_qualifiers.cc@103@F@foo#&$@S@Type#&1S1_#@a5", "short_name": "a5", - "qualified_name": "a5", - "hover": "const Type *", + "qualified_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 7d6b833c..d2611efc 100644 --- a/tests/usage/type_usage_declare_static.cc +++ b/tests/usage/type_usage_declare_static.cc @@ -13,8 +13,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_declare_static.cc@t", "short_name": "t", - "qualified_name": "t", - "hover": "Type", + "qualified_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 f3632794..0f82d29f 100644 --- a/tests/usage/type_usage_on_return_type.cc +++ b/tests/usage/type_usage_on_return_type.cc @@ -38,8 +38,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "Type *()", + "qualified_name": "Type *foo()", "declarations": ["3:7-3:10", "4:7-4:10"], "definition_spelling": "5:7-5:10", "definition_extent": "5:1-5:15" @@ -47,8 +46,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@F@Get#I#", "short_name": "Get", - "qualified_name": "Foo::Get", - "hover": "Type *(int)", + "qualified_name": "Type *Foo::Get(int)", "declarations": ["8:9-8:12"], "definition_spelling": "12:12-12:15", "definition_extent": "12:1-12:23", @@ -57,8 +55,7 @@ OUTPUT: "id": 2, "usr": "c:@S@Foo@F@Empty#", "short_name": "Empty", - "qualified_name": "Foo::Empty", - "hover": "void ()", + "qualified_name": "void Foo::Empty()", "declarations": ["9:8-9:13"], "definition_spelling": "13:11-13:16", "definition_extent": "13:1-13:21", @@ -67,15 +64,13 @@ OUTPUT: "id": 3, "usr": "c:@F@external#", "short_name": "external", - "qualified_name": "external", - "hover": "const Type &()", + "qualified_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": "bar", - "hover": "Type *()", + "qualified_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 8f33b20a..061f67ef 100644 --- a/tests/usage/type_usage_typedef_and_using.cc +++ b/tests/usage/type_usage_typedef_and_using.cc @@ -56,32 +56,28 @@ OUTPUT: "id": 0, "usr": "c:@F@accept#*$@S@Foo#", "short_name": "accept", - "qualified_name": "accept", - "hover": "void (Foo *)", + "qualified_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": "accept1", - "hover": "void (Foo1 *)", + "qualified_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": "accept2", - "hover": "void (Foo2 *)", + "qualified_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": "accept3", - "hover": "void (Foo3 *)", + "qualified_name": "void accept3(Foo3 *)", "definition_spelling": "10:6-10:13", "definition_extent": "10:1-10:23" }] diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc index fdfdec74..a49a8bf0 100644 --- a/tests/usage/type_usage_various.cc +++ b/tests/usage/type_usage_various.cc @@ -27,8 +27,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@F@make#", "short_name": "make", - "qualified_name": "Foo::make", - "hover": "Foo *()", + "qualified_name": "Foo *Foo::make()", "declarations": ["2:8-2:12"], "definition_spelling": "5:11-5:15", "definition_extent": "5:1-8:2", @@ -38,8 +37,7 @@ OUTPUT: "id": 0, "usr": "c:type_usage_various.cc@57@S@Foo@F@make#@f", "short_name": "f", - "qualified_name": "f", - "hover": "Foo", + "qualified_name": "Foo f", "definition_spelling": "6:7-6:8", "definition_extent": "6:3-6:8", "variable_type": 0, @@ -48,8 +46,7 @@ OUTPUT: "id": 1, "usr": "c:@foo", "short_name": "foo", - "qualified_name": "foo", - "hover": "Foo", + "qualified_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 33bff047..2298d9c2 100644 --- a/tests/usage/usage_inside_of_call.cc +++ b/tests/usage/usage_inside_of_call.cc @@ -31,24 +31,21 @@ OUTPUT: "id": 0, "usr": "c:@F@called#I#", "short_name": "called", - "qualified_name": "called", - "hover": "void (int)", + "qualified_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": "gen", - "hover": "int ()", + "qualified_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": "foo", - "hover": "void ()", + "qualified_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"] @@ -57,8 +54,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@static_var", "short_name": "static_var", - "qualified_name": "Foo::static_var", - "hover": "int", + "qualified_name": "int Foo::static_var", "declaration": "6:14-6:24", "definition_spelling": "10:10-10:20", "definition_extent": "10:1-10:24", @@ -68,8 +64,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@FI@field_var", "short_name": "field_var", - "qualified_name": "Foo::field_var", - "hover": "int", + "qualified_name": "int Foo::field_var", "definition_spelling": "7:7-7:16", "definition_extent": "7:3-7:16", "declaring_type": 0, @@ -78,8 +73,7 @@ OUTPUT: "id": 2, "usr": "c:usage_inside_of_call.cc@145@F@foo#@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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 aabfb4d4..02985b15 100644 --- a/tests/usage/usage_inside_of_call_simple.cc +++ b/tests/usage/usage_inside_of_call_simple.cc @@ -13,16 +13,14 @@ OUTPUT: "id": 0, "usr": "c:@F@called#I#", "short_name": "called", - "qualified_name": "called", - "hover": "void (int)", + "qualified_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": "gen", - "hover": "int ()", + "qualified_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"] @@ -30,8 +28,7 @@ OUTPUT: "id": 2, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_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 1630db26..66a37f64 100644 --- a/tests/usage/var_usage_call_function.cc +++ b/tests/usage/var_usage_call_function.cc @@ -14,8 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@called#", "short_name": "called", - "qualified_name": "called", - "hover": "void ()", + "qualified_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"] @@ -23,8 +22,7 @@ OUTPUT: "id": 1, "usr": "c:@F@caller#", "short_name": "caller", - "qualified_name": "caller", - "hover": "void ()", + "qualified_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"] @@ -33,8 +31,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_call_function.cc@39@F@caller#@x", "short_name": "x", - "qualified_name": "x", - "hover": "void (*)()", + "qualified_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 40319e2b..a8daa08b 100644 --- a/tests/usage/var_usage_class_member.cc +++ b/tests/usage/var_usage_class_member.cc @@ -35,24 +35,21 @@ OUTPUT: "id": 0, "usr": "c:@F@accept#I#", "short_name": "accept", - "qualified_name": "accept", - "hover": "void (int)", + "qualified_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": "accept", - "hover": "void (int *)", + "qualified_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": "foo", - "hover": "void ()", + "qualified_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"] @@ -61,8 +58,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@x", "short_name": "x", - "qualified_name": "Foo::x", - "hover": "int", + "qualified_name": "int Foo::x", "definition_spelling": "3:7-3:8", "definition_extent": "3:3-3:8", "declaring_type": 0, @@ -71,8 +67,7 @@ OUTPUT: "id": 1, "usr": "c:@S@Foo@FI@y", "short_name": "y", - "qualified_name": "Foo::y", - "hover": "int", + "qualified_name": "int Foo::y", "definition_spelling": "4:7-4:8", "definition_extent": "4:3-4:8", "declaring_type": 0, @@ -81,8 +76,7 @@ OUTPUT: "id": 2, "usr": "c:var_usage_class_member.cc@105@F@foo#@f", "short_name": "f", - "qualified_name": "f", - "hover": "Foo", + "qualified_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 e2062662..9a9c6bf8 100644 --- a/tests/usage/var_usage_class_member_static.cc +++ b/tests/usage/var_usage_class_member_static.cc @@ -24,16 +24,14 @@ OUTPUT: "id": 0, "usr": "c:@F@accept#I#", "short_name": "accept", - "qualified_name": "accept", - "hover": "void (int)", + "qualified_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": "foo", - "hover": "void ()", + "qualified_name": "void foo()", "definition_spelling": "7:6-7:9", "definition_extent": "7:1-9:2", "callees": ["0@8:3-8:9"] @@ -42,8 +40,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@x", "short_name": "x", - "qualified_name": "Foo::x", - "hover": "int", + "qualified_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 01869746..1060a420 100644 --- a/tests/usage/var_usage_cstyle_cast.cc +++ b/tests/usage/var_usage_cstyle_cast.cc @@ -33,8 +33,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Holder@static_var", "short_name": "static_var", - "qualified_name": "Holder::static_var", - "hover": "const VarType", + "qualified_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 c1c71d61..72ac718a 100644 --- a/tests/usage/var_usage_extern.cc +++ b/tests/usage/var_usage_extern.cc @@ -10,8 +10,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_name": "void foo()", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-5:2" }], @@ -19,8 +18,7 @@ OUTPUT: "id": 0, "usr": "c:@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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 af37c88e..ef6a390b 100644 --- a/tests/usage/var_usage_func_parameter.cc +++ b/tests/usage/var_usage_func_parameter.cc @@ -8,8 +8,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (int)", + "qualified_name": "void foo(int)", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-3:2" }], @@ -17,8 +16,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_func_parameter.cc@9@F@foo#I#@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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 31801d6a..caf0a7cb 100644 --- a/tests/usage/var_usage_local.cc +++ b/tests/usage/var_usage_local.cc @@ -9,8 +9,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_name": "void foo()", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-4:2" }], @@ -18,8 +17,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_local.cc@16@F@foo#@x", "short_name": "x", - "qualified_name": "x", - "hover": "int", + "qualified_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 2acc16cb..ae152c89 100644 --- a/tests/usage/var_usage_shadowed_local.cc +++ b/tests/usage/var_usage_shadowed_local.cc @@ -14,8 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_name": "void foo()", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-9:2" }], @@ -23,8 +22,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_shadowed_local.cc@16@F@foo#@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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"] @@ -32,8 +30,7 @@ OUTPUT: "id": 1, "usr": "c:var_usage_shadowed_local.cc@43@F@foo#@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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 637d7e21..b410a5e8 100644 --- a/tests/usage/var_usage_shadowed_parameter.cc +++ b/tests/usage/var_usage_shadowed_parameter.cc @@ -14,8 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (int)", + "qualified_name": "void foo(int)", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-8:2" }], @@ -23,8 +22,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_shadowed_parameter.cc@9@F@foo#I#@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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"] @@ -32,8 +30,7 @@ OUTPUT: "id": 1, "usr": "c:var_usage_shadowed_parameter.cc@38@F@foo#I#@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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 84a39272..3122c008 100644 --- a/tests/usage/var_usage_static.cc +++ b/tests/usage/var_usage_static.cc @@ -11,8 +11,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_name": "void foo()", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-5:2" }], @@ -20,8 +19,7 @@ OUTPUT: "id": 0, "usr": "c:var_usage_static.cc@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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 05315857..145ce7d5 100644 --- a/tests/vars/class_member.cc +++ b/tests/vars/class_member.cc @@ -19,8 +19,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@FI@member", "short_name": "member", - "qualified_name": "Foo::member", - "hover": "Foo *", + "qualified_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 f4b0946e..9613d55a 100644 --- a/tests/vars/class_static_member.cc +++ b/tests/vars/class_static_member.cc @@ -21,8 +21,7 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@member", "short_name": "member", - "qualified_name": "Foo::member", - "hover": "Foo *", + "qualified_name": "Foo * Foo::member", "declaration": "2:15-2:21", "definition_spelling": "4:11-4:17", "definition_extent": "4:1-4:27", @@ -31,5 +30,4 @@ OUTPUT: "uses": ["2:15-2:21", "4:11-4:17"] }] } - */ diff --git a/tests/vars/class_static_member_decl_only.cc b/tests/vars/class_static_member_decl_only.cc index f28c099c..82cce811 100644 --- a/tests/vars/class_static_member_decl_only.cc +++ b/tests/vars/class_static_member_decl_only.cc @@ -17,11 +17,9 @@ OUTPUT: "id": 0, "usr": "c:@S@Foo@member", "short_name": "member", - "qualified_name": "Foo::member", - "hover": "int", + "qualified_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 02c0210c..63161338 100644 --- a/tests/vars/function_local.cc +++ b/tests/vars/function_local.cc @@ -17,8 +17,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_name": "void foo()", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-5:2" }], @@ -26,8 +25,7 @@ OUTPUT: "id": 0, "usr": "c:function_local.cc@31@F@foo#@a", "short_name": "a", - "qualified_name": "a", - "hover": "Foo *", + "qualified_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 7b393035..9328998e 100644 --- a/tests/vars/function_param.cc +++ b/tests/vars/function_param.cc @@ -15,8 +15,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#*$@S@Foo#S0_#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (Foo *, Foo *)", + "qualified_name": "void foo(Foo *, Foo *)", "definition_spelling": "3:6-3:9", "definition_extent": "3:1-3:30" }], @@ -24,8 +23,7 @@ OUTPUT: "id": 0, "usr": "c:function_param.cc@24@F@foo#*$@S@Foo#S0_#@p0", "short_name": "p0", - "qualified_name": "p0", - "hover": "Foo *", + "qualified_name": "Foo * p0", "definition_spelling": "3:15-3:17", "definition_extent": "3:10-3:17", "variable_type": 0, @@ -34,8 +32,7 @@ OUTPUT: "id": 1, "usr": "c:function_param.cc@33@F@foo#*$@S@Foo#S0_#@p1", "short_name": "p1", - "qualified_name": "p1", - "hover": "Foo *", + "qualified_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 ccd6433b..7781a057 100644 --- a/tests/vars/function_param_unnamed.cc +++ b/tests/vars/function_param_unnamed.cc @@ -6,8 +6,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#I#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (int, int)", + "qualified_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 212f0c4d..9e8e98b3 100644 --- a/tests/vars/function_shadow_local.cc +++ b/tests/vars/function_shadow_local.cc @@ -14,8 +14,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void ()", + "qualified_name": "void foo()", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-9:2" }], @@ -23,8 +22,7 @@ OUTPUT: "id": 0, "usr": "c:function_shadow_local.cc@16@F@foo#@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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"] @@ -32,8 +30,7 @@ OUTPUT: "id": 1, "usr": "c:function_shadow_local.cc@43@F@foo#@a", "short_name": "a", - "qualified_name": "a", - "hover": "int", + "qualified_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 3d23b037..2965fb4d 100644 --- a/tests/vars/function_shadow_param.cc +++ b/tests/vars/function_shadow_param.cc @@ -8,8 +8,7 @@ OUTPUT: "id": 0, "usr": "c:@F@foo#I#", "short_name": "foo", - "qualified_name": "foo", - "hover": "void (int)", + "qualified_name": "void foo(int)", "definition_spelling": "1:6-1:9", "definition_extent": "1:1-3:2" }], @@ -17,8 +16,7 @@ OUTPUT: "id": 0, "usr": "c:function_shadow_param.cc@9@F@foo#I#@p", "short_name": "p", - "qualified_name": "p", - "hover": "int", + "qualified_name": "int p", "definition_spelling": "1:14-1:15", "definition_extent": "1:10-1:15", "uses": ["1:14-1:15"] @@ -26,8 +24,7 @@ OUTPUT: "id": 1, "usr": "c:function_shadow_param.cc@21@F@foo#I#@p", "short_name": "p", - "qualified_name": "p", - "hover": "int", + "qualified_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 b19d73c7..1d58213b 100644 --- a/tests/vars/global_variable.cc +++ b/tests/vars/global_variable.cc @@ -6,8 +6,7 @@ OUTPUT: "id": 0, "usr": "c:global_variable.cc@global", "short_name": "global", - "qualified_name": "global", - "hover": "int", + "qualified_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 e8d5901a..d2ec014b 100644 --- a/tests/vars/global_variable_decl_only.cc +++ b/tests/vars/global_variable_decl_only.cc @@ -6,8 +6,7 @@ OUTPUT: "id": 0, "usr": "c:@global", "short_name": "global", - "qualified_name": "global", - "hover": "int", + "qualified_name": "int global", "declaration": "1:12-1:18", "uses": ["1:12-1:18"] }]