[clang] 7b5bddf - [clang] Partially revert "Disable a few formatting options for test/"

[Bruno Ricci via cfe-commits]

Author: Bruno Ricci
Date: 2020-07-21T14:53:37+01:00
New Revision: 7b5bddfd034ef42c92c67731743399df844d5f43

URL: https://github.com/llvm/llvm-project/commit/7b5bddfd034ef42c92c67731743399df844d5f43
DIFF: https://github.com/llvm/llvm-project/commit/7b5bddfd034ef42c92c67731743399df844d5f43.diff

LOG: [clang] Partially revert "Disable a few formatting options for test/"

The changes to "AlignTrailingComments" and "CommentPragmas" did not
result in what I expected (just leave the special comments alone).

Instead now the following:
  void test() {
    int i; // expected-error
           // expected-warning
  }

is formatted into:
  void test() {
    int i; // expected-error
    // expected-warning
  }

which is even worse.

Added: 
    

Modified: 
    clang/test/.clang-format

Removed: 
    


################################################################################
diff  --git a/clang/test/.clang-format b/clang/test/.clang-format
index a6176c2e0013..f7fb083d1055 100644
--- a/clang/test/.clang-format
+++ b/clang/test/.clang-format
@@ -1,5 +1,3 @@
 BasedOnStyle: LLVM
 ColumnLimit: 0
-AlignTrailingComments: false
-CommentPragmas: "(^ ?CHECK|^ ?expected-)"
 AlwaysBreakTemplateDeclarations: No