Author: Kadir Cetinkaya Date: 2020-02-25T15:36:45+01:00 New Revision: e09754ccefc8cff7ae5fa18ce73db76339b559f5
URL: https://github.com/llvm/llvm-project/commit/e09754ccefc8cff7ae5fa18ce73db76339b559f5 DIFF: https://github.com/llvm/llvm-project/commit/e09754ccefc8cff7ae5fa18ce73db76339b559f5.diff LOG: [clangd] Migrate Lexer usages in TypeHierarchy to TokenBuffers Summary: Also fixes a bug, resulting from directly using ND.getEndLoc() for end location of the range. As ND.getEndLoc() points to the begining of the last token, whereas it should point one past the end, since LSP ranges are half open (exclusive on the end). Reviewers: sammccall Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D74850 Added: Modified: clang-tools-extra/clangd/XRefs.cpp clang-tools-extra/clangd/test/type-hierarchy.test Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp index c723f97dc501..3e0c9f79fc57 100644 --- a/clang-tools-extra/clangd/XRefs.cpp +++ b/clang-tools-extra/clangd/XRefs.cpp @@ -36,6 +36,7 @@ #include "clang/Index/IndexingAction.h" #include "clang/Index/IndexingOptions.h" #include "clang/Index/USRGeneration.h" +#include "clang/Tooling/Syntax/Tokens.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/None.h" #include "llvm/ADT/STLExtras.h" @@ -593,22 +594,23 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const LocatedSymbol &S) { // FIXME(nridge): Reduce duplication between this function and declToSym(). static llvm::Optional<TypeHierarchyItem> -declToTypeHierarchyItem(ASTContext &Ctx, const NamedDecl &ND) { +declToTypeHierarchyItem(ASTContext &Ctx, const NamedDecl &ND, + const syntax::TokenBuffer &TB) { auto &SM = Ctx.getSourceManager(); - SourceLocation NameLoc = nameLocation(ND, Ctx.getSourceManager()); - // getFileLoc is a good choice for us, but we also need to make sure - // sourceLocToPosition won't switch files, so we call getSpellingLoc on top of - // that to make sure it does not switch files. - // FIXME: sourceLocToPosition should not switch files! - SourceLocation BeginLoc = SM.getSpellingLoc(SM.getFileLoc(ND.getBeginLoc())); - SourceLocation EndLoc = SM.getSpellingLoc(SM.getFileLoc(ND.getEndLoc())); - if (NameLoc.isInvalid() || BeginLoc.isInvalid() || EndLoc.isInvalid()) + auto FilePath = + getCanonicalPath(SM.getFileEntryForID(SM.getFileID(NameLoc)), SM); + auto TUPath = getCanonicalPath(SM.getFileEntryForID(SM.getMainFileID()), SM); + if (!FilePath || !TUPath) + return llvm::None; // Not useful without a uri. + + auto DeclToks = TB.spelledForExpanded(TB.expandedTokens(ND.getSourceRange())); + if (!DeclToks || DeclToks->empty()) return llvm::None; - Position NameBegin = sourceLocToPosition(SM, NameLoc); - Position NameEnd = sourceLocToPosition( - SM, Lexer::getLocForEndOfToken(NameLoc, 0, SM, Ctx.getLangOpts())); + auto NameToks = TB.spelledForExpanded(TB.expandedTokens(NameLoc)); + if (!NameToks || NameToks->empty()) + return llvm::None; index::SymbolInfo SymInfo = index::getSymbolInfo(&ND); // FIXME: this is not classifying constructors, destructors and operators @@ -619,20 +621,18 @@ declToTypeHierarchyItem(ASTContext &Ctx, const NamedDecl &ND) { THI.name = printName(Ctx, ND); THI.kind = SK; THI.deprecated = ND.isDeprecated(); - THI.range = - Range{sourceLocToPosition(SM, BeginLoc), sourceLocToPosition(SM, EndLoc)}; - THI.selectionRange = Range{NameBegin, NameEnd}; + THI.range = halfOpenToRange( + SM, syntax::Token::range(SM, DeclToks->front(), DeclToks->back()) + .toCharRange(SM)); + THI.selectionRange = halfOpenToRange( + SM, syntax::Token::range(SM, NameToks->front(), NameToks->back()) + .toCharRange(SM)); if (!THI.range.contains(THI.selectionRange)) { // 'selectionRange' must be contained in 'range', so in cases where clang // reports unrelated ranges we need to reconcile somehow. THI.range = THI.selectionRange; } - auto FilePath = - getCanonicalPath(SM.getFileEntryForID(SM.getFileID(BeginLoc)), SM); - auto TUPath = getCanonicalPath(SM.getFileEntryForID(SM.getMainFileID()), SM); - if (!FilePath || !TUPath) - return llvm::None; // Not useful without a uri. THI.uri = URIForFile::canonicalize(*FilePath, *TUPath); return THI; @@ -685,7 +685,8 @@ using RecursionProtectionSet = llvm::SmallSet<const CXXRecordDecl *, 4>; static void fillSuperTypes(const CXXRecordDecl &CXXRD, ASTContext &ASTCtx, std::vector<TypeHierarchyItem> &SuperTypes, - RecursionProtectionSet &RPSet) { + RecursionProtectionSet &RPSet, + const syntax::TokenBuffer &TB) { // typeParents() will replace dependent template specializations // with their class template, so to avoid infinite recursion for // certain types of hierarchies, keep the templates encountered @@ -700,9 +701,9 @@ static void fillSuperTypes(const CXXRecordDecl &CXXRD, ASTContext &ASTCtx, for (const CXXRecordDecl *ParentDecl : typeParents(&CXXRD)) { if (Optional<TypeHierarchyItem> ParentSym = - declToTypeHierarchyItem(ASTCtx, *ParentDecl)) { + declToTypeHierarchyItem(ASTCtx, *ParentDecl, TB)) { ParentSym->parents.emplace(); - fillSuperTypes(*ParentDecl, ASTCtx, *ParentSym->parents, RPSet); + fillSuperTypes(*ParentDecl, ASTCtx, *ParentSym->parents, RPSet, TB); SuperTypes.emplace_back(std::move(*ParentSym)); } } @@ -805,7 +806,7 @@ getTypeHierarchy(ParsedAST &AST, Position Pos, int ResolveLevels, return llvm::None; Optional<TypeHierarchyItem> Result = - declToTypeHierarchyItem(AST.getASTContext(), *CXXRD); + declToTypeHierarchyItem(AST.getASTContext(), *CXXRD, AST.getTokens()); if (!Result) return Result; @@ -814,7 +815,8 @@ getTypeHierarchy(ParsedAST &AST, Position Pos, int ResolveLevels, Result->parents.emplace(); RecursionProtectionSet RPSet; - fillSuperTypes(*CXXRD, AST.getASTContext(), *Result->parents, RPSet); + fillSuperTypes(*CXXRD, AST.getASTContext(), *Result->parents, RPSet, + AST.getTokens()); } if ((Direction == TypeHierarchyDirection::Children || diff --git a/clang-tools-extra/clangd/test/type-hierarchy.test b/clang-tools-extra/clangd/test/type-hierarchy.test index 272fb71f3ab8..69014fab4ab1 100644 --- a/clang-tools-extra/clangd/test/type-hierarchy.test +++ b/clang-tools-extra/clangd/test/type-hierarchy.test @@ -48,7 +48,7 @@ # CHECK-NEXT: "parents": [], # CHECK-NEXT: "range": { # CHECK-NEXT: "end": { -# CHECK-NEXT: "character": 15, +# CHECK-NEXT: "character": 16, # CHECK-NEXT: "line": 0 # CHECK-NEXT: }, # CHECK-NEXT: "start": { @@ -71,7 +71,7 @@ # CHECK-NEXT: ], # CHECK-NEXT: "range": { # CHECK-NEXT: "end": { -# CHECK-NEXT: "character": 24, +# CHECK-NEXT: "character": 25, # CHECK-NEXT: "line": 1 # CHECK-NEXT: }, # CHECK-NEXT: "start": { @@ -94,7 +94,7 @@ # CHECK-NEXT: ], # CHECK-NEXT: "range": { # CHECK-NEXT: "end": { -# CHECK-NEXT: "character": 24, +# CHECK-NEXT: "character": 25, # CHECK-NEXT: "line": 2 # CHECK-NEXT: }, # CHECK-NEXT: "start": { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
