Skip to content

Commit

Permalink
Added ReSharper naming convention settings in team-shared file.
Browse files Browse the repository at this point in the history
The .DotSettings file supersedes the .ReSharper file.
Renamed a field since it was named after a keyword and needed the @ prefix.
  • Loading branch information
alexanderfast committed Jun 24, 2015
1 parent b897ed9 commit 137c2fd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 107 deletions.
105 changes: 0 additions & 105 deletions CommandLine.5.1.ReSharper

This file was deleted.

4 changes: 4 additions & 0 deletions CommandLine.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=LocalConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String></wpf:ResourceDictionary>
4 changes: 2 additions & 2 deletions src/CommandLine/Parser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class Parser : IDisposable
{
private bool disposed;
private readonly ParserSettings settings;
private static readonly Lazy<Parser> @default = new Lazy<Parser>(
private static readonly Lazy<Parser> DefaultParser = new Lazy<Parser>(
() => new Parser(new ParserSettings{ HelpWriter = Console.Error }));

/// <summary>
Expand Down Expand Up @@ -62,7 +62,7 @@ internal Parser(ParserSettings settings)
/// </summary>
public static Parser Default
{
get { return @default.Value; }
get { return DefaultParser.Value; }
}

/// <summary>
Expand Down

0 comments on commit 137c2fd

Please sign in to comment.