diff options
author | Jason Smith <jason.smith@xamarin.com> | 2016-03-25 12:35:24 -0700 |
---|---|---|
committer | Jason Smith <jason.smith@xamarin.com> | 2016-03-25 12:35:24 -0700 |
commit | ec0675950bd6123694bbe846f103b835fb31f5ad (patch) | |
tree | e879c173c0bfb81a577eae634a7f23209ff1f606 | |
parent | 2770f4c4159ad3d47cc4a6893da9764da4301340 (diff) | |
parent | e54108185fa52bf4c970ce4030be5b9b000cf1ba (diff) | |
download | xamarin-forms-ec0675950bd6123694bbe846f103b835fb31f5ad.tar.gz xamarin-forms-ec0675950bd6123694bbe846f103b835fb31f5ad.tar.bz2 xamarin-forms-ec0675950bd6123694bbe846f103b835fb31f5ad.zip |
Merge pull request #14 from xamarin/resharper_spaces
Fix setting for spaces after using and lock keywords
-rw-r--r-- | Xamarin.Forms.sln.DotSettings | 4 | ||||
-rw-r--r-- | Xamarin.Forms.vssettings | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Xamarin.Forms.sln.DotSettings b/Xamarin.Forms.sln.DotSettings index 3500926c..60b391c6 100644 --- a/Xamarin.Forms.sln.DotSettings +++ b/Xamarin.Forms.sln.DotSettings @@ -16,13 +16,13 @@ <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CATCH_ON_NEW_LINE/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FINALLY_ON_NEW_LINE/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean> - <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_LOCK_PARENTHESES/@EntryValue">False</s:Boolean> + <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_LOCK_PARENTHESES/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_METHOD_CALL_PARENTHESES/@EntryValue">False</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_EMPTY_METHOD_CALL_PARENTHESES/@EntryValue">False</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_METHOD_PARENTHESES/@EntryValue">False</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_EMPTY_METHOD_PARENTHESES/@EntryValue">False</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean> - <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_USING_PARENTHESES/@EntryValue">False</s:Boolean> + <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_USING_PARENTHESES/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean> <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/STICK_COMMENT/@EntryValue">False</s:Boolean> <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_MEMBERS/@EntryValue">None</s:String> diff --git a/Xamarin.Forms.vssettings b/Xamarin.Forms.vssettings index 917b68bd..d0901ab6 100644 --- a/Xamarin.Forms.vssettings +++ b/Xamarin.Forms.vssettings @@ -56,11 +56,12 @@ <PropertyValue name="Space_WithinSquares">0</PropertyValue> <PropertyValue name="Space_BeforeLambdaArrow">1</PropertyValue> <PropertyValue name="NewLines_Braces_AnonymousTypeInitializer">0</PropertyValue> + <PropertyValue name="NewLines_Braces_Property">1</PropertyValue> <PropertyValue name="Space_WithinCastParentheses">0</PropertyValue> <PropertyValue name="Space_AfterSemicolonsInForStatement">1</PropertyValue> - <PropertyValue name="Indent_CaseContents">0</PropertyValue> + <PropertyValue name="Indent_CaseContents">1</PropertyValue> <PropertyValue name="Indent_FlushLabelsLeft">1</PropertyValue> - <PropertyValue name="Wrapping_PreserveSingleLine">1</PropertyValue> + <PropertyValue name="Wrapping_PreserveSingleLine">0</PropertyValue> <PropertyValue name="Space_BetweenEmptySquares">0</PropertyValue> <PropertyValue name="Space_BeforeOpenSquare">0</PropertyValue> <PropertyValue name="Space_BeforeDot">0</PropertyValue> |