Author: omtcyfz Date: Tue May 29 04:50:51 2018 New Revision: 333411 URL: http://llvm.org/viewvc/llvm-project?rev=333411&view=rev Log: [clangd] Minor cleanup
This patch silences few clang-tidy warnings, removes unwanted trailing whitespace and enforces coding guidelines. The functionality is not affected since the cleanup is rather straightforward, all clangd tests are still green. Reviewers: ioeric, ilya-biryukov Reviewed By: ioeric Subscribers: MaskRay, jkorous, cfe-commits Differential Revision: https://reviews.llvm.org/D47471 Modified: clang-tools-extra/trunk/clangd/CodeComplete.cpp clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp Modified: clang-tools-extra/trunk/clangd/CodeComplete.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/CodeComplete.cpp?rev=333411&r1=333410&r2=333411&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/CodeComplete.cpp (original) +++ clang-tools-extra/trunk/clangd/CodeComplete.cpp Tue May 29 04:50:51 2018 @@ -359,13 +359,13 @@ struct SpecifiedScope { // Get all scopes that will be queried in indexes. std::vector<std::string> getQueryScopes(CodeCompletionContext &CCContext, - const SourceManager& SM) { - auto GetAllAccessibleScopes = [](CodeCompletionContext& CCContext) { + const SourceManager &SM) { + auto GetAllAccessibleScopes = [](CodeCompletionContext &CCContext) { SpecifiedScope Info; - for (auto* Context : CCContext.getVisitedContexts()) { + for (auto *Context : CCContext.getVisitedContexts()) { if (isa<TranslationUnitDecl>(Context)) Info.AccessibleScopes.push_back(""); // global namespace - else if (const auto*NS = dyn_cast<NamespaceDecl>(Context)) + else if (const auto *NS = dyn_cast<NamespaceDecl>(Context)) Info.AccessibleScopes.push_back(NS->getQualifiedNameAsString() + "::"); } return Info; @@ -397,8 +397,9 @@ std::vector<std::string> getQueryScopes( Info.AccessibleScopes.push_back(""); // global namespace Info.UnresolvedQualifier = - Lexer::getSourceText(CharSourceRange::getCharRange((*SS)->getRange()), - SM, clang::LangOptions()).ltrim("::"); + Lexer::getSourceText(CharSourceRange::getCharRange((*SS)->getRange()), SM, + clang::LangOptions()) + .ltrim("::"); // Sema excludes the trailing "::". if (!Info.UnresolvedQualifier->empty()) *Info.UnresolvedQualifier += "::"; @@ -590,7 +591,7 @@ public: SigHelp.signatures.push_back(ProcessOverloadCandidate( Candidate, *CCS, getParameterDocComment(S.getASTContext(), Candidate, CurrentArg, - /*CommentsFromHeader=*/false))); + /*CommentsFromHeaders=*/false))); } } @@ -696,7 +697,7 @@ bool semaCodeComplete(std::unique_ptr<Co &DummyDiagsConsumer, false), Input.VFS); if (!CI) { - log("Couldn't create CompilerInvocation");; + log("Couldn't create CompilerInvocation"); return false; } auto &FrontendOpts = CI->getFrontendOpts(); @@ -1013,7 +1014,7 @@ private: LLVM_DEBUG(llvm::dbgs() << "CodeComplete: " << C.Name << (IndexResult ? " (index)" : "") << (SemaResult ? " (sema)" : "") << " = " << Scores.finalScore - << "\n" + << "\n" << Quality << Relevance << "\n"); NSema += bool(SemaResult); @@ -1035,7 +1036,8 @@ private: /*CommentsFromHeader=*/false); } } - return Candidate.build(FileName, Scores, Opts, SemaCCS, Includes.get(), DocComment); + return Candidate.build(FileName, Scores, Opts, SemaCCS, Includes.get(), + DocComment); } }; Modified: clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp?rev=333411&r1=333410&r2=333411&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp (original) +++ clang-tools-extra/trunk/clangd/tool/ClangdMain.cpp Tue May 29 04:50:51 2018 @@ -33,7 +33,7 @@ enum class PCHStorageFlag { Disk, Memory // Build an in-memory static index for global symbols from a YAML-format file. // The size of global symbols should be relatively small, so that all symbols // can be managed in memory. -std::unique_ptr<SymbolIndex> BuildStaticIndex(llvm::StringRef YamlSymbolFile) { +std::unique_ptr<SymbolIndex> buildStaticIndex(llvm::StringRef YamlSymbolFile) { auto Buffer = llvm::MemoryBuffer::getFile(YamlSymbolFile); if (!Buffer) { llvm::errs() << "Can't open " << YamlSymbolFile << "\n"; @@ -223,7 +223,7 @@ int main(int argc, char *argv[]) { Opts.BuildDynamicSymbolIndex = EnableIndex; std::unique_ptr<SymbolIndex> StaticIdx; if (EnableIndex && !YamlSymbolFile.empty()) { - StaticIdx = BuildStaticIndex(YamlSymbolFile); + StaticIdx = buildStaticIndex(YamlSymbolFile); Opts.StaticIndex = StaticIdx.get(); } Opts.AsyncThreadsCount = WorkerThreadsCount; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
