Browse Source

[CodeIssues] Fixed fdg naming rules.

newNRvisualizers
Mike Krüger 14 years ago
parent
commit
b0c73cc6a8
  1. 24
      ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/DefaultRules.cs
  2. 42
      ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InconsistentNamingTests.cs

24
ICSharpCode.NRefactory.CSharp/Refactoring/CodeIssues/InconsistentNamingIssue/DefaultRules.cs

@ -79,26 +79,18 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -79,26 +79,18 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
};
yield return new NamingRule(AffectedEntity.Field) {
Name = "Fields (Non Private)",
Name = "Fields (Public & Protected)",
NamingStyle = NamingStyle.PascalCase,
VisibilityMask = Modifiers.Public | Modifiers.Protected | Modifiers.Internal
VisibilityMask = Modifiers.Public | Modifiers.Protected
};
yield return new NamingRule(AffectedEntity.ReadonlyField) {
Name = "ReadOnly Fields (Non Private)",
Name = "ReadOnly Fields (Public & Protected)",
NamingStyle = NamingStyle.PascalCase,
VisibilityMask = Modifiers.Public | Modifiers.Protected | Modifiers.Internal,
VisibilityMask = Modifiers.Public | Modifiers.Protected,
IncludeStaticEntities = false
};
yield return new NamingRule(AffectedEntity.Field | AffectedEntity.ReadonlyField) {
Name = "Fields (Private)",
NamingStyle = NamingStyle.CamelCase,
AllowedPrefixes = new [] { "_", "m_" },
VisibilityMask = Modifiers.Private,
IncludeStaticEntities = false
};
yield return new NamingRule(AffectedEntity.Field) {
Name = "Static Fields (Private)",
NamingStyle = NamingStyle.CamelCase,
@ -107,14 +99,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -107,14 +99,6 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
IncludeInstanceMembers = false
};
yield return new NamingRule(AffectedEntity.ReadonlyField) {
Name = "ReadOnly Fields (Private)",
NamingStyle = NamingStyle.CamelCase,
VisibilityMask = Modifiers.Private,
AllowedPrefixes = new [] { "_", "m_" },
IncludeStaticEntities = false
};
yield return new NamingRule(AffectedEntity.ConstantField) {
Name = "Constant Fields",
NamingStyle = NamingStyle.PascalCase,

42
ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InconsistentNamingTests.cs

@ -118,21 +118,21 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues @@ -118,21 +118,21 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
CheckNaming (input, output);
}
[Test]
public void TestPrivateFieldName ()
{
var input = @"class AClass { int Field; }";
var output = @"class AClass { int field; }";
CheckNaming (input, output);
}
// [Test]
// public void TestPrivateFieldName ()
// {
// var input = @"class AClass { int Field; }";
// var output = @"class AClass { int field; }";
// CheckNaming (input, output);
// }
[Test]
public void TestUnderscoreFieldName ()
{
var input = @"class AClass { int _Field; }";
var output = @"class AClass { int _field; }";
CheckNaming (input, output);
}
// [Test]
// public void TestUnderscoreFieldName ()
// {
// var input = @"class AClass { int _Field; }";
// var output = @"class AClass { int _field; }";
// CheckNaming (input, output);
// }
[Test]
public void TestPublicFieldName ()
@ -190,13 +190,13 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues @@ -190,13 +190,13 @@ namespace ICSharpCode.NRefactory.CSharp.CodeIssues
CheckNaming (input, output);
}
[Test]
public void TestPrivateReadOnlyFieldName ()
{
var input = @"class AClass { readonly int Field; }";
var output = @"class AClass { readonly int field; }";
CheckNaming (input, output);
}
// [Test]
// public void TestPrivateReadOnlyFieldName ()
// {
// var input = @"class AClass { readonly int Field; }";
// var output = @"class AClass { readonly int field; }";
// CheckNaming (input, output);
// }
[Test]
public void TestPublicConstantFieldName ()

Loading…
Cancel
Save