Skip to content

Commit 9ae3e9c

Browse files
committed
Fix issue PickNikRobotics#2 - no break before opening braces of function definition
1 parent 89ec3d6 commit 9ae3e9c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

‎.clang-format‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ AlignTrailingComments: true
77
AllowAllParametersOfDeclarationOnNextLine: false
88
AllowShortIfStatementsOnASingleLine: false
99
AllowShortLoopsOnASingleLine: false
10+
AllowShortFunctionsOnASingleLine: None
11+
AllowShortLoopsOnASingleLine: false
1012
AlwaysBreakTemplateDeclarations: true
1113
AlwaysBreakBeforeMultilineStrings: false
1214
BreakBeforeBinaryOperators: false

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ The repo contains an auto formatting script for the [ROS C++ Style Guidelines](h
1111

1212
``sudo apt-get install -y clang-format-3.6``
1313

14-
* Then put in the root of your catkin workspace the file ``.clang_format``, located in this repo. You can save this file from [this link](https://raw.githubusercontent.com/davetcoleman/roscpp_code_format/master/.clang-format). For example, place it on your computer here:
14+
* Then symlink or copy in the root of your catkin workspace the file ``.clang_format``, located in this repo. You can save this file from [this link](https://raw.githubusercontent.com/davetcoleman/roscpp_code_format/master/.clang-format). For example, place it on your computer here:
1515

1616
``~/catkin_ws/.clang_format``
1717

18+
* If you are interested in improving this configuration file, we recommend you checkout the git repo and symlink, e.g.:
19+
20+
``ln -s ~/roscpp_code_format/.clang-format ~/catkin_ws/.clang-format``
21+
1822
* Now any file inside your catkin workspace will be formatted with the ROS style guidelines described in this config file
1923

2024
## Usage
@@ -58,5 +62,3 @@ Set a keyboard shortcut to run, such as F12
5862
Install the [clang-format](https://atom.io/packages/clang-format) package via the Atom package manager or ``apm install clang-format``.
5963

6064
In the package settings set ``clang-format-3.6`` as your executable and point 'Style' to your ``.clang_format`` file.
61-
62-

0 commit comments

Comments
 (0)