summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivian Nowka-Keane <vnowkakeane@linux.microsoft.com>2023-08-16 14:15:17 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-10-27 00:50:49 +0000
commit41c622523de353a136fac4ecd3335b05e35fd411 (patch)
tree2a72acd66cd23e481502d6d4abcc2ab989911cdb
parentd0cac9f63f8a1929356f2e707dd3f577995f1a50 (diff)
downloadedk2-41c622523de353a136fac4ecd3335b05e35fd411.tar.gz
edk2-41c622523de353a136fac4ecd3335b05e35fd411.tar.bz2
edk2-41c622523de353a136fac4ecd3335b05e35fd411.zip
.pytool: Add cpp support to uncrustify plugin
Modified the uncrustify config to apply cpp specific formatting rules. Modified uncrustify check to include *.cpp files. Cc: Sean Brogan <sean.brogan@microsoft.com> Cc: Michael Kubacki <mikuback@linux.microsoft.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Signed-off-by: Vivian Nowka-Keane <vnowkakeane@linux.microsoft.com> Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
-rw-r--r--.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py2
-rw-r--r--.pytool/Plugin/UncrustifyCheck/uncrustify.cfg4
2 files changed, 3 insertions, 3 deletions
diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
index 8978ffc443..17f77b48d9 100644
--- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
+++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
@@ -110,7 +110,7 @@ class UncrustifyCheck(ICiBuildPlugin):
# A package can add any additional paths with "AdditionalIncludePaths"
# A package can remove any of these paths with "IgnoreStandardPaths"
#
- STANDARD_PLUGIN_DEFINED_PATHS = ("*.c", "*.h")
+ STANDARD_PLUGIN_DEFINED_PATHS = ("*.c", "*.h", "*.cpp")
#
# The Uncrustify application path should set in this environment variable
diff --git a/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg b/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
index 8506c33337..d7e86a6e57 100644
--- a/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
+++ b/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
@@ -215,7 +215,7 @@ indent_braces = false
indent_braces_no_class = false
indent_braces_no_func = true
indent_braces_no_struct = false
-indent_class = false
+indent_class = true
indent_class_colon = false
indent_cmt_with_tabs = false # Whether to indent comments that are not at a brace level with tabs on
# a tabstop. Requires indent_with_tabs=2. If false, will use spaces.
@@ -223,7 +223,7 @@ indent_col1_comment = true
indent_col1_multi_string_literal= true
indent_comma_paren = true
indent_else_if = true
-indent_extern = false
+indent_extern = true
indent_first_bool_expr = true
indent_func_def_param_paren_pos_threshold = 0