From 58104dc36479960f58f972e3eea38d947c061a89 Mon Sep 17 00:00:00 2001
From: Jon Meow <46229924+jonmeow@users.noreply.github.com>
Date: Tue, 8 Feb 2022 17:42:12 -0800
Subject: [PATCH] Switch clang-format pre-commit to get 13.0.0 (#1066)

Also enable gh action, I'm expecting that to work now.
---
 .github/workflows/pre-commit.yaml | 3 +--
 .pre-commit-config.yaml           | 6 ++++--
 toolchain/parser/parser_impl.cpp  | 7 +++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
index 533b9167d0d9..c866dc32eac2 100644
--- a/.github/workflows/pre-commit.yaml
+++ b/.github/workflows/pre-commit.yaml
@@ -18,5 +18,4 @@ jobs:
       - uses: pre-commit/action@v2.0.2
         env:
           # bazel-buildifier relies on a locally installed copy.
-          # clang-format-whole-file has races in cache creation.
-          SKIP: bazel-buildifier,clang-format-whole-file
+          SKIP: bazel-buildifier
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fddca2d76a5e..f6b03b0453fd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -60,8 +60,10 @@ repos:
     rev: fb5e481f35f5a9b32a06ccfc28b8d6dda4525f75
     hooks:
       - id: bazel-buildifier
-      - id: clang-format-whole-file
-        types: [c++]
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: 1fc50313b6e8c2580c4736af57575e0b7de1501c # frozen: v13.0.0
+    hooks:
+      - id: clang-format
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: ea782651a7e32f40a3d13b76c79d5a2474ee8723 # frozen: v2.5.1
     hooks:
diff --git a/toolchain/parser/parser_impl.cpp b/toolchain/parser/parser_impl.cpp
index 05d6c0932b62..24d8f0eebaa5 100644
--- a/toolchain/parser/parser_impl.cpp
+++ b/toolchain/parser/parser_impl.cpp
@@ -804,10 +804,9 @@ auto ParseTree::Parser::ParseBraceExpression() -> llvm::Optional<Node> {
         }
 
         // Work out the kind of this element
-        Kind elem_kind =
-            (NextTokenIs(TokenKind::Equal())
-                 ? Value
-                 : NextTokenIs(TokenKind::Colon()) ? Type : Unknown);
+        Kind elem_kind = (NextTokenIs(TokenKind::Equal())   ? Value
+                          : NextTokenIs(TokenKind::Colon()) ? Type
+                                                            : Unknown);
         if (elem_kind == Unknown || (kind != Unknown && elem_kind != kind)) {
           return diagnose_invalid_syntax();
         }