diff options
| author | Sam McCall <sam.mccall@gmail.com> | 2018-10-20 15:30:37 +0000 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2018-10-20 15:30:37 +0000 |
| commit | c008af646620f6718384c2cd95f58a7311fe10fb (patch) | |
| tree | 4961c6079af876f19462df09f9a0d0fa1176a824 /clang-tools-extra/clangd/FindSymbols.cpp | |
| parent | 0c35aa114d34c4f8add2a532de3a797ef0c1b667 (diff) | |
| download | bcm5719-llvm-c008af646620f6718384c2cd95f58a7311fe10fb.tar.gz bcm5719-llvm-c008af646620f6718384c2cd95f58a7311fe10fb.zip | |
[clangd] Namespace style cleanup in cpp files. NFC.
Standardize on the most common namespace setup in our *.cpp files:
using namespace llvm;
namespace clang {
namespace clangd {
void foo(StringRef) { ... }
And remove redundant llvm:: qualifiers. (Except for cases like
make_unique where this causes problems with std:: and ADL).
This choice is pretty arbitrary, but some broad consistency is nice.
This is going to conflict with everything. Sorry :-/
Squash the other configurations:
A)
using namespace llvm;
using namespace clang;
using namespace clangd;
void clangd::foo(StringRef);
This is in some of the older files. (It prevents accidentally defining a
new function instead of one in the header file, for what that's worth).
B)
namespace clang {
namespace clangd {
void foo(llvm::StringRef) { ... }
This is fine, but in practice the using directive often gets added over time.
C)
namespace clang {
namespace clangd {
using namespace llvm; // inside the namespace
This was pretty common, but is a bit misleading: name lookup preferrs
clang::clangd::foo > clang::foo > llvm:: foo (no matter where the using
directive is).
llvm-svn: 344850
Diffstat (limited to 'clang-tools-extra/clangd/FindSymbols.cpp')
| -rw-r--r-- | clang-tools-extra/clangd/FindSymbols.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/clang-tools-extra/clangd/FindSymbols.cpp b/clang-tools-extra/clangd/FindSymbols.cpp index 129674f5fd5..f6d3cf5a02e 100644 --- a/clang-tools-extra/clangd/FindSymbols.cpp +++ b/clang-tools-extra/clangd/FindSymbols.cpp @@ -23,9 +23,9 @@ #define DEBUG_TYPE "FindSymbols" +using namespace llvm; namespace clang { namespace clangd { - namespace { // Convert a index::SymbolKind to clangd::SymbolKind (LSP) @@ -98,7 +98,7 @@ struct ScoredSymbolGreater { } // namespace -llvm::Expected<std::vector<SymbolInformation>> +Expected<std::vector<SymbolInformation>> getWorkspaceSymbols(StringRef Query, int Limit, const SymbolIndex *const Index, StringRef HintPath) { std::vector<SymbolInformation> Result; @@ -181,7 +181,7 @@ class DocumentSymbolsConsumer : public index::IndexDataConsumer { ASTContext &AST; std::vector<SymbolInformation> Symbols; // We are always list document for the same file, so cache the value. - llvm::Optional<URIForFile> MainFileUri; + Optional<URIForFile> MainFileUri; public: DocumentSymbolsConsumer(ASTContext &AST) : AST(AST) {} @@ -230,7 +230,7 @@ public: // we can get here when in the presence of "extern" decls. return true; } - const NamedDecl *ND = llvm::dyn_cast<NamedDecl>(ASTNode.OrigD); + const NamedDecl *ND = dyn_cast<NamedDecl>(ASTNode.OrigD); if (!shouldIncludeSymbol(ND)) return true; @@ -262,8 +262,7 @@ public: }; } // namespace -llvm::Expected<std::vector<SymbolInformation>> -getDocumentSymbols(ParsedAST &AST) { +Expected<std::vector<SymbolInformation>> getDocumentSymbols(ParsedAST &AST) { DocumentSymbolsConsumer DocumentSymbolsCons(AST.getASTContext()); index::IndexingOptions IndexOpts; |

