From 671a54c7aff20454c5f9481ddcac4887aecc52be Mon Sep 17 00:00:00 2001 From: Jacob Dufault Date: Tue, 16 May 2017 00:45:46 -0700 Subject: [PATCH] Move most of the information in document outline to containerName. This makes searching nicer. --- src/command_line.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/command_line.cc b/src/command_line.cc index 7ad8fabd..3f36be43 100644 --- a/src/command_line.cc +++ b/src/command_line.cc @@ -560,7 +560,9 @@ optional GetSymbolInfo(QueryDatabase* db, WorkingFiles* wor return nullopt; lsSymbolInformation info; - info.name = type->def.detailed_name; + info.name = type->def.short_name; + if (type->def.detailed_name != type->def.short_name) + info.containerName = type->def.detailed_name; info.kind = lsSymbolKind::Class; return info; } @@ -570,15 +572,14 @@ optional GetSymbolInfo(QueryDatabase* db, WorkingFiles* wor return nullopt; lsSymbolInformation info; - info.name = func->def.detailed_name; + info.name = func->def.short_name; + info.containerName = func->def.detailed_name; info.kind = lsSymbolKind::Function; if (func->def.declaring_type.has_value()) { optional& container = db->types[func->def.declaring_type->id]; - if (container) { + if (container) info.kind = lsSymbolKind::Method; - info.containerName = container->def.detailed_name; - } } return info; @@ -589,7 +590,8 @@ optional GetSymbolInfo(QueryDatabase* db, WorkingFiles* wor return nullopt; lsSymbolInformation info; - info.name += var->def.detailed_name; + info.name += var->def.short_name; + info.containerName = var->def.detailed_name; info.kind = lsSymbolKind::Variable; return info; }