AStyle: Fix astyle indentation #7007
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was a bug in our configuration. Earlier versions of our style did not
specify this option. We found out for some code in our codebase that it was
changed because of the setting.
An example:
```
case: {
// code here
}
//would be changed to
case: {
// code here
}
```
The first one is correct and do not need to be indented (it's enough switch is
indented).
Long lines like this would have parameters misaligned but shorter lines would be OK.
```
void LoRaMac::check_frame_size(uint16_t size)
{
uint8_t value = _lora_phy.get_max_payload(_mcps_indication.rx_datarate,
- _params.is_repeater_supported);
+ _params.is_repeater_supported);
+
+ _lora_phy.a(_mcps_indication.b,
+ b.is_repeater_supported);
```
With this option (applied to the code above), we get
```
@@ -319,6 +319,9 @@ void LoRaMac::check_frame_size(uint16_t size)
uint8_t value = _lora_phy.get_max_payload(_mcps_indication.rx_datarate,
_params.is_repeater_supported);
+ _lora_phy.a(_mcps_indication.b,
+ b.is_repeater_supported);
```
Both are aligned the same. However there is a limit of astyle - 120 columns for this.
We do in most cases lines from 80 to 120 as suggested in our code lines thus this should
be good.
kjbracey
approved these changes
May 24, 2018
|
To bring bigger picture here, with these 2 options, using AStyle 3.1 as recommended this is the outcome to have astyle run for lorawan codebase: https://github.com/ARMmbed/mbed-os/compare/master...0xc0170:test?expand=1 (please review if all is good). It seems to me 👍 |
|
/morph build |
cmonr
added
needs: CI
release-version: 5.8.6
release-version: 5.9.1
and removed
needs: review
labels
Build : SUCCESSBuild number : 2207 Triggering tests/morph test |
Test : SUCCESSBuild number : 1999 |
Exporter Build : SUCCESSBuild number : 1833 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes the indentation we identified (thanks @kjbracey-arm @hasnainvirk) in Lorawan PR - lorawan codebase tested astyle to the point where we found that the code astyle was fixing was not correct (see the commit messages with examples how it was and with this config how is it). You will spot the differences.
This PR is vital for astyle applying to our bigger codebase.
Pull request type