Skip to content

Inject config for UNI-40685 #150

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 3 commits into from
Jun 20, 2018
Merged

Inject config for UNI-40685 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
974a985
enable config for 40685
mihai-unity Jun 19, 2018
860b870
accept output for other tests
mihai-unity Jun 19, 2018
6f48f3c
add 40605 to the mix
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-40605.cfg
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions tests/config/staging/UNI-40685.cfg
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions tests/config/staging/Uncrustify.CSharp.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,13 @@ indent_using_block=false # { False, True }
indent_col1_multi_string_literal=true # { False, True }
# Whether to indent multi string literal in first column.
#

indent_cs_delegate_body=true # { False, True }
# indent a C# delegate(To hanndle delegates with no brace) by another level. default: false
#

indent_paren_close=2 # Unsigned Number
# Controls the indent of a close paren after a newline.
# 0: Indent to body level
# 1: Align under the open paren
# 2: Indent to the brace level
2 changes: 1 addition & 1 deletion tests/output/staging/60045-indent-multistring-coulmn1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//This
var a = hello(
@"world"
);
);

//should stay the same.
//But this
Expand Down
2 changes: 1 addition & 1 deletion tests/output/staging/60050-UNI-40605.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static T WithAdditionalFlags<T>(this T _this, IEnumerable<string> flags)
var projectEntries = islands.Select(i => string.Format(
DefaultSynchronizationSettings.SolutionProjectEntryTemplate,
SolutionGuid(i), _projectName, Path.GetFileName(ProjectFile(i)), ProjectGuid(i._output)
));
));


Func<IEnumerable<IMemberDefinition>, IEnumerable<IMemberDefinition>> filterMembersWithObsoleteAttr = members => members.Where(m =>
Expand Down
10 changes: 5 additions & 5 deletions tests/output/staging/60064-UNI-47842.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void dummy()
abc(transform.rotation * Quaternion.LookRotation(Vector3.forward),
size,
EventType.Repaint
);
);
}
}
}
Expand All @@ -28,12 +28,12 @@ void dummy()
//Case 4
static void DefaultRadiusHandleDrawFunction(
int controlID, Vector3 position, Quaternion rotation, float size, EventType eventType
)
)
{
return Scripting::ScriptingWrapperFor(useCurveRanges ?
cache.GetPreview(previewSize, actualObject, color, topFillColor, bottomFillColor, curveRanges) :
cache.GetPreview(previewSize, actualObject, color, topFillColor, bottomFillColor)
);
);
}

//Case-5
Expand All @@ -49,7 +49,7 @@ int func_name()
REGISTER_TYPE_ATTRIBUTES(AvatarMask,
(LegacyPersistentTypeID, (1011, // AvatarMask (old)
1012)) // AvatarSkeletonMask
);
);

//Case 7
char* br = (char*)mem2chunk((size_t)(((size_t)((char*)mem + alignment -
Expand Down Expand Up @@ -123,7 +123,7 @@ private void DoCurveDropdown(Rect rect, AnimationWindowHierarchyNode node, int r
GetTemplateIndex(templateProp.stringValue),
TemplateGUIThumbnails,
numCols
)].ToString();
)].ToString();


//Case 15
Expand Down
4 changes: 2 additions & 2 deletions tests/regression.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
60045 staging/Uncrustify.CSharp.cfg staging/indent-multistring-coulmn1.cs
60046 staging/UNI-24090.cfg staging/UNI-24090.cs
60047 staging/UNI-24076.cfg staging/UNI-24076.cs
60050 staging/UNI-40605.cfg staging/UNI-40605.cs
60050 staging/Uncrustify.CSharp.cfg staging/UNI-40605.cs
60051 staging/Uncrustify.Cpp.cfg staging/UNI-11643.cpp
60052 staging/UNI-40685.cfg staging/UNI-40685.cs
60052 staging/Uncrustify.CSharp.cfg staging/UNI-40685.cs
60053 staging/Uncrustify.CSharp.cfg staging/UNI-36862.cs
60054 staging/UNI-25811.cfg staging/UNI-25811.cpp
60055 staging/Uncrustify.Common-Cpp.cfg staging/UNI-29935.cpp
Expand Down