Merge pull request #220 from PowerShell/SingularNouns

yutingc · yutingc · commit 36cb31f1b7d0 · 2015-05-26T15:55:43.000-07:00
Add check for both IsPlural and IsSingular for nouns
diff --git a/Rules/UseSingularNouns.cs b/Rules/UseSingularNouns.cs
@@ -49,7 +49,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName) {
                     String noun = funcNamePieces[1];
                     var ps = System.Data.Entity.Design.PluralizationServices.PluralizationService.CreateService(CultureInfo.GetCultureInfo("en-us"));
 
-                    if (!ps.IsSingular(noun))
+                    if (!ps.IsSingular(noun) && ps.IsPlural(noun))
                     {
                         yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseSingularNounsError, funcAst.Name),
                             funcAst.Extent, GetName(), DiagnosticSeverity.Warning, fileName);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName) {`
`49`	`49`	`String noun = funcNamePieces[1];`
`50`	`50`	`var ps = System.Data.Entity.Design.PluralizationServices.PluralizationService.CreateService(CultureInfo.GetCultureInfo("en-us"));`
`51`	`51`
`52`		`- if (!ps.IsSingular(noun))`
	`52`	`+ if (!ps.IsSingular(noun) && ps.IsPlural(noun))`
`53`	`53`	`{`
`54`	`54`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseSingularNounsError, funcAst.Name),`
`55`	`55`	`funcAst.Extent, GetName(), DiagnosticSeverity.Warning, fileName);`