From c75c0d85c83bdb730311c6ba6640f99e11ea0a14 Mon Sep 17 00:00:00 2001 From: ICYPhoenix7 <90792373+ICYPhoenix7@users.noreply.github.com> Date: Sat, 13 Jul 2024 04:24:59 -0700 Subject: [PATCH] Improve compatibility with Jetbrains IDEs (#3337) --- .gitignore | 4 ++++ CONTRIBUTING.md | 10 +++++----- src/invoker/invoker.hpp | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index de8c3647..826475e0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,10 @@ .vscode/* !.vscode/launch.json .cache/ +.idea/* +cmake-build-debug-visual-studio/* +cmake-build-release-visual-studio/* +cmake-build-relwithdebinfo-visual-studio/* # output directory build/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cf351035..b349a4cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,13 +11,13 @@ Types: - refactor: Refactoring a specific section of the codebase - test: Everything related to testing - docs: Everything related to documentation -- chore: Regular code maintanance +- chore: Regular code maintenance -A scope is a phrase descibing parts of the code affected by the changes. For example "(userservice)" +A scope is a phrase describing parts of the code affected by the changes. For example "(userservice)" Body (optional) can provide additional contextual information. For breaking changes the body MUST start with "BREAKING CHANGE". -Footer (optional) is used to reference issues effected bt the code changes. For example "Fixes #13". Can also be used to indicate breaking changes by starting with "BREAKING CHANGE". +Footer (optional) is used to reference issues affected by the code changes. For example "Fixes #13". Can also be used to indicate breaking changes by starting with "BREAKING CHANGE". #### Structure @@ -145,7 +145,7 @@ else value = 2 } ``` -Instead we prefer this: +Instead, we prefer this: ```c++ int value{2}; if(true) @@ -205,7 +205,7 @@ void method() ### **Member variables in classes** -1. Seperate every variable to a single line +1. Separate every variable to a single line 2. Initialize all member variables 3. Use the same order of initialization as in the header file 4. Order data types from big to low diff --git a/src/invoker/invoker.hpp b/src/invoker/invoker.hpp index 04f71ed9..16ccaaf1 100644 --- a/src/invoker/invoker.hpp +++ b/src/invoker/invoker.hpp @@ -37,7 +37,7 @@ namespace big constexpr void end_call() { // TODO: try to get rid of this - [[assume((cache_handlers(), m_are_handlers_cached == true))]]; + [[assume((cache_handlers(), m_are_handlers_cached == true))]] if (!m_are_handlers_cached) [[unlikely]] cache_handlers(); @@ -65,7 +65,7 @@ namespace big static rage::scrNativeHandler* get_handlers() { - [[assume((cache_handlers(), m_are_handlers_cached == true))]]; + [[assume((cache_handlers(), m_are_handlers_cached == true))]] if (!m_are_handlers_cached) [[unlikely]] cache_handlers();