2019-02-06 17:08:26 +08:00
|
|
|
//===--- Selection.cpp ----------------------------------------------------===//
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
//
|
|
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "Selection.h"
|
2019-07-19 19:41:02 +08:00
|
|
|
#include "SourceCode.h"
|
[clangd] Move non-clang base pieces into separate support/ lib. NFCI
Summary:
This enforces layering, reduces a sprawling clangd/ directory, and makes life
easier for embedders.
Reviewers: kbobyrev
Subscribers: mgorny, ilya-biryukov, javed.absar, MaskRay, jkorous, arphaman, jfb, kadircet, usaxena95, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D79014
2020-04-28 23:49:17 +08:00
|
|
|
#include "support/Logger.h"
|
2020-05-11 17:02:34 +08:00
|
|
|
#include "support/Trace.h"
|
2019-06-27 19:17:13 +08:00
|
|
|
#include "clang/AST/ASTTypeTraits.h"
|
2020-02-25 16:33:52 +08:00
|
|
|
#include "clang/AST/Decl.h"
|
2019-11-15 23:07:34 +08:00
|
|
|
#include "clang/AST/DeclCXX.h"
|
2019-11-14 03:16:23 +08:00
|
|
|
#include "clang/AST/Expr.h"
|
2019-11-19 23:57:31 +08:00
|
|
|
#include "clang/AST/ExprCXX.h"
|
2019-06-27 19:17:13 +08:00
|
|
|
#include "clang/AST/PrettyPrinter.h"
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
#include "clang/AST/RecursiveASTVisitor.h"
|
2019-06-27 19:17:13 +08:00
|
|
|
#include "clang/AST/TypeLoc.h"
|
2019-11-14 03:16:23 +08:00
|
|
|
#include "clang/Basic/OperatorKinds.h"
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
#include "clang/Basic/SourceLocation.h"
|
2019-07-19 19:41:02 +08:00
|
|
|
#include "clang/Basic/SourceManager.h"
|
|
|
|
#include "clang/Basic/TokenKinds.h"
|
2019-09-03 23:34:47 +08:00
|
|
|
#include "clang/Lex/Lexer.h"
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
#include "clang/Tooling/Syntax/Tokens.h"
|
2019-06-27 19:17:13 +08:00
|
|
|
#include "llvm/ADT/STLExtras.h"
|
2020-05-19 07:30:23 +08:00
|
|
|
#include "llvm/ADT/StringExtras.h"
|
2019-09-04 20:15:20 +08:00
|
|
|
#include "llvm/Support/Casting.h"
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
#include "llvm/Support/raw_ostream.h"
|
2019-06-27 19:17:13 +08:00
|
|
|
#include <algorithm>
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
#include <string>
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
|
|
|
|
namespace clang {
|
|
|
|
namespace clangd {
|
|
|
|
namespace {
|
|
|
|
using Node = SelectionTree::Node;
|
|
|
|
|
2020-05-11 17:02:34 +08:00
|
|
|
// Measure the fraction of selections that were enabled by recovery AST.
|
2020-12-07 17:52:04 +08:00
|
|
|
void recordMetrics(const SelectionTree &S, const LangOptions &Lang) {
|
|
|
|
if (!trace::enabled())
|
|
|
|
return;
|
|
|
|
const char *LanguageLabel = Lang.CPlusPlus ? "C++" : Lang.ObjC ? "ObjC" : "C";
|
2020-05-11 17:02:34 +08:00
|
|
|
static constexpr trace::Metric SelectionUsedRecovery(
|
2020-12-07 17:52:04 +08:00
|
|
|
"selection_recovery", trace::Metric::Distribution, "language");
|
|
|
|
static constexpr trace::Metric RecoveryType(
|
|
|
|
"selection_recovery_type", trace::Metric::Distribution, "language");
|
2020-05-11 17:02:34 +08:00
|
|
|
const auto *Common = S.commonAncestor();
|
|
|
|
for (const auto *N = Common; N; N = N->Parent) {
|
2020-07-13 17:26:45 +08:00
|
|
|
if (const auto *RE = N->ASTNode.get<RecoveryExpr>()) {
|
2020-12-07 17:52:04 +08:00
|
|
|
SelectionUsedRecovery.record(1, LanguageLabel); // used recovery ast.
|
|
|
|
RecoveryType.record(RE->isTypeDependent() ? 0 : 1, LanguageLabel);
|
2020-05-11 17:02:34 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (Common)
|
2020-12-07 17:52:04 +08:00
|
|
|
SelectionUsedRecovery.record(0, LanguageLabel); // unused.
|
2020-05-11 17:02:34 +08:00
|
|
|
}
|
|
|
|
|
2019-12-03 23:59:52 +08:00
|
|
|
// An IntervalSet maintains a set of disjoint subranges of an array.
|
|
|
|
//
|
|
|
|
// Initially, it contains the entire array.
|
|
|
|
// [-----------------------------------------------------------]
|
|
|
|
//
|
|
|
|
// When a range is erased(), it will typically split the array in two.
|
|
|
|
// Claim: [--------------------]
|
|
|
|
// after: [----------------] [-------------------]
|
|
|
|
//
|
|
|
|
// erase() returns the segments actually erased. Given the state above:
|
|
|
|
// Claim: [---------------------------------------]
|
|
|
|
// Out: [---------] [------]
|
|
|
|
// After: [-----] [-----------]
|
|
|
|
//
|
|
|
|
// It is used to track (expanded) tokens not yet associated with an AST node.
|
|
|
|
// On traversing an AST node, its token range is erased from the unclaimed set.
|
|
|
|
// The tokens actually removed are associated with that node, and hit-tested
|
|
|
|
// against the selection to determine whether the node is selected.
|
2019-12-24 02:38:04 +08:00
|
|
|
template <typename T> class IntervalSet {
|
2019-12-03 23:59:52 +08:00
|
|
|
public:
|
|
|
|
IntervalSet(llvm::ArrayRef<T> Range) { UnclaimedRanges.insert(Range); }
|
|
|
|
|
|
|
|
// Removes the elements of Claim from the set, modifying or removing ranges
|
|
|
|
// that overlap it.
|
|
|
|
// Returns the continuous subranges of Claim that were actually removed.
|
2020-12-10 20:36:35 +08:00
|
|
|
llvm::SmallVector<llvm::ArrayRef<T>> erase(llvm::ArrayRef<T> Claim) {
|
|
|
|
llvm::SmallVector<llvm::ArrayRef<T>> Out;
|
2019-12-03 23:59:52 +08:00
|
|
|
if (Claim.empty())
|
|
|
|
return Out;
|
|
|
|
|
|
|
|
// General case:
|
|
|
|
// Claim: [-----------------]
|
|
|
|
// UnclaimedRanges: [-A-] [-B-] [-C-] [-D-] [-E-] [-F-] [-G-]
|
|
|
|
// Overlap: ^first ^second
|
|
|
|
// Ranges C and D are fully included. Ranges B and E must be trimmed.
|
|
|
|
auto Overlap = std::make_pair(
|
|
|
|
UnclaimedRanges.lower_bound({Claim.begin(), Claim.begin()}), // C
|
|
|
|
UnclaimedRanges.lower_bound({Claim.end(), Claim.end()})); // F
|
|
|
|
// Rewind to cover B.
|
|
|
|
if (Overlap.first != UnclaimedRanges.begin()) {
|
|
|
|
--Overlap.first;
|
|
|
|
// ...unless B isn't selected at all.
|
|
|
|
if (Overlap.first->end() <= Claim.begin())
|
2019-12-24 02:38:04 +08:00
|
|
|
++Overlap.first;
|
2019-12-03 23:59:52 +08:00
|
|
|
}
|
|
|
|
if (Overlap.first == Overlap.second)
|
|
|
|
return Out;
|
|
|
|
|
|
|
|
// First, copy all overlapping ranges into the output.
|
|
|
|
auto OutFirst = Out.insert(Out.end(), Overlap.first, Overlap.second);
|
|
|
|
// If any of the overlapping ranges were sliced by the claim, split them:
|
|
|
|
// - restrict the returned range to the claimed part
|
|
|
|
// - save the unclaimed part so it can be reinserted
|
|
|
|
llvm::ArrayRef<T> RemainingHead, RemainingTail;
|
|
|
|
if (Claim.begin() > OutFirst->begin()) {
|
|
|
|
RemainingHead = {OutFirst->begin(), Claim.begin()};
|
|
|
|
*OutFirst = {Claim.begin(), OutFirst->end()};
|
|
|
|
}
|
|
|
|
if (Claim.end() < Out.back().end()) {
|
|
|
|
RemainingTail = {Claim.end(), Out.back().end()};
|
|
|
|
Out.back() = {Out.back().begin(), Claim.end()};
|
|
|
|
}
|
|
|
|
|
|
|
|
// Erase all the overlapping ranges (invalidating all iterators).
|
|
|
|
UnclaimedRanges.erase(Overlap.first, Overlap.second);
|
|
|
|
// Reinsert ranges that were merely trimmed.
|
|
|
|
if (!RemainingHead.empty())
|
|
|
|
UnclaimedRanges.insert(RemainingHead);
|
|
|
|
if (!RemainingTail.empty())
|
|
|
|
UnclaimedRanges.insert(RemainingTail);
|
|
|
|
|
|
|
|
return Out;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
using TokenRange = llvm::ArrayRef<T>;
|
|
|
|
struct RangeLess {
|
2019-12-04 05:13:45 +08:00
|
|
|
bool operator()(llvm::ArrayRef<T> L, llvm::ArrayRef<T> R) const {
|
2019-12-03 23:59:52 +08:00
|
|
|
return L.begin() < R.begin();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
// Disjoint sorted unclaimed ranges of expanded tokens.
|
2019-12-24 02:38:04 +08:00
|
|
|
std::set<llvm::ArrayRef<T>, RangeLess> UnclaimedRanges;
|
2019-12-03 23:59:52 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
// Sentinel value for the selectedness of a node where we've seen no tokens yet.
|
|
|
|
// This resolves to Unselected if no tokens are ever seen.
|
|
|
|
// But Unselected + Complete -> Partial, while NoTokens + Complete --> Complete.
|
|
|
|
// This value is never exposed publicly.
|
|
|
|
constexpr SelectionTree::Selection NoTokens =
|
|
|
|
static_cast<SelectionTree::Selection>(
|
|
|
|
static_cast<unsigned char>(SelectionTree::Complete + 1));
|
|
|
|
|
|
|
|
// Nodes start with NoTokens, and then use this function to aggregate the
|
|
|
|
// selectedness as more tokens are found.
|
|
|
|
void update(SelectionTree::Selection &Result, SelectionTree::Selection New) {
|
|
|
|
if (New == NoTokens)
|
|
|
|
return;
|
|
|
|
if (Result == NoTokens)
|
|
|
|
Result = New;
|
|
|
|
else if (Result != New)
|
|
|
|
// Can only be completely selected (or unselected) if all tokens are.
|
|
|
|
Result = SelectionTree::Partial;
|
|
|
|
}
|
|
|
|
|
2020-02-24 03:03:00 +08:00
|
|
|
// As well as comments, don't count semicolons as real tokens.
|
|
|
|
// They're not properly claimed as expr-statement is missing from the AST.
|
|
|
|
bool shouldIgnore(const syntax::Token &Tok) {
|
|
|
|
return Tok.kind() == tok::comment || Tok.kind() == tok::semi;
|
|
|
|
}
|
2019-12-03 23:59:52 +08:00
|
|
|
|
2019-12-24 02:38:04 +08:00
|
|
|
// Determine whether 'Target' is the first expansion of the macro
|
|
|
|
// argument whose top-level spelling location is 'SpellingLoc'.
|
|
|
|
bool isFirstExpansion(FileID Target, SourceLocation SpellingLoc,
|
|
|
|
const SourceManager &SM) {
|
|
|
|
SourceLocation Prev = SpellingLoc;
|
|
|
|
while (true) {
|
|
|
|
// If the arg is expanded multiple times, getMacroArgExpandedLocation()
|
|
|
|
// returns the first expansion.
|
|
|
|
SourceLocation Next = SM.getMacroArgExpandedLocation(Prev);
|
|
|
|
// So if we reach the target, target is the first-expansion of the
|
|
|
|
// first-expansion ...
|
|
|
|
if (SM.getFileID(Next) == Target)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
// Otherwise, if the FileID stops changing, we've reached the innermost
|
|
|
|
// macro expansion, and Target was on a different branch.
|
|
|
|
if (SM.getFileID(Next) == SM.getFileID(Prev))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
Prev = Next;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2019-12-03 23:59:52 +08:00
|
|
|
// SelectionTester can determine whether a range of tokens from the PP-expanded
|
|
|
|
// stream (corresponding to an AST node) is considered selected.
|
|
|
|
//
|
|
|
|
// When the tokens result from macro expansions, the appropriate tokens in the
|
|
|
|
// main file are examined (macro invocation or args). Similarly for #includes.
|
2019-12-24 02:38:04 +08:00
|
|
|
// However, only the first expansion of a given spelled token is considered
|
|
|
|
// selected.
|
2019-12-03 23:59:52 +08:00
|
|
|
//
|
|
|
|
// It tests each token in the range (not just the endpoints) as contiguous
|
|
|
|
// expanded tokens may not have contiguous spellings (with macros).
|
|
|
|
//
|
|
|
|
// Non-token text, and tokens not modeled in the AST (comments, semicolons)
|
|
|
|
// are ignored when determining selectedness.
|
|
|
|
class SelectionTester {
|
2019-06-27 19:17:13 +08:00
|
|
|
public:
|
2019-12-03 23:59:52 +08:00
|
|
|
// The selection is offsets [SelBegin, SelEnd) in SelFile.
|
|
|
|
SelectionTester(const syntax::TokenBuffer &Buf, FileID SelFile,
|
|
|
|
unsigned SelBegin, unsigned SelEnd, const SourceManager &SM)
|
|
|
|
: SelFile(SelFile), SM(SM) {
|
|
|
|
// Find all tokens (partially) selected in the file.
|
|
|
|
auto AllSpelledTokens = Buf.spelledTokens(SelFile);
|
|
|
|
const syntax::Token *SelFirst =
|
|
|
|
llvm::partition_point(AllSpelledTokens, [&](const syntax::Token &Tok) {
|
|
|
|
return SM.getFileOffset(Tok.endLocation()) <= SelBegin;
|
|
|
|
});
|
|
|
|
const syntax::Token *SelLimit = std::partition_point(
|
|
|
|
SelFirst, AllSpelledTokens.end(), [&](const syntax::Token &Tok) {
|
|
|
|
return SM.getFileOffset(Tok.location()) < SelEnd;
|
|
|
|
});
|
2020-07-17 18:03:24 +08:00
|
|
|
auto Sel = llvm::makeArrayRef(SelFirst, SelLimit);
|
|
|
|
// Find which of these are preprocessed to nothing and should be ignored.
|
|
|
|
std::vector<bool> PPIgnored(Sel.size(), false);
|
|
|
|
for (const syntax::TokenBuffer::Expansion &X :
|
2020-07-20 21:11:00 +08:00
|
|
|
Buf.expansionsOverlapping(Sel)) {
|
2020-07-17 18:03:24 +08:00
|
|
|
if (X.Expanded.empty()) {
|
|
|
|
for (const syntax::Token &Tok : X.Spelled) {
|
|
|
|
if (&Tok >= SelFirst && &Tok < SelLimit)
|
|
|
|
PPIgnored[&Tok - SelFirst] = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-12-03 23:59:52 +08:00
|
|
|
// Precompute selectedness and offset for selected spelled tokens.
|
2020-07-17 18:03:24 +08:00
|
|
|
for (unsigned I = 0; I < Sel.size(); ++I) {
|
|
|
|
if (shouldIgnore(Sel[I]) || PPIgnored[I])
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
continue;
|
2019-12-03 23:59:52 +08:00
|
|
|
SpelledTokens.emplace_back();
|
|
|
|
Tok &S = SpelledTokens.back();
|
2020-07-17 18:03:24 +08:00
|
|
|
S.Offset = SM.getFileOffset(Sel[I].location());
|
|
|
|
if (S.Offset >= SelBegin && S.Offset + Sel[I].length() <= SelEnd)
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
S.Selected = SelectionTree::Complete;
|
2019-11-30 02:59:02 +08:00
|
|
|
else
|
2019-12-03 23:59:52 +08:00
|
|
|
S.Selected = SelectionTree::Partial;
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
}
|
2019-06-27 19:17:13 +08:00
|
|
|
}
|
|
|
|
|
2019-12-03 23:59:52 +08:00
|
|
|
// Test whether a consecutive range of tokens is selected.
|
|
|
|
// The tokens are taken from the expanded token stream.
|
|
|
|
SelectionTree::Selection
|
|
|
|
test(llvm::ArrayRef<syntax::Token> ExpandedTokens) const {
|
|
|
|
if (SpelledTokens.empty())
|
|
|
|
return NoTokens;
|
|
|
|
SelectionTree::Selection Result = NoTokens;
|
|
|
|
while (!ExpandedTokens.empty()) {
|
|
|
|
// Take consecutive tokens from the same context together for efficiency.
|
|
|
|
FileID FID = SM.getFileID(ExpandedTokens.front().location());
|
|
|
|
auto Batch = ExpandedTokens.take_while([&](const syntax::Token &T) {
|
|
|
|
return SM.getFileID(T.location()) == FID;
|
|
|
|
});
|
|
|
|
assert(!Batch.empty());
|
|
|
|
ExpandedTokens = ExpandedTokens.drop_front(Batch.size());
|
|
|
|
|
|
|
|
update(Result, testChunk(FID, Batch));
|
|
|
|
}
|
|
|
|
return Result;
|
|
|
|
}
|
[clangd] Rethink how SelectionTree deals with macros and #includes.
Summary:
The exclusive-claim model is successful at resolving conflicts over tokens
between parent/child or siblings. However claims at the spelled-token
level do the wrong thing for macro expansions, where siblings can be
equally associated with the macro invocation.
Moreover, any model that only uses the endpoints in a range can fail when
a macro invocation occurs inside the node.
To address this, we use the existing TokenBuffer in more depth.
Claims are expressed in terms of expanded tokens, so there is no need to worry
about macros, includes etc.
Once we know which expanded tokens were claimed, they are mapped onto
spelled tokens for hit-testing.
This mapping is fairly flexible, currently the handling of macros is
pretty simple (map macro args onto spellings, other macro expansions onto the
macro name token).
This mapping is in principle token-by-token for correctness (though
there's some batching for performance).
The aggregation of the selection enum is now more principled as we need to be
able to aggregate several hit-test results together.
For simplicity i removed the ability to determine selectedness of TUDecl.
(That was originally implemented in 90a5bf92ff97b1, but doesn't seem to be very
important or worth the complexity any longer).
The expandedTokens(SourceLocation) helper could be added locally, but seems to
make sense on TokenBuffer.
Fixes https://github.com/clangd/clangd/issues/202
Fixes https://github.com/clangd/clangd/issues/126
Reviewers: hokein
Subscribers: MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D70512
2019-11-21 06:25:17 +08:00
|
|
|
|
2019-12-03 23:59:52 +08:00
|
|
|
// Cheap check whether any of the tokens in R might be selected.
|
|
|
|
// If it returns false, test() will return NoTokens or Unselected.
|
|
|
|
// If it returns true, test() may return any value.
|
|
|
|
bool mayHit(SourceRange R) const {
|
|
|
|
if (SpelledTokens.empty())
|
|
|
|
return false;
|
|
|
|
auto B = SM.getDecomposedLoc(R.getBegin());
|
|
|
|
auto E = SM.getDecomposedLoc(R.getEnd());
|
|
|
|
if (B.first == SelFile && E.first == SelFile)
|
|
|
|
if (E.second < SpelledTokens.front().Offset ||
|
|
|
|
B.second > SpelledTokens.back().Offset)
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
// Hit-test a consecutive range of tokens from a single file ID.
|
|
|
|
SelectionTree::Selection
|
|
|
|
testChunk(FileID FID, llvm::ArrayRef<syntax::Token> Batch) const {
|
|
|
|
assert(!Batch.empty());
|
|
|
|
SourceLocation StartLoc = Batch.front().location();
|
|
|
|
// There are several possible categories of FileID depending on how the
|
|
|
|
// preprocessor was used to generate these tokens:
|
|
|
|
// main file, #included file, macro args, macro bodies.
|
|
|
|
// We need to identify the main-file tokens that represent Batch, and
|
|
|
|
// determine whether we want to exclusively claim them. Regular tokens
|
|
|
|
// represent one AST construct, but a macro invocation can represent many.
|
|
|
|
|
|
|
|
// Handle tokens written directly in the main file.
|
|
|
|
if (FID == SelFile) {
|
|
|
|
return testTokenRange(SM.getFileOffset(Batch.front().location()),
|
|
|
|
SM.getFileOffset(Batch.back().location()));
|
|
|
|
}
|
|
|
|
|
|
|
|
// Handle tokens in another file #included into the main file.
|
|
|
|
// Check if the #include is selected, but don't claim it exclusively.
|
|
|
|
if (StartLoc.isFileID()) {
|
|
|
|
for (SourceLocation Loc = Batch.front().location(); Loc.isValid();
|
|
|
|
Loc = SM.getIncludeLoc(SM.getFileID(Loc))) {
|
|
|
|
if (SM.getFileID(Loc) == SelFile)
|
|
|
|
// FIXME: use whole #include directive, not just the filename string.
|
|
|
|
return testToken(SM.getFileOffset(Loc));
|
2019-06-27 19:17:13 +08:00
|
|
|
}
|
2019-12-03 23:59:52 +08:00
|
|
|
return NoTokens;
|
2019-06-27 19:17:13 +08:00
|
|
|
}
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
|
2019-12-03 23:59:52 +08:00
|
|
|
assert(StartLoc.isMacroID());
|
|
|
|
// Handle tokens that were passed as a macro argument.
|
|
|
|
SourceLocation ArgStart = SM.getTopMacroCallerLoc(StartLoc);
|
|
|
|
if (SM.getFileID(ArgStart) == SelFile) {
|
2019-12-24 02:38:04 +08:00
|
|
|
if (isFirstExpansion(FID, ArgStart, SM)) {
|
|
|
|
SourceLocation ArgEnd =
|
|
|
|
SM.getTopMacroCallerLoc(Batch.back().location());
|
|
|
|
return testTokenRange(SM.getFileOffset(ArgStart),
|
|
|
|
SM.getFileOffset(ArgEnd));
|
|
|
|
} else {
|
|
|
|
/* fall through and treat as part of the macro body */
|
|
|
|
}
|
2019-10-02 18:01:53 +08:00
|
|
|
}
|
2019-12-03 23:59:52 +08:00
|
|
|
|
|
|
|
// Handle tokens produced by non-argument macro expansion.
|
|
|
|
// Check if the macro name is selected, don't claim it exclusively.
|
|
|
|
auto Expansion = SM.getDecomposedExpansionLoc(StartLoc);
|
|
|
|
if (Expansion.first == SelFile)
|
|
|
|
// FIXME: also check ( and ) for function-like macros?
|
|
|
|
return testToken(Expansion.second);
|
|
|
|
else
|
|
|
|
return NoTokens;
|
[clangd] Rethink how SelectionTree deals with macros and #includes.
Summary:
The exclusive-claim model is successful at resolving conflicts over tokens
between parent/child or siblings. However claims at the spelled-token
level do the wrong thing for macro expansions, where siblings can be
equally associated with the macro invocation.
Moreover, any model that only uses the endpoints in a range can fail when
a macro invocation occurs inside the node.
To address this, we use the existing TokenBuffer in more depth.
Claims are expressed in terms of expanded tokens, so there is no need to worry
about macros, includes etc.
Once we know which expanded tokens were claimed, they are mapped onto
spelled tokens for hit-testing.
This mapping is fairly flexible, currently the handling of macros is
pretty simple (map macro args onto spellings, other macro expansions onto the
macro name token).
This mapping is in principle token-by-token for correctness (though
there's some batching for performance).
The aggregation of the selection enum is now more principled as we need to be
able to aggregate several hit-test results together.
For simplicity i removed the ability to determine selectedness of TUDecl.
(That was originally implemented in 90a5bf92ff97b1, but doesn't seem to be very
important or worth the complexity any longer).
The expandedTokens(SourceLocation) helper could be added locally, but seems to
make sense on TokenBuffer.
Fixes https://github.com/clangd/clangd/issues/202
Fixes https://github.com/clangd/clangd/issues/126
Reviewers: hokein
Subscribers: MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D70512
2019-11-21 06:25:17 +08:00
|
|
|
}
|
|
|
|
|
2019-12-03 23:59:52 +08:00
|
|
|
// Is the closed token range [Begin, End] selected?
|
|
|
|
SelectionTree::Selection testTokenRange(unsigned Begin, unsigned End) const {
|
|
|
|
assert(Begin <= End);
|
|
|
|
// Outside the selection entirely?
|
|
|
|
if (End < SpelledTokens.front().Offset ||
|
|
|
|
Begin > SpelledTokens.back().Offset)
|
|
|
|
return SelectionTree::Unselected;
|
|
|
|
|
|
|
|
// Compute range of tokens.
|
|
|
|
auto B = llvm::partition_point(
|
|
|
|
SpelledTokens, [&](const Tok &T) { return T.Offset < Begin; });
|
|
|
|
auto E = std::partition_point(
|
|
|
|
B, SpelledTokens.end(), [&](const Tok &T) { return T.Offset <= End; });
|
|
|
|
|
|
|
|
// Aggregate selectedness of tokens in range.
|
|
|
|
bool ExtendsOutsideSelection = Begin < SpelledTokens.front().Offset ||
|
|
|
|
End > SpelledTokens.back().Offset;
|
|
|
|
SelectionTree::Selection Result =
|
|
|
|
ExtendsOutsideSelection ? SelectionTree::Unselected : NoTokens;
|
|
|
|
for (auto It = B; It != E; ++It)
|
|
|
|
update(Result, It->Selected);
|
|
|
|
return Result;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Is the token at `Offset` selected?
|
|
|
|
SelectionTree::Selection testToken(unsigned Offset) const {
|
|
|
|
// Outside the selection entirely?
|
|
|
|
if (Offset < SpelledTokens.front().Offset ||
|
|
|
|
Offset > SpelledTokens.back().Offset)
|
|
|
|
return SelectionTree::Unselected;
|
|
|
|
// Find the token, if it exists.
|
|
|
|
auto It = llvm::partition_point(
|
|
|
|
SpelledTokens, [&](const Tok &T) { return T.Offset < Offset; });
|
|
|
|
if (It != SpelledTokens.end() && It->Offset == Offset)
|
|
|
|
return It->Selected;
|
|
|
|
return NoTokens;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct Tok {
|
|
|
|
unsigned Offset;
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
SelectionTree::Selection Selected;
|
|
|
|
};
|
2019-12-03 23:59:52 +08:00
|
|
|
std::vector<Tok> SpelledTokens;
|
|
|
|
FileID SelFile;
|
|
|
|
const SourceManager &SM;
|
2019-06-27 19:17:13 +08:00
|
|
|
};
|
|
|
|
|
2019-07-24 17:39:11 +08:00
|
|
|
// Show the type of a node for debugging.
|
|
|
|
void printNodeKind(llvm::raw_ostream &OS, const DynTypedNode &N) {
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
if (const TypeLoc *TL = N.get<TypeLoc>()) {
|
|
|
|
// TypeLoc is a hierarchy, but has only a single ASTNodeKind.
|
|
|
|
// Synthesize the name from the Type subclass (except for QualifiedTypeLoc).
|
|
|
|
if (TL->getTypeLocClass() == TypeLoc::Qualified)
|
|
|
|
OS << "QualifiedTypeLoc";
|
|
|
|
else
|
|
|
|
OS << TL->getType()->getTypeClassName() << "TypeLoc";
|
|
|
|
} else {
|
|
|
|
OS << N.getNodeKind().asStringRef();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-07-28 01:09:15 +08:00
|
|
|
#ifndef NDEBUG
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
std::string printNodeToString(const DynTypedNode &N, const PrintingPolicy &PP) {
|
|
|
|
std::string S;
|
|
|
|
llvm::raw_string_ostream OS(S);
|
2019-07-24 17:39:11 +08:00
|
|
|
printNodeKind(OS, N);
|
|
|
|
OS << " ";
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
return std::move(OS.str());
|
|
|
|
}
|
2019-07-28 01:09:15 +08:00
|
|
|
#endif
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
|
2019-12-24 02:38:04 +08:00
|
|
|
bool isImplicit(const Stmt *S) {
|
2019-11-14 03:16:23 +08:00
|
|
|
// Some Stmts are implicit and shouldn't be traversed, but there's no
|
|
|
|
// "implicit" attribute on Stmt/Expr.
|
|
|
|
// Unwrap implicit casts first if present (other nodes too?).
|
|
|
|
if (auto *ICE = llvm::dyn_cast<ImplicitCastExpr>(S))
|
|
|
|
S = ICE->getSubExprAsWritten();
|
|
|
|
// Implicit this in a MemberExpr is not filtered out by RecursiveASTVisitor.
|
|
|
|
// It would be nice if RAV handled this (!shouldTraverseImplicitCode()).
|
|
|
|
if (auto *CTI = llvm::dyn_cast<CXXThisExpr>(S))
|
|
|
|
if (CTI->isImplicit())
|
|
|
|
return true;
|
|
|
|
// Refs to operator() and [] are (almost?) always implicit as part of calls.
|
|
|
|
if (auto *DRE = llvm::dyn_cast<DeclRefExpr>(S)) {
|
|
|
|
if (auto *FD = llvm::dyn_cast<FunctionDecl>(DRE->getDecl())) {
|
|
|
|
switch (FD->getOverloadedOperator()) {
|
|
|
|
case OO_Call:
|
|
|
|
case OO_Subscript:
|
|
|
|
return true;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
// We find the selection by visiting written nodes in the AST, looking for nodes
|
|
|
|
// that intersect with the selected character range.
|
|
|
|
//
|
|
|
|
// While traversing, we maintain a parent stack. As nodes pop off the stack,
|
|
|
|
// we decide whether to keep them or not. To be kept, they must either be
|
|
|
|
// selected or contain some nodes that are.
|
|
|
|
//
|
|
|
|
// For simple cases (not inside macros) we prune subtrees that don't intersect.
|
|
|
|
class SelectionVisitor : public RecursiveASTVisitor<SelectionVisitor> {
|
|
|
|
public:
|
|
|
|
// Runs the visitor to gather selected nodes and their ancestors.
|
|
|
|
// If there is any selection, the root (TUDecl) is the first node.
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
static std::deque<Node> collect(ASTContext &AST,
|
|
|
|
const syntax::TokenBuffer &Tokens,
|
|
|
|
const PrintingPolicy &PP, unsigned Begin,
|
|
|
|
unsigned End, FileID File) {
|
|
|
|
SelectionVisitor V(AST, Tokens, PP, Begin, End, File);
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
V.TraverseAST(AST);
|
|
|
|
assert(V.Stack.size() == 1 && "Unpaired push/pop?");
|
|
|
|
assert(V.Stack.top() == &V.Nodes.front());
|
|
|
|
return std::move(V.Nodes);
|
|
|
|
}
|
|
|
|
|
|
|
|
// We traverse all "well-behaved" nodes the same way:
|
|
|
|
// - push the node onto the stack
|
|
|
|
// - traverse its children recursively
|
|
|
|
// - pop it from the stack
|
|
|
|
// - hit testing: is intersection(node, selection) - union(children) empty?
|
|
|
|
// - attach it to the tree if it or any children hit the selection
|
|
|
|
//
|
|
|
|
// Two categories of nodes are not "well-behaved":
|
|
|
|
// - those without source range information, we don't record those
|
|
|
|
// - those that can't be stored in DynTypedNode.
|
|
|
|
// We're missing some interesting things like Attr due to the latter.
|
|
|
|
bool TraverseDecl(Decl *X) {
|
[clangd] Fix an assertion failure in Selection.
Summary:
The assertion is triggered when the Decl is null.
Details for the assertion:
F0207 09:55:09.069385 47308 logging.cc:84] assert.h assertion failed at llvm/include/llvm/Support/Casting.h:105 in static bool llvm::isa_impl_cl<clang::TranslationUnitDecl, const clang:: Decl *>::doit(const From *) [To = clang::TranslationUnitDecl, From = const clang::Decl *]: Val && "isa<> used on a null pointer"
15 *** Check failure stack trace: ***
19 @ 0x55615c1f7e06 __assert_fail
20 @ 0x55615a6297d8 clang::clangd::(anonymous namespace)::SelectionVisitor::TraverseDecl()
21 @ 0x55615a62f48d clang::RecursiveASTVisitor<>::TraverseTemplateTemplateParmDecl()
22 @ 0x55615a62b264 clang::RecursiveASTVisitor<>::TraverseDecl()
23 @ 0x55615a62979c clang::clangd::(anonymous namespace)::SelectionVisitor::TraverseDecl()
24 @ 0x55615a63060c clang::RecursiveASTVisitor<>::TraverseClassTemplatePartialSpecializationDecl()
25 @ 0x55615a62ae45 clang::RecursiveASTVisitor<>::TraverseDecl()
Reviewers: sammccall
Subscribers: javed.absar, kristof.beyls, ilya-biryukov, ioeric, MaskRay, jkorous, arphaman, kadircet, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57879
llvm-svn: 353421
2019-02-08 00:00:44 +08:00
|
|
|
if (X && isa<TranslationUnitDecl>(X))
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
return Base::TraverseDecl(X); // Already pushed by constructor.
|
2019-06-18 21:37:54 +08:00
|
|
|
// Base::TraverseDecl will suppress children, but not this node itself.
|
|
|
|
if (X && X->isImplicit())
|
|
|
|
return true;
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
return traverseNode(X, [&] { return Base::TraverseDecl(X); });
|
|
|
|
}
|
|
|
|
bool TraverseTypeLoc(TypeLoc X) {
|
|
|
|
return traverseNode(&X, [&] { return Base::TraverseTypeLoc(X); });
|
|
|
|
}
|
2020-08-10 08:37:43 +08:00
|
|
|
bool TraverseTemplateArgumentLoc(const TemplateArgumentLoc &X) {
|
|
|
|
return traverseNode(&X,
|
|
|
|
[&] { return Base::TraverseTemplateArgumentLoc(X); });
|
|
|
|
}
|
2019-06-25 17:36:09 +08:00
|
|
|
bool TraverseNestedNameSpecifierLoc(NestedNameSpecifierLoc X) {
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
return traverseNode(
|
|
|
|
&X, [&] { return Base::TraverseNestedNameSpecifierLoc(X); });
|
|
|
|
}
|
|
|
|
bool TraverseConstructorInitializer(CXXCtorInitializer *X) {
|
|
|
|
return traverseNode(
|
|
|
|
X, [&] { return Base::TraverseConstructorInitializer(X); });
|
|
|
|
}
|
2021-01-27 02:58:53 +08:00
|
|
|
bool TraverseCXXBaseSpecifier(const CXXBaseSpecifier &X) {
|
|
|
|
return traverseNode(&X, [&] { return Base::TraverseCXXBaseSpecifier(X); });
|
|
|
|
}
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
// Stmt is the same, but this form allows the data recursion optimization.
|
|
|
|
bool dataTraverseStmtPre(Stmt *X) {
|
2019-11-14 03:16:23 +08:00
|
|
|
if (!X || isImplicit(X))
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
return false;
|
|
|
|
auto N = DynTypedNode::create(*X);
|
|
|
|
if (canSafelySkipNode(N))
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
return false;
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
push(std::move(N));
|
2019-11-19 23:57:31 +08:00
|
|
|
if (shouldSkipChildren(X)) {
|
|
|
|
pop();
|
|
|
|
return false;
|
|
|
|
}
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
bool dataTraverseStmtPost(Stmt *X) {
|
|
|
|
pop();
|
|
|
|
return true;
|
|
|
|
}
|
2019-07-24 17:39:11 +08:00
|
|
|
// QualifiedTypeLoc is handled strangely in RecursiveASTVisitor: the derived
|
|
|
|
// TraverseTypeLoc is not called for the inner UnqualTypeLoc.
|
|
|
|
// This means we'd never see 'int' in 'const int'! Work around that here.
|
|
|
|
// (The reason for the behavior is to avoid traversing the nested Type twice,
|
|
|
|
// but we ignore TraverseType anyway).
|
|
|
|
bool TraverseQualifiedTypeLoc(QualifiedTypeLoc QX) {
|
|
|
|
return traverseNode<TypeLoc>(
|
|
|
|
&QX, [&] { return TraverseTypeLoc(QX.getUnqualifiedLoc()); });
|
|
|
|
}
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
// Uninteresting parts of the AST that don't have locations within them.
|
|
|
|
bool TraverseNestedNameSpecifier(NestedNameSpecifier *) { return true; }
|
|
|
|
bool TraverseType(QualType) { return true; }
|
|
|
|
|
2019-08-28 20:05:12 +08:00
|
|
|
// The DeclStmt for the loop variable claims to cover the whole range
|
|
|
|
// inside the parens, this causes the range-init expression to not be hit.
|
|
|
|
// Traverse the loop VarDecl instead, which has the right source range.
|
|
|
|
bool TraverseCXXForRangeStmt(CXXForRangeStmt *S) {
|
|
|
|
return traverseNode(S, [&] {
|
|
|
|
return TraverseStmt(S->getInit()) && TraverseDecl(S->getLoopVariable()) &&
|
|
|
|
TraverseStmt(S->getRangeInit()) && TraverseStmt(S->getBody());
|
|
|
|
});
|
|
|
|
}
|
2020-01-14 02:53:52 +08:00
|
|
|
// OpaqueValueExpr blocks traversal, we must explicitly traverse it.
|
|
|
|
bool TraverseOpaqueValueExpr(OpaqueValueExpr *E) {
|
|
|
|
return traverseNode(E, [&] { return TraverseStmt(E->getSourceExpr()); });
|
|
|
|
}
|
|
|
|
// We only want to traverse the *syntactic form* to understand the selection.
|
|
|
|
bool TraversePseudoObjectExpr(PseudoObjectExpr *E) {
|
|
|
|
return traverseNode(E, [&] { return TraverseStmt(E->getSyntacticForm()); });
|
|
|
|
}
|
2019-08-28 20:05:12 +08:00
|
|
|
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
private:
|
|
|
|
using Base = RecursiveASTVisitor<SelectionVisitor>;
|
2019-06-27 19:17:13 +08:00
|
|
|
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
SelectionVisitor(ASTContext &AST, const syntax::TokenBuffer &Tokens,
|
|
|
|
const PrintingPolicy &PP, unsigned SelBegin, unsigned SelEnd,
|
|
|
|
FileID SelFile)
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
: SM(AST.getSourceManager()), LangOpts(AST.getLangOpts()),
|
2019-07-28 01:09:15 +08:00
|
|
|
#ifndef NDEBUG
|
|
|
|
PrintPolicy(PP),
|
|
|
|
#endif
|
2019-12-03 23:59:52 +08:00
|
|
|
TokenBuf(Tokens), SelChecker(Tokens, SelFile, SelBegin, SelEnd, SM),
|
|
|
|
UnclaimedExpandedTokens(Tokens.expandedTokens()) {
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
// Ensure we have a node for the TU decl, regardless of traversal scope.
|
|
|
|
Nodes.emplace_back();
|
|
|
|
Nodes.back().ASTNode = DynTypedNode::create(*AST.getTranslationUnitDecl());
|
|
|
|
Nodes.back().Parent = nullptr;
|
|
|
|
Nodes.back().Selected = SelectionTree::Unselected;
|
|
|
|
Stack.push(&Nodes.back());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Generic case of TraverseFoo. Func should be the call to Base::TraverseFoo.
|
|
|
|
// Node is always a pointer so the generic code can handle any null checks.
|
|
|
|
template <typename T, typename Func>
|
|
|
|
bool traverseNode(T *Node, const Func &Body) {
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
if (Node == nullptr)
|
|
|
|
return true;
|
|
|
|
auto N = DynTypedNode::create(*Node);
|
|
|
|
if (canSafelySkipNode(N))
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
return true;
|
|
|
|
push(DynTypedNode::create(*Node));
|
|
|
|
bool Ret = Body();
|
|
|
|
pop();
|
|
|
|
return Ret;
|
|
|
|
}
|
|
|
|
|
2019-06-27 19:17:13 +08:00
|
|
|
// HIT TESTING
|
|
|
|
//
|
|
|
|
// We do rough hit testing on the way down the tree to avoid traversing
|
|
|
|
// subtrees that don't touch the selection (canSafelySkipNode), but
|
|
|
|
// fine-grained hit-testing is mostly done on the way back up (in pop()).
|
|
|
|
// This means children get to claim parts of the selection first, and parents
|
|
|
|
// are only selected if they own tokens that no child owned.
|
|
|
|
//
|
|
|
|
// Nodes *usually* nest nicely: a child's getSourceRange() lies within the
|
|
|
|
// parent's, and a node (transitively) owns all tokens in its range.
|
|
|
|
//
|
|
|
|
// Exception 1: child range claims tokens that should be owned by the parent.
|
|
|
|
// e.g. in `void foo(int);`, the FunctionTypeLoc should own
|
|
|
|
// `void (int)` but the parent FunctionDecl should own `foo`.
|
|
|
|
// To handle this case, certain nodes claim small token ranges *before*
|
|
|
|
// their children are traversed. (see earlySourceRange).
|
|
|
|
//
|
|
|
|
// Exception 2: siblings both claim the same node.
|
|
|
|
// e.g. `int x, y;` produces two sibling VarDecls.
|
|
|
|
// ~~~~~ x
|
|
|
|
// ~~~~~~~~ y
|
|
|
|
// Here the first ("leftmost") sibling claims the tokens it wants, and the
|
|
|
|
// other sibling gets what's left. So selecting "int" only includes the left
|
|
|
|
// VarDecl in the selection tree.
|
|
|
|
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
// An optimization for a common case: nodes outside macro expansions that
|
|
|
|
// don't intersect the selection may be recursively skipped.
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
bool canSafelySkipNode(const DynTypedNode &N) {
|
|
|
|
SourceRange S = N.getSourceRange();
|
2020-01-13 19:09:30 +08:00
|
|
|
if (auto *TL = N.get<TypeLoc>()) {
|
2020-10-17 02:14:37 +08:00
|
|
|
// FIXME: TypeLoc::getBeginLoc()/getEndLoc() are pretty fragile
|
|
|
|
// heuristics. We should consider only pruning critical TypeLoc nodes, to
|
|
|
|
// be more robust.
|
|
|
|
|
2020-01-13 19:09:30 +08:00
|
|
|
// DeclTypeTypeLoc::getSourceRange() is incomplete, which would lead to
|
|
|
|
// failing
|
|
|
|
// to descend into the child expression.
|
|
|
|
// decltype(2+2);
|
|
|
|
// ~~~~~~~~~~~~~ <-- correct range
|
|
|
|
// ~~~~~~~~ <-- range reported by getSourceRange()
|
|
|
|
// ~~~~~~~~~~~~ <-- range with this hack(i.e, missing closing paren)
|
|
|
|
// FIXME: Alter DecltypeTypeLoc to contain parentheses locations and get
|
|
|
|
// rid of this patch.
|
|
|
|
if (auto DT = TL->getAs<DecltypeTypeLoc>())
|
|
|
|
S.setEnd(DT.getUnderlyingExpr()->getEndLoc());
|
2020-10-17 02:14:37 +08:00
|
|
|
// AttributedTypeLoc may point to the attribute's range, NOT the modified
|
|
|
|
// type's range.
|
|
|
|
if (auto AT = TL->getAs<AttributedTypeLoc>())
|
|
|
|
S = AT.getModifiedLoc().getSourceRange();
|
2020-01-13 19:09:30 +08:00
|
|
|
}
|
2019-12-03 23:59:52 +08:00
|
|
|
if (!SelChecker.mayHit(S)) {
|
|
|
|
dlog("{1}skip: {0}", printNodeToString(N, PrintPolicy), indent());
|
|
|
|
dlog("{1}skipped range = {0}", S.printToString(SM), indent(1));
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
}
|
|
|
|
|
2019-11-19 23:57:31 +08:00
|
|
|
// There are certain nodes we want to treat as leaves in the SelectionTree,
|
|
|
|
// although they do have children.
|
|
|
|
bool shouldSkipChildren(const Stmt *X) const {
|
|
|
|
// UserDefinedLiteral (e.g. 12_i) has two children (12 and _i).
|
|
|
|
// Unfortunately TokenBuffer sees 12_i as one token and can't split it.
|
|
|
|
// So we treat UserDefinedLiteral as a leaf node, owning the token.
|
|
|
|
return llvm::isa<UserDefinedLiteral>(X);
|
|
|
|
}
|
|
|
|
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
// Pushes a node onto the ancestor stack. Pairs with pop().
|
2019-06-27 19:17:13 +08:00
|
|
|
// Performs early hit detection for some nodes (on the earlySourceRange).
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
void push(DynTypedNode Node) {
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
SourceRange Early = earlySourceRange(Node);
|
|
|
|
dlog("{1}push: {0}", printNodeToString(Node, PrintPolicy), indent());
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
Nodes.emplace_back();
|
|
|
|
Nodes.back().ASTNode = std::move(Node);
|
|
|
|
Nodes.back().Parent = Stack.top();
|
2019-12-03 23:59:52 +08:00
|
|
|
Nodes.back().Selected = NoTokens;
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
Stack.push(&Nodes.back());
|
2019-10-02 18:01:53 +08:00
|
|
|
claimRange(Early, Nodes.back().Selected);
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// Pops a node off the ancestor stack, and finalizes it. Pairs with push().
|
2019-06-27 19:17:13 +08:00
|
|
|
// Performs primary hit detection.
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
void pop() {
|
|
|
|
Node &N = *Stack.top();
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
dlog("{1}pop: {0}", printNodeToString(N.ASTNode, PrintPolicy), indent(-1));
|
2019-10-02 18:01:53 +08:00
|
|
|
claimRange(N.ASTNode.getSourceRange(), N.Selected);
|
2019-12-03 23:59:52 +08:00
|
|
|
if (N.Selected == NoTokens)
|
|
|
|
N.Selected = SelectionTree::Unselected;
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
if (N.Selected || !N.Children.empty()) {
|
|
|
|
// Attach to the tree.
|
|
|
|
N.Parent->Children.push_back(&N);
|
|
|
|
} else {
|
|
|
|
// Neither N any children are selected, it doesn't belong in the tree.
|
|
|
|
assert(&N == &Nodes.back());
|
|
|
|
Nodes.pop_back();
|
|
|
|
}
|
|
|
|
Stack.pop();
|
|
|
|
}
|
|
|
|
|
2019-06-27 19:17:13 +08:00
|
|
|
// Returns the range of tokens that this node will claim directly, and
|
|
|
|
// is not available to the node's children.
|
|
|
|
// Usually empty, but sometimes children cover tokens but shouldn't own them.
|
|
|
|
SourceRange earlySourceRange(const DynTypedNode &N) {
|
|
|
|
if (const Decl *D = N.get<Decl>()) {
|
2020-02-25 16:33:52 +08:00
|
|
|
// We want constructor name to be claimed by TypeLoc not the constructor
|
|
|
|
// itself. Similar for deduction guides, we rather want to select the
|
|
|
|
// underlying TypeLoc.
|
|
|
|
// FIXME: Unfortunately this doesn't work, even though RecursiveASTVisitor
|
|
|
|
// traverses the underlying TypeLoc inside DeclarationName, it is null for
|
|
|
|
// constructors.
|
|
|
|
if (isa<CXXConstructorDecl>(D) || isa<CXXDeductionGuideDecl>(D))
|
|
|
|
return SourceRange();
|
|
|
|
// This will capture Field, Function, MSProperty, NonTypeTemplateParm and
|
|
|
|
// VarDecls. We want the name in the declarator to be claimed by the decl
|
|
|
|
// and not by any children. For example:
|
2019-06-27 19:17:13 +08:00
|
|
|
// void [[foo]]();
|
|
|
|
// int (*[[s]])();
|
2020-02-25 16:33:52 +08:00
|
|
|
// struct X { int [[hash]] [32]; [[operator]] int();}
|
|
|
|
if (const auto *DD = llvm::dyn_cast<DeclaratorDecl>(D))
|
|
|
|
return DD->getLocation();
|
2019-12-24 02:38:04 +08:00
|
|
|
} else if (const auto *CCI = N.get<CXXCtorInitializer>()) {
|
2019-11-15 23:07:34 +08:00
|
|
|
// : [[b_]](42)
|
|
|
|
return CCI->getMemberLocation();
|
2019-06-27 19:17:13 +08:00
|
|
|
}
|
|
|
|
return SourceRange();
|
|
|
|
}
|
|
|
|
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
// Perform hit-testing of a complete Node against the selection.
|
|
|
|
// This runs for every node in the AST, and must be fast in common cases.
|
2019-06-27 19:17:13 +08:00
|
|
|
// This is usually called from pop(), so we can take children into account.
|
2019-10-02 18:01:53 +08:00
|
|
|
// The existing state of Result is relevant (early/late claims can interact).
|
|
|
|
void claimRange(SourceRange S, SelectionTree::Selection &Result) {
|
2019-12-03 23:59:52 +08:00
|
|
|
for (const auto &ClaimedRange :
|
|
|
|
UnclaimedExpandedTokens.erase(TokenBuf.expandedTokens(S)))
|
|
|
|
update(Result, SelChecker.test(ClaimedRange));
|
|
|
|
|
|
|
|
if (Result && Result != NoTokens)
|
|
|
|
dlog("{1}hit selection: {0}", S.printToString(SM), indent());
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
}
|
|
|
|
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
std::string indent(int Offset = 0) {
|
|
|
|
// Cast for signed arithmetic.
|
|
|
|
int Amount = int(Stack.size()) + Offset;
|
|
|
|
assert(Amount >= 0);
|
|
|
|
return std::string(Amount, ' ');
|
|
|
|
}
|
|
|
|
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
SourceManager &SM;
|
|
|
|
const LangOptions &LangOpts;
|
2019-07-28 01:09:15 +08:00
|
|
|
#ifndef NDEBUG
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
const PrintingPolicy &PrintPolicy;
|
2019-07-28 01:09:15 +08:00
|
|
|
#endif
|
2019-12-03 23:59:52 +08:00
|
|
|
const syntax::TokenBuffer &TokenBuf;
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
std::stack<Node *> Stack;
|
2019-12-03 23:59:52 +08:00
|
|
|
SelectionTester SelChecker;
|
|
|
|
IntervalSet<syntax::Token> UnclaimedExpandedTokens;
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
std::deque<Node> Nodes; // Stable pointers as we add more nodes.
|
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
2020-05-19 07:30:23 +08:00
|
|
|
llvm::SmallString<256> abbreviatedString(DynTypedNode N,
|
|
|
|
const PrintingPolicy &PP) {
|
|
|
|
llvm::SmallString<256> Result;
|
|
|
|
{
|
|
|
|
llvm::raw_svector_ostream OS(Result);
|
|
|
|
N.print(OS, PP);
|
|
|
|
}
|
|
|
|
auto Pos = Result.find('\n');
|
|
|
|
if (Pos != llvm::StringRef::npos) {
|
|
|
|
bool MoreText =
|
|
|
|
!llvm::all_of(llvm::StringRef(Result).drop_front(Pos), llvm::isSpace);
|
|
|
|
Result.resize(Pos);
|
|
|
|
if (MoreText)
|
|
|
|
Result.append(" …");
|
|
|
|
}
|
|
|
|
return Result;
|
|
|
|
}
|
|
|
|
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
void SelectionTree::print(llvm::raw_ostream &OS, const SelectionTree::Node &N,
|
|
|
|
int Indent) const {
|
|
|
|
if (N.Selected)
|
|
|
|
OS.indent(Indent - 1) << (N.Selected == SelectionTree::Complete ? '*'
|
|
|
|
: '.');
|
|
|
|
else
|
|
|
|
OS.indent(Indent);
|
2019-07-24 17:39:11 +08:00
|
|
|
printNodeKind(OS, N.ASTNode);
|
2020-05-19 07:30:23 +08:00
|
|
|
OS << ' ' << abbreviatedString(N.ASTNode, PrintPolicy) << "\n";
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
for (const Node *Child : N.Children)
|
|
|
|
print(OS, *Child, Indent + 2);
|
|
|
|
}
|
|
|
|
|
2019-07-24 17:39:11 +08:00
|
|
|
std::string SelectionTree::Node::kind() const {
|
|
|
|
std::string S;
|
|
|
|
llvm::raw_string_ostream OS(S);
|
|
|
|
printNodeKind(OS, ASTNode);
|
|
|
|
return std::move(OS.str());
|
|
|
|
}
|
|
|
|
|
2020-02-24 03:03:00 +08:00
|
|
|
// Decide which selections emulate a "point" query in between characters.
|
|
|
|
// If it's ambiguous (the neighboring characters are selectable tokens), returns
|
|
|
|
// both possibilities in preference order.
|
|
|
|
// Always returns at least one range - if no tokens touched, and empty range.
|
|
|
|
static llvm::SmallVector<std::pair<unsigned, unsigned>, 2>
|
|
|
|
pointBounds(unsigned Offset, const syntax::TokenBuffer &Tokens) {
|
|
|
|
const auto &SM = Tokens.sourceManager();
|
|
|
|
SourceLocation Loc = SM.getComposedLoc(SM.getMainFileID(), Offset);
|
|
|
|
llvm::SmallVector<std::pair<unsigned, unsigned>, 2> Result;
|
|
|
|
// Prefer right token over left.
|
|
|
|
for (const syntax::Token &Tok :
|
|
|
|
llvm::reverse(spelledTokensTouching(Loc, Tokens))) {
|
|
|
|
if (shouldIgnore(Tok))
|
|
|
|
continue;
|
|
|
|
unsigned Offset = Tokens.sourceManager().getFileOffset(Tok.location());
|
|
|
|
Result.emplace_back(Offset, Offset + Tok.length());
|
|
|
|
}
|
|
|
|
if (Result.empty())
|
|
|
|
Result.emplace_back(Offset, Offset);
|
|
|
|
return Result;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SelectionTree::createEach(ASTContext &AST,
|
|
|
|
const syntax::TokenBuffer &Tokens,
|
|
|
|
unsigned Begin, unsigned End,
|
|
|
|
llvm::function_ref<bool(SelectionTree)> Func) {
|
|
|
|
if (Begin != End)
|
|
|
|
return Func(SelectionTree(AST, Tokens, Begin, End));
|
|
|
|
for (std::pair<unsigned, unsigned> Bounds : pointBounds(Begin, Tokens))
|
|
|
|
if (Func(SelectionTree(AST, Tokens, Bounds.first, Bounds.second)))
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
SelectionTree SelectionTree::createRight(ASTContext &AST,
|
|
|
|
const syntax::TokenBuffer &Tokens,
|
|
|
|
unsigned int Begin, unsigned int End) {
|
|
|
|
llvm::Optional<SelectionTree> Result;
|
|
|
|
createEach(AST, Tokens, Begin, End, [&](SelectionTree T) {
|
|
|
|
Result = std::move(T);
|
|
|
|
return true;
|
|
|
|
});
|
|
|
|
return std::move(*Result);
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
}
|
|
|
|
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
SelectionTree::SelectionTree(ASTContext &AST, const syntax::TokenBuffer &Tokens,
|
|
|
|
unsigned Begin, unsigned End)
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
: PrintPolicy(AST.getLangOpts()) {
|
|
|
|
// No fundamental reason the selection needs to be in the main file,
|
|
|
|
// but that's all clangd has needed so far.
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
const SourceManager &SM = AST.getSourceManager();
|
|
|
|
FileID FID = SM.getMainFileID();
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
PrintPolicy.TerseOutput = true;
|
2019-06-24 21:01:28 +08:00
|
|
|
PrintPolicy.IncludeNewlines = false;
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
dlog("Computing selection for {0}",
|
|
|
|
SourceRange(SM.getComposedLoc(FID, Begin), SM.getComposedLoc(FID, End))
|
|
|
|
.printToString(SM));
|
[clangd] Ignore semicolons, whitespace, and comments in SelectionTree.
Summary:
Whitespace and comments are a clear bugfix: selecting some
comments/space near a statement doesn't mean you're selecting the
surrounding block.
Semicolons are less obvious, but for similar reasons: these tokens
aren't actually claimed by any AST node (usually), so an AST-based model
like SelectionTree shouldn't take them into account.
Callers may still sometimes care about semis of course:
- when the selection is an expr with a non-expr parent, selection of
the semicolon indicates intent to select the statement.
- when a statement with a trailing semi is selected, we need to know
its range to ensure it can be removed.
SelectionTree may or may not play a role here, but these are separate questions
from its core function of describing which AST nodes were selected.
The mechanism here is the TokenBuffer from syntax-trees. We use it in a
fairly low-level way (just to get boundaries of raw spelled tokens). The
actual mapping of AST nodes to coordinates continues to use the (fairly
mature) SourceLocation based logic. TokenBuffer/Syntax trees
don't currently offer an alternative to getFileRange(), I think.
Reviewers: SureYeaah, kadircet
Subscribers: MaskRay, jkorous, arphaman, cfe-commits, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65486
llvm-svn: 367453
2019-08-01 01:52:40 +08:00
|
|
|
Nodes = SelectionVisitor::collect(AST, Tokens, PrintPolicy, Begin, End, FID);
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
Root = Nodes.empty() ? nullptr : &Nodes.front();
|
2020-12-07 17:52:04 +08:00
|
|
|
recordMetrics(*this, AST.getLangOpts());
|
[clangd] Add dlog()s for SelectionTree, enabling -debug-only=SelectionTree.cpp
Summary:
SelectionTree is a RecursiveASTVisitor which processes getSourceRange() for
every node. This is a lot of surface area with the AST, as getSourceRange()
is specialized for *many* node types.
And the resulting SelectionTree depends on the source ranges of many
visited nodes, and the order of traversal.
Put together, this means we really need a traversal log to debug when we
get an unexpected SelectionTree. I've built this ad-hoc a few times, now
it's time to check it in.
Example output:
```
D[14:07:44.184] Computing selection for </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] push: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:12, col:13>
D[14:07:44.184] push: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] pop: NestedNameSpecifierLoc (empty NestedNameSpecifierLoc)
D[14:07:44.184] push: QualifiedTypeLoc const auto
D[14:07:44.184] pop: QualifiedTypeLoc const auto
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:7, col:11>
D[14:07:44.184] hit selection: </usr/local/google/home/sammccall/test.cc:1:7, col:8>
D[14:07:44.184] skip: IntegerLiteral 42
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:1:16>
D[14:07:44.184] pop: VarDecl const auto x = 42
D[14:07:44.184] claimRange: </usr/local/google/home/sammccall/test.cc:1:1, col:18>
D[14:07:44.184] skip: VarDecl int y = 43
D[14:07:44.184] skipped range = </usr/local/google/home/sammccall/test.cc:2:1, col:9>
D[14:07:44.184] Built selection tree
TranslationUnitDecl
VarDecl const auto x = 42
.QualifiedTypeLoc const auto
```
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D65073
llvm-svn: 366698
2019-07-22 23:55:53 +08:00
|
|
|
dlog("Built selection tree\n{0}", *this);
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
const Node *SelectionTree::commonAncestor() const {
|
2019-07-11 20:29:01 +08:00
|
|
|
const Node *Ancestor = Root;
|
|
|
|
while (Ancestor->Children.size() == 1 && !Ancestor->Selected)
|
|
|
|
Ancestor = Ancestor->Children.front();
|
[clangd] SelectionTree treats TranslationUnitDecl (mostly) consistently with other containers.
Summary:
Previously TranslationUnitDecl would never be selected.
This means root() is never null, and returns a reference.
commonAncestor() is in principle never null also, but returning TUDecl
here requires tweaks to be careful not to traverse it (this was already
possible when selecting multiple top-level decls, and there are associated bugs!)
Instead, never allow commonAncestor() to return TUDecl, return null instead.
Reviewers: hokein
Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D65101
llvm-svn: 366893
2019-07-24 20:14:56 +08:00
|
|
|
// Returning nullptr here is a bit unprincipled, but it makes the API safer:
|
|
|
|
// the TranslationUnitDecl contains all of the preamble, so traversing it is a
|
|
|
|
// performance cliff. Callers can check for null and use root() if they want.
|
|
|
|
return Ancestor != Root ? Ancestor : nullptr;
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
}
|
|
|
|
|
2019-12-24 02:38:04 +08:00
|
|
|
const DeclContext &SelectionTree::Node::getDeclContext() const {
|
|
|
|
for (const Node *CurrentNode = this; CurrentNode != nullptr;
|
2019-07-12 00:04:18 +08:00
|
|
|
CurrentNode = CurrentNode->Parent) {
|
2019-12-24 02:38:04 +08:00
|
|
|
if (const Decl *Current = CurrentNode->ASTNode.get<Decl>()) {
|
2019-07-12 00:04:18 +08:00
|
|
|
if (CurrentNode != this)
|
|
|
|
if (auto *DC = dyn_cast<DeclContext>(Current))
|
|
|
|
return *DC;
|
|
|
|
return *Current->getDeclContext();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
llvm_unreachable("A tree must always be rooted at TranslationUnitDecl.");
|
|
|
|
}
|
|
|
|
|
2019-07-26 23:29:52 +08:00
|
|
|
const SelectionTree::Node &SelectionTree::Node::ignoreImplicit() const {
|
|
|
|
if (Children.size() == 1 &&
|
|
|
|
Children.front()->ASTNode.getSourceRange() == ASTNode.getSourceRange())
|
|
|
|
return Children.front()->ignoreImplicit();
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2019-08-10 07:40:54 +08:00
|
|
|
const SelectionTree::Node &SelectionTree::Node::outerImplicit() const {
|
|
|
|
if (Parent && Parent->ASTNode.getSourceRange() == ASTNode.getSourceRange())
|
|
|
|
return Parent->outerImplicit();
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
[clangd] Lib to compute and represent selection under cursor.
Summary:
The primary problem this solves is to expose the codeAction selection to
AST-based refactorings in a way that makes it easy and efficient for them to
bind to the right parts of the AST.
It should also allow us to make XRefs based features (textDocument/definition)
more robust, more easily implement textDocument/typeDefinition etc.
As an example, template parameter references can be identified without special
handling.
There should be slight speedup too: we can prune most of the AST traversal
in most cases.
Elephant in the room: this is similar-but-different to Tooling/Refactoring/ASTSelection.
That captures a smaller set of AST nodes, has a slightly different way of
representing selections, and generally has mare features and does more work.
The overall shape is pretty similar, and yet I can't quite get to behave as I
expect.
Reviewers: ilya-biryukov, kadircet
Subscribers: mgorny, ioeric, MaskRay, jkorous, mgrang, arphaman
Tags: #clang
Differential Revision: https://reviews.llvm.org/D57562
llvm-svn: 352874
2019-02-01 23:05:11 +08:00
|
|
|
} // namespace clangd
|
|
|
|
} // namespace clang
|