Skip to content

[clangd] Implement simple folding for preprocessor branches #140959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 28, 2025
Merged

[clangd] Implement simple folding for preprocessor branches #140959

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f6abf49
[clangd] Implement simple folding of preprocessor branches
144026 Jan 17, 2025
6ddc053
Add unit test for preprocessor directive folding
aketchum15 May 21, 2025
265f452
Update to test nested pp regions in inactive regions and incomplete p…
aketchum15 Aug 6, 2025
34d8cdf
Fix creating invalid rangs for incomplete PP regions
aketchum15 Aug 6, 2025
9aa17b4
formatting changes and updating FIXME comment
aketchum15 Aug 6, 2025
0b63c7d
remove scratchpad code
aketchum15 Aug 6, 2025
7b48b5d
formatting
aketchum15 Aug 6, 2025
d797b08
structured bindings and fixme comment
aketchum15 Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions clang-tools-extra/clangd/SemanticSelection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,8 @@ llvm::Expected<std::vector<FoldingRange>> getFoldingRanges(ParsedAST &AST) {
return collectFoldingRanges(SyntaxTree, TM);
}

// FIXME( usaxena95): Collect PP conditional regions, includes and other code
// regions (e.g. public/private/protected sections of classes, control flow
// statement bodies).
// FIXME( usaxena95): Collect includes and other code regions (e.g.
// public/private/protected sections of classes, control flow statement bodies).
// Related issue: https://github.com/clangd/clangd/issues/310
llvm::Expected<std::vector<FoldingRange>>
getFoldingRanges(const std::string &Code, bool LineFoldingOnly) {
Expand All @@ -186,12 +185,6 @@ getFoldingRanges(const std::string &Code, bool LineFoldingOnly) {
auto DirectiveStructure = DirectiveTree::parse(OrigStream);
chooseConditionalBranches(DirectiveStructure, OrigStream);

// FIXME: Provide ranges in the disabled-PP regions as well.
auto Preprocessed = DirectiveStructure.stripDirectives(OrigStream);

auto ParseableStream = cook(Preprocessed, genericLangOpts());
pairBrackets(ParseableStream);

std::vector<FoldingRange> Result;
auto AddFoldingRange = [&](Position Start, Position End,
llvm::StringLiteral Kind) {
Expand Down Expand Up @@ -238,7 +231,13 @@ getFoldingRanges(const std::string &Code, bool LineFoldingOnly) {
AddFoldingRange(Start, End, FoldingRange::REGION_KIND);
}

auto Preprocessed = DirectiveStructure.stripDirectives(OrigStream);

auto ParseableStream = cook(Preprocessed, genericLangOpts());
pairBrackets(ParseableStream);

auto Tokens = ParseableStream.tokens();

// Brackets.
for (const auto &Tok : Tokens) {
if (auto *Paired = Tok.pair()) {
Expand All @@ -258,6 +257,7 @@ getFoldingRanges(const std::string &Code, bool LineFoldingOnly) {
return OriginalToken(T).Length >= 2 &&
Code.substr(StartOffset(T), 2) == "/*";
};

// Multi-line comments.
for (auto *T = Tokens.begin(); T != Tokens.end();) {
if (T->Kind != tok::comment) {
Expand Down