Add clang format to action (#73)

fcitx · May 20, 2024 · 1118bfd · 1118bfd
1 parent 46797cd
commit 1118bfd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -1,16 +1,26 @@
 name: CI
-
 on:
   push:
     branches:
       - master
   pull_request:
     branches:
       - master
-
 jobs:
+  clang-format:
+    name: Check clang-format
+    runs-on: ubuntu-latest
+    container: archlinux:latest
+    steps:
+      - name: Install dependencies
+        run: |
+          pacman -Syu --noconfirm git clang diffutils
+          git config --global --add safe.directory $GITHUB_WORKSPACE
+      - uses: actions/checkout@v4
+      - uses: fcitx/github-actions@clang-format
   check:
     name: Build and test
+    needs: clang-format
     runs-on: ubuntu-latest
     container: archlinux:latest
     strategy:
@@ -37,20 +47,15 @@ jobs:
         uses: actions/cache@v4
         with:
           path: 'fcitx5/**/*.tar.*'
-          key: ${{ runner.os }}-${{ hashFiles('fcitx5/src/modules/spell/CMakeLists.txt') }}
+          key: ${{ runner.os }}-${{ hashFiles('fcitx5/src/modules/spell/CMakeLists.txt')
+            }}
       - name: Build and Install fcitx5
         uses: fcitx/github-actions@cmake
         with:
           path: fcitx5
           cmake-option: >-
-            -DENABLE_KEYBOARD=Off
-            -DENABLE_X11=Off
-            -DENABLE_WAYLAND=Off
-            -DENABLE_ENCHANT=Off
-            -DENABLE_DBUS=Off
-            -DENABLE_SERVER=Off
-            -DENABLE_EMOJI=Off
-            -DUSE_SYSTEMD=Off
+            -DENABLE_KEYBOARD=Off -DENABLE_X11=Off -DENABLE_WAYLAND=Off -DENABLE_ENCHANT=Off
+            -DENABLE_DBUS=Off -DENABLE_SERVER=Off -DENABLE_EMOJI=Off -DUSE_SYSTEMD=Off
       - uses: actions/checkout@v4
         with:
           path: libime

diff --git a/src/libime/pinyin/pinyinencoder.cpp b/src/libime/pinyin/pinyinencoder.cpp
@@ -226,7 +226,8 @@ PinyinEncoder::parseUserPinyin(std::string userPinyin,
                      str.back() == 'o' || str.back() == 'r' ||
                      str.back() == 'h' ||
                      fuzzyFlags.test(PinyinFuzzyFlag::Correction)) &&
-                    hasMatchInMap(pinyinMap, str.substr(0, str.size() - 1), fuzzyFlags)) {
+                    hasMatchInMap(pinyinMap, str.substr(0, str.size() - 1),
+                                  fuzzyFlags)) {
                     // str[0:-1] is also a full pinyin, check next pinyin
                     auto nextMatch = longestMatch(iter + str.size(), end,
                                                   fuzzyFlags, pinyinMap);