0dddcf78b8
This required a couple of yaks to be shaved:
1. MatchingOpeningBlockLineIndex was misused to also store the
closing index; instead, use a second variable, as this doesn't
work correctly for "} else {".
2. We needed to change the API of AffectedRangeManager to not
use iterators; we always passed in begin / end for the whole
container before, so there was no mismatch in generality.
3. We need an extra check to discontinue formatting at the top
level, as we now sometimes change the indent of the closing
brace, but want to bail out immediately afterwards, for
example:
void f() {
if (a) {
}
void g();
Previously:
void f() {
if (a) {
}
void g();
Now:
void f() {
if (a) {
}
void g();
Differential Revision: https://reviews.llvm.org/D45726
llvm-svn: 330573
67 lines
2.4 KiB
C++
67 lines
2.4 KiB
C++
//===--- AffectedRangeManager.h - Format C++ code ---------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
///
|
|
/// \file
|
|
/// \brief AffectedRangeManager class manages affected ranges in the code.
|
|
///
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLVM_CLANG_LIB_FORMAT_AFFECTEDRANGEMANAGER_H
|
|
#define LLVM_CLANG_LIB_FORMAT_AFFECTEDRANGEMANAGER_H
|
|
|
|
#include "clang/Basic/SourceManager.h"
|
|
|
|
namespace clang {
|
|
namespace format {
|
|
|
|
struct FormatToken;
|
|
class AnnotatedLine;
|
|
|
|
class AffectedRangeManager {
|
|
public:
|
|
AffectedRangeManager(const SourceManager &SourceMgr,
|
|
const ArrayRef<CharSourceRange> Ranges)
|
|
: SourceMgr(SourceMgr), Ranges(Ranges.begin(), Ranges.end()) {}
|
|
|
|
// Determines which lines are affected by the SourceRanges given as input.
|
|
// Returns \c true if at least one line in \p Lines or one of their
|
|
// children is affected.
|
|
bool computeAffectedLines(SmallVectorImpl<AnnotatedLine *> &Lines);
|
|
|
|
// Returns true if 'Range' intersects with one of the input ranges.
|
|
bool affectsCharSourceRange(const CharSourceRange &Range);
|
|
|
|
private:
|
|
// Returns true if the range from 'First' to 'Last' intersects with one of the
|
|
// input ranges.
|
|
bool affectsTokenRange(const FormatToken &First, const FormatToken &Last,
|
|
bool IncludeLeadingNewlines);
|
|
|
|
// Returns true if one of the input ranges intersect the leading empty lines
|
|
// before 'Tok'.
|
|
bool affectsLeadingEmptyLines(const FormatToken &Tok);
|
|
|
|
// Marks all lines between I and E as well as all their children as affected.
|
|
void markAllAsAffected(SmallVectorImpl<AnnotatedLine *>::iterator I,
|
|
SmallVectorImpl<AnnotatedLine *>::iterator E);
|
|
|
|
// Determines whether 'Line' is affected by the SourceRanges given as input.
|
|
// Returns \c true if line or one if its children is affected.
|
|
bool nonPPLineAffected(AnnotatedLine *Line, const AnnotatedLine *PreviousLine,
|
|
SmallVectorImpl<AnnotatedLine *> &Lines);
|
|
|
|
const SourceManager &SourceMgr;
|
|
const SmallVector<CharSourceRange, 8> Ranges;
|
|
};
|
|
|
|
} // namespace format
|
|
} // namespace clang
|
|
|
|
#endif // LLVM_CLANG_LIB_FORMAT_AFFECTEDRANGEMANAGER_H
|