mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-27 04:06:07 +00:00
5e5efd8a91
- Fixes https://github.com/llvm/llvm-project/issues/53227 that wrongly indents multiline comments - Fixes wrong detection of single-line opening braces when used along with those only opening scopes, causing crashes due to duplicated replacements on the same token: void foo() { { int x; } } - Fixes wrong recognition of first line of definition when the line starts with block comment, causing crashes due to duplicated replacements on the same token for this leads toward skipping the line starting with inline block comment: /* Some descriptions about function */ /*inline*/ void bar() { } - Fixes wrong recognition of enum when used as a type name rather than starting definition block, causing crashes due to duplicated replacements on the same token since both actions for enum and for definition blocks were taken place: void foobar(const enum EnumType e) { } - Change to use function keyword for JavaScript instead of comparing strings - Resolves formatting conflict with options EmptyLineAfterAccessModifier and EmptyLineBeforeAccessModifier (prompts with --dry-run (-n) or --output-replacement-xml but no observable change) - Recognize long (len>=5) uppercased name taking a single line as return type and fix the problem of adding newline below it, with adding new token type FunctionLikeOrFreestandingMacro and marking tokens in UnwrappedLineParser: void afunc(int x) { return; } TYPENAME func(int x, int y) { // ... } - Remove redundant and repeated initialization - Do no change to newlines before EOF Reviewed By: MyDeveloperDay, curdeius, HazardyKnusperkeks Differential Revision: https://reviews.llvm.org/D117520
42 lines
1.4 KiB
C++
42 lines
1.4 KiB
C++
//===--- DefinitionBlockSeparator.h -----------------------------*- C++ -*-===//
|
|
//
|
|
// 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
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
///
|
|
/// \file
|
|
/// This file declares DefinitionBlockSeparator, a TokenAnalyzer that inserts or
|
|
/// removes empty lines separating definition blocks like classes, structs,
|
|
/// functions, enums, and namespaces in between.
|
|
///
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLVM_CLANG_LIB_FORMAT_DEFINITIONBLOCKSEPARATOR_H
|
|
#define LLVM_CLANG_LIB_FORMAT_DEFINITIONBLOCKSEPARATOR_H
|
|
|
|
#include "TokenAnalyzer.h"
|
|
#include "WhitespaceManager.h"
|
|
|
|
namespace clang {
|
|
namespace format {
|
|
class DefinitionBlockSeparator : public TokenAnalyzer {
|
|
public:
|
|
DefinitionBlockSeparator(const Environment &Env, const FormatStyle &Style)
|
|
: TokenAnalyzer(Env, Style) {}
|
|
|
|
std::pair<tooling::Replacements, unsigned>
|
|
analyze(TokenAnnotator &Annotator,
|
|
SmallVectorImpl<AnnotatedLine *> &AnnotatedLines,
|
|
FormatTokenLexer &Tokens) override;
|
|
|
|
private:
|
|
void separateBlocks(SmallVectorImpl<AnnotatedLine *> &Lines,
|
|
tooling::Replacements &Result, FormatTokenLexer &Tokens);
|
|
};
|
|
} // namespace format
|
|
} // namespace clang
|
|
|
|
#endif
|