Skip to content

Inject config for UNI-25811 in the common one #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 19, 2018
Merged

Inject config for UNI-25811 in the common one #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c104ba
clean 25811 in the common config and fix output
mihai-unity Jun 18, 2018
0289c0a
update our expectations after enabling option
mihai-unity Jun 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tests/config/staging/UNI-25811.cfg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/config/staging/Uncrustify.Common-CStyle.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ sp_after_new=force # { Ignore, Add, Re
sp_between_new_paren=remove # { Ignore, Add, Remove, Force }
# Controls the spaces between new and '(' in 'new()'.
#
#sp_after_newop_paren { Ignore, Add, Remove, Force }
sp_after_newop_paren=add # { Ignore, Add, Remove, Force }
# Controls the spaces between ')' and 'type' in 'new(foo) BAR'.
#
#sp_inside_newop_paren { Ignore, Add, Remove, Force }
Expand Down
2 changes: 1 addition & 1 deletion tests/output/staging/10050-UNI-1337.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ void foo()
{
void* p1 = new(ptr) Block(bucketsSize);
// becomes...
void* p1 = new(ptr)Block(bucketsSize);
void* p1 = new(ptr) Block(bucketsSize);
// missing space after ')'
}
6 changes: 3 additions & 3 deletions tests/output/staging/60054-UNI-25811.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
void Foo()
{
void* pAllocatedInput = new (std::nothrow) PointerTouchInfo[inputCount];
void* int = new (std::nothrow) int[10];
}
void* pAllocatedInput = new(std::nothrow) PointerTouchInfo[inputCount];
void* int = new(std::nothrow) int[10];
}
2 changes: 1 addition & 1 deletion tests/regression.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
60051 staging/Uncrustify.Cpp.cfg staging/UNI-11643.cpp
60052 staging/UNI-40685.cfg staging/UNI-40685.cs
60053 staging/Uncrustify.CSharp.cfg staging/UNI-36862.cs
60054 staging/UNI-25811.cfg staging/UNI-25811.cpp
60054 staging/Uncrustify.Cpp.cfg staging/UNI-25811.cpp
60055 staging/Uncrustify.Common-Cpp.cfg staging/UNI-29935.cpp
60056 staging/Uncrustify.Common-Cpp.cfg staging/UNI-29935.cpp
60057 staging/Uncrustify.Cpp.cfg staging/UNI-crash.cpp
Expand Down