Merge branch 'main' into CURA-10255_add_unit_tests

# Conflicts: # include/settings/Settings.h # src/SkeletalTrapezoidation.cpp # src/WallToolPaths.cpp # src/utils/VoronoiUtils.cpp # tests/CMakeLists.txt
Ultimaker · Nov 20, 2023 · 98d33db · 98d33db
2 parents bac675d + 0c3e9d0
commit 98d33db
Show file tree

Hide file tree

Showing 167 changed files with 19,785 additions and 7,793 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,16 +1,18 @@
 AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
+AlignAfterOpenBracket: AlwaysBreak
 AlignConsecutiveAssignments: None
 AlignConsecutiveDeclarations: None
 AlignEscapedNewlines: DontAlign
 AlignOperands: AlignAfterOperator
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: Never
+AllowAllArgumentsOnNextLine: false
+AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
+AllowShortLambdasOnASingleLine: Empty
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
@@ -33,15 +35,15 @@ BraceWrapping:
   SplitEmptyNamespace: true
   SplitEmptyRecord: true
 BreakAfterJavaFieldAnnotations: true
-BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBinaryOperators: All
 BreakBeforeBraces: Allman
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: BeforeComma
 BreakStringLiterals: true
-ColumnLimit: 240
+ColumnLimit: 180
 CommentPragmas: '^ IWYU pragma:'
 CompactNamespaces: false
-PackConstructorInitializers: CurrentLine
+PackConstructorInitializers: Never
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: false
@@ -54,13 +56,14 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+IncludeBlocks: Regroup
 IncludeCategories:
   - Priority: 2
-    Regex: ^"(llvm|llvm-c|clang|clang-c)/
+    Regex: '^<(scripta|spdlog|range|fmt|Arcus|agrpc|grpc|boost)/.*'
   - Priority: 3
-    Regex: ^(<|"(gtest|gmock|isl|json)/)
+    Regex: '^((<|")(gtest|gmock|isl|json)/)'
   - Priority: 1
-    Regex: .*
+    Regex: '^<.*'
 IncludeIsMainRegex: (Test)?$
 IndentCaseLabels: false
 IndentWidth: 4
@@ -86,11 +89,14 @@ SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
+SpacesInAngles: Never
 SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: true
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard: c++17
+Standard: c++20
 TabWidth: 4
 UseTab: Never
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,4 +1,3 @@
----
 Checks: >
   *,
   -llvmlibc-*,
@@ -10,21 +9,47 @@ Checks: >
   -altera-struct-pack-align,
   -android-*,
   -misc-non-private-member-variables-in-classes,
-  -fuchsia-overloaded-operator
+  -fuchsia-overloaded-operator,
+  -cppcoreguidelines-avoid-capturing-lambda-coroutines,
+  -llvm-header-guard,
+  -bugprone-easily-swappable-parameters
 WarningsAsErrors: '-*'
 HeaderFilterRegex: ''
 FormatStyle: none
 CheckOptions:
-  - { key: readability-identifier-naming.NamespaceCase,           value: lower_case }
-  - { key: readability-identifier-naming.MacroDefinitionCase,     value: UPPER_CASE }
-  - { key: readability-identifier-naming.ClassCase,               value: CamelCase }
-  - { key: readability-identifier-naming.FunctionCase,            value: camelBack }
-  - { key: readability-identifier-naming.MethodCase,              value: camelBack }
-  - { key: readability-identifier-naming.ParameterCase,           value: lower_case }
-  - { key: readability-identifier-naming.VariableCase,            value: lower_case }
-  - { key: readability-identifier-naming.ClassConstantCase,       value: UPPER_CASE }
-  - { key: readability-identifier-naming.GlobalConstantCase,     value: UPPER_CASE }
-  - { key: readability-identifier-naming.GlobalVariableCase,     value: UPPER_CASE }
-  - { key: readability-identifier-length.IgnoredParameterNames,   value: 'i|j|k|x|y|z|a|b|aa|bb|ip|os' }
-  - { key: readability-identifier-length.IgnoredVariableNames,    value: 'i|j|k|x|y|z|a|b|aa|bb|ip|os' }
-  - { key: readability-identifier-length.IgnoredLoopCounterNames, value: 'i|j|k|x|y|z|a|b|aa|bb|ip' }
+  - key: google-build-namespaces.HeaderFileExtensions
+    value: h
+  - key: readability-function-size.LineThreshold
+    value: 100
+  - key: readability-function-size.BranchThreshold
+    value: 10
+  - key: readability-function-size.ParameterThreshold
+    value: 6
+  - key: readability-function-size.NestingThreshold
+    value: 4
+  - key: readability-identifier-naming.NamespaceCase
+    value: lower_case
+  - key: readability-identifier-naming.MacroDefinitionCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.ClassCase
+    value: CamelCase
+  - key: readability-identifier-naming.FunctionCase
+    value: camelBack
+  - key: readability-identifier-naming.MethodCase
+    value: camelBack
+  - key: readability-identifier-naming.ParameterCase
+    value: lower_case
+  - key: readability-identifier-naming.VariableCase
+    value: lower_case
+  - key: readability-identifier-naming.ClassConstantCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.GlobalConstantCase
+    value: lower_case
+  - key: readability-identifier-naming.GlobalVariableCase
+    value: UPPER_CASE
+  - key: readability-identifier-length.IgnoredParameterNames
+    value: 'p|p0|p1|i|j|k|x|X|y|Y|z|Z|a|A|b|B|c|C|d|D|ab|AB|ba|BA|bc|BC|cb|CB|cd|CD|dc|DC|ad|AD|da|DA|ip|os'
+  - key: readability-identifier-length.IgnoredVariableNames
+    value: '_p|p0|p1|i|j|k|x|X|y|Y|z|Z|a|A|b|B|c|C|d|D|ab|AB|ba|BA|bc|BC|cb|CB|cd|CD|dc|DC|ad|AD|da|DA|ip|os'
+  - key: readability-identifier-length.IgnoredLoopCounterNames
+    value: '_p|p0|p1|i|j|k|x|X|y|Y|z|Z|a|A|b|B|c|C|d|D|ab|AB|ba|BA|bc|BC|cb|CB|cd|CD|dc|DC|ad|AD|da|DA|ip|os'