Merge pull request #322 from Mr-Auto/formatting

Formatting
spelunky-fyi · Sep 8, 2023 · 6a4b9b5 · 6a4b9b5
2 parents 676f8d6 + 5dba188
commit 6a4b9b5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.clang-format b/.clang-format
@@ -14,3 +14,4 @@ AllowShortFunctionsOnASingleLine: None
 PointerAlignment: Left
 RequiresClausePosition: OwnLine
 IndentRequiresClause: false
+InsertNewlineAtEOF: true
diff --git a/.github/workflows/clang_format_verify.yml b/.github/workflows/clang_format_verify.yml
@@ -17,21 +17,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: DoozyX/clang-format-lint-action@v0.15
+      - uses: DoozyX/clang-format-lint-action@v0.16.2
         if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.do_formatting != 'true' }}
         with:
           source: "src"
           extensions: "inl,h,hpp,cpp"
           exclude: "./src/game_api/lua_libs"
-          clangFormatVersion: 15
+          clangFormatVersion: 16
 
-      - uses: DoozyX/clang-format-lint-action@v0.15
+      - uses: DoozyX/clang-format-lint-action@v0.16.2
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.do_formatting == 'true' }}
         with:
           source: "src"
           extensions: "inl,h,hpp,cpp"
           exclude: "./src/game_api/lua_libs"
-          clangFormatVersion: 15
+          clangFormatVersion: 16
           inplace: true
       - uses: EndBug/add-and-commit@v4
         if: ${{ success() && github.event_name == 'workflow_dispatch' && github.event.inputs.do_formatting == 'true' }}

diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,4 @@ out
 docs/slate
 docs/.db
 *.pyc
-
+/CMakeSettings.json
diff --git a/src/injector/injector.h b/src/injector/injector.h
@@ -26,4 +26,4 @@ struct Process
 void inject_dll(const Process& proc, const std::string& name);
 LPTHREAD_START_ROUTINE find_function(const Process& proc, const std::string& library, const std::string& function);
 void call(const Process& proc, LPTHREAD_START_ROUTINE addr, LPVOID args);
-std::optional<Process> find_process(std::string name);
+std::optional<Process> find_process(std::string name);