Merge pull request #12 from PowerShell/yuting-changes

yutingc · yutingc · commit dba3417a37bb · 2015-04-08T16:39:40.000-07:00
Change rule strict to information
diff --git a/Engine/Commands/InvokeScriptAnalyzerCommand.cs b/Engine/Commands/InvokeScriptAnalyzerCommand.cs
@@ -77,7 +77,7 @@ public string[] IncludeRule
         /// <summary>
         /// IncludeRule: Array of the severity types to be enabled.
         /// </summary>
-        [ValidateSet("Warning", "Error", "Strict", IgnoreCase = true)]
+        [ValidateSet("Warning", "Error", "Information", IgnoreCase = true)]
         [Parameter(Mandatory = false)]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] Severity
diff --git a/Engine/Generic/DiagnosticRecord.cs b/Engine/Generic/DiagnosticRecord.cs
@@ -98,9 +98,9 @@ public DiagnosticRecord(string message, IScriptExtent extent, string ruleName, D
     public enum DiagnosticSeverity : uint
     {
         /// <summary>
-        /// STRICT: This diagnostic is trivial, but may be useful.
+        /// Information: This diagnostic is trivial, but may be useful.
         /// </summary>
-        Strict   = 0,
+        Information   = 0,
 
         /// <summary>
         /// WARNING: This diagnostic may cause a problem or does not follow PowerShell's recommended guidelines.
diff --git a/Rules/ProvideCommentHelp.cs b/Rules/ProvideCommentHelp.cs
@@ -56,7 +56,7 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun
                     DiagnosticRecords.Add(
                         new DiagnosticRecord(
                             string.Format(CultureInfo.CurrentCulture, Strings.ProvideCommentHelpError, funcAst.Name),
-                            funcAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName));
+                            funcAst.Extent, GetName(), DiagnosticSeverity.Information, fileName));
                 }
             }
 
diff --git a/Rules/ProvideVerboseMessage.cs b/Rules/ProvideVerboseMessage.cs
@@ -65,7 +65,7 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun
             if (!hasVerbose)
             {
                 DiagnosticRecords.Add(new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ProvideVerboseMessageErrorFunction, funcAst.Name),
-                    funcAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName));
+                    funcAst.Extent, GetName(), DiagnosticSeverity.Information, fileName));
             }
 
             return AstVisitAction.Continue;
diff --git a/Rules/ReturnCorrectTypesForDSCFunctions.cs b/Rules/ReturnCorrectTypesForDSCFunctions.cs
@@ -49,7 +49,7 @@ item is TypeDefinitionAst
                     foreach (Tuple<string, StatementAst> outputType in outputTypes)
                     {
                         yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForSetTargetResourceFunctionsDSCError),
-                            outputType.Item2.Extent, GetName(), DiagnosticSeverity.Strict, fileName);
+                            outputType.Item2.Extent, GetName(), DiagnosticSeverity.Information, fileName);
                     }
                 }
                 else
@@ -73,7 +73,7 @@ item is TypeDefinitionAst
                         else
                         {
                             yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForGetTestTargetResourceFunctionsDSCResourceError,
-                                func.Name, returnTypes[func.Name], type), outputType.Item2.Extent, GetName(), DiagnosticSeverity.Strict, fileName);
+                                func.Name, returnTypes[func.Name], type), outputType.Item2.Extent, GetName(), DiagnosticSeverity.Information, fileName);
                         }
                     }
                 }
@@ -116,7 +116,7 @@ item is TypeDefinitionAst
                     if (!String.Equals(funcAst.Name, "Set") && !Helper.Instance.AllCodePathReturns(funcAst))
                     {
                         yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.NotAllCodePathReturnsDSCFunctionsError, funcAst.Name, dscClass.Name),
-                            funcAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName);
+                            funcAst.Extent, GetName(), DiagnosticSeverity.Information, fileName);
                     }
 
                     if (String.Equals(funcAst.Name, "Set"))
@@ -127,7 +127,7 @@ item is TypeDefinitionAst
                             if (ret.Pipeline != null)
                             {
                                 yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForSetFunctionsDSCError, dscClass.Name),
-                                    funcAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName);
+                                    funcAst.Extent, GetName(), DiagnosticSeverity.Information, fileName);
                             }
                         }
                     }
@@ -143,7 +143,7 @@ item is TypeDefinitionAst
                             {
                                 yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForDSCFunctionsNoTypeError,
                                     funcAst.Name, dscClass.Name, returnTypes[funcAst.Name]),
-                                    ret.Extent, GetName(), DiagnosticSeverity.Strict, fileName);
+                                    ret.Extent, GetName(), DiagnosticSeverity.Information, fileName);
                             }
 
                             string typeName = Helper.Instance.GetTypeFromReturnStatementAst(funcAst, ret, classes);
@@ -161,7 +161,7 @@ item is TypeDefinitionAst
                             {
                                 yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForDSCFunctionsWrongTypeError,
                                     funcAst.Name, dscClass.Name, returnTypes[funcAst.Name], typeName),
-                                    ret.Extent, GetName(), DiagnosticSeverity.Strict, fileName);
+                                    ret.Extent, GetName(), DiagnosticSeverity.Information, fileName);
                             }
                         }
                     }
diff --git a/Rules/UseIdenticalMandatoryParametersDSC.cs b/Rules/UseIdenticalMandatoryParametersDSC.cs
@@ -86,7 +86,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeDSCResource(Ast ast, string fileName
                 {
                     List<string> functionsNotContainingParam = expectedTargetResourceFunctionNames.Except(mandatoryParameters[paramName]).ToList();
                     yield return new DiagnosticRecord(string.Format(CultureInfo.InvariantCulture, Strings.UseIdenticalMandatoryParametersDSCError, paramName, string.Join(", ", functionsNotContainingParam.ToArray())),
-                                    ast.Extent, GetName(), DiagnosticSeverity.Strict, fileName);
+                                    ast.Extent, GetName(), DiagnosticSeverity.Information, fileName);
                 }                   
                 
             }
diff --git a/Rules/UseIdenticalParametersDSC.cs b/Rules/UseIdenticalParametersDSC.cs
@@ -48,7 +48,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeDSCResource(Ast ast, string fileName
                 if (funcParamAsts.Count() != funcParamAsts2.Count())
                 {
                     yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseIdenticalParametersDSCError),
-                        firstFunc.Extent, GetName(), DiagnosticSeverity.Strict, fileName);
+                        firstFunc.Extent, GetName(), DiagnosticSeverity.Information, fileName);
                 }
 
                 foreach (ParameterAst paramAst in funcParamAsts)
@@ -62,7 +62,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeDSCResource(Ast ast, string fileName
                         || !CompareParamAsts(paramAst, paramNames[paramAst.Name.VariablePath.UserPath]))
                     {
                         yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseIdenticalParametersDSCError),
-                            paramAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName);   
+                            paramAst.Extent, GetName(), DiagnosticSeverity.Information, fileName);   
                     }
                 }
             }
diff --git a/Rules/UseStandardDSCFunctionsInResource.cs b/Rules/UseStandardDSCFunctionsInResource.cs
@@ -49,7 +49,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeDSCResource(Ast ast, string fileName
                 if (!targetResourceFunctionNamesInAst.Contains(expectedTargetResourceFunctionName, StringComparer.CurrentCultureIgnoreCase))
                 {
                     yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseStandardDSCFunctionsInResourceError, expectedTargetResourceFunctionName),
-                        ast.Extent, GetName(), DiagnosticSeverity.Strict, fileName);      
+                        ast.Extent, GetName(), DiagnosticSeverity.Information, fileName);      
                 }
             }
         }
@@ -80,7 +80,7 @@ item is TypeDefinitionAst
                     if (!functions.Any(function => String.Equals(resourceFunctionName, (function as FunctionMemberAst).Name)))
                     {
                         yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseStandardDSCFunctionsInClassError, resourceFunctionName),
-                            dscClass.Extent, GetName(), DiagnosticSeverity.Strict, fileName);
+                            dscClass.Extent, GetName(), DiagnosticSeverity.Information, fileName);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun`
`56`	`56`	`DiagnosticRecords.Add(`
`57`	`57`	`new DiagnosticRecord(`
`58`	`58`	`string.Format(CultureInfo.CurrentCulture, Strings.ProvideCommentHelpError, funcAst.Name),`
`59`		`- funcAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName));`
	`59`	`+ funcAst.Extent, GetName(), DiagnosticSeverity.Information, fileName));`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public override AstVisitAction VisitFunctionDefinition(FunctionDefinitionAst fun`
`65`	`65`	`if (!hasVerbose)`
`66`	`66`	`{`
`67`	`67`	`DiagnosticRecords.Add(new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ProvideVerboseMessageErrorFunction, funcAst.Name),`
`68`		`- funcAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName));`
	`68`	`+ funcAst.Extent, GetName(), DiagnosticSeverity.Information, fileName));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`return AstVisitAction.Continue;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ item is TypeDefinitionAst`
`49`	`49`	`foreach (Tuple<string, StatementAst> outputType in outputTypes)`
`50`	`50`	`{`
`51`	`51`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForSetTargetResourceFunctionsDSCError),`
`52`		`- outputType.Item2.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`52`	`+ outputType.Item2.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`else`
`@@ -73,7 +73,7 @@ item is TypeDefinitionAst`
`73`	`73`	`else`
`74`	`74`	`{`
`75`	`75`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForGetTestTargetResourceFunctionsDSCResourceError,`
`76`		`- func.Name, returnTypes[func.Name], type), outputType.Item2.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`76`	`+ func.Name, returnTypes[func.Name], type), outputType.Item2.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`
`@@ -116,7 +116,7 @@ item is TypeDefinitionAst`
`116`	`116`	`if (!String.Equals(funcAst.Name, "Set") && !Helper.Instance.AllCodePathReturns(funcAst))`
`117`	`117`	`{`
`118`	`118`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.NotAllCodePathReturnsDSCFunctionsError, funcAst.Name, dscClass.Name),`
`119`		`- funcAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`119`	`+ funcAst.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`if (String.Equals(funcAst.Name, "Set"))`
`@@ -127,7 +127,7 @@ item is TypeDefinitionAst`
`127`	`127`	`if (ret.Pipeline != null)`
`128`	`128`	`{`
`129`	`129`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForSetFunctionsDSCError, dscClass.Name),`
`130`		`- funcAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`130`	`+ funcAst.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`	`}`
`@@ -143,7 +143,7 @@ item is TypeDefinitionAst`
`143`	`143`	`{`
`144`	`144`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForDSCFunctionsNoTypeError,`
`145`	`145`	`funcAst.Name, dscClass.Name, returnTypes[funcAst.Name]),`
`146`		`- ret.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`146`	`+ ret.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`string typeName = Helper.Instance.GetTypeFromReturnStatementAst(funcAst, ret, classes);`
`@@ -161,7 +161,7 @@ item is TypeDefinitionAst`
`161`	`161`	`{`
`162`	`162`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.ReturnCorrectTypesForDSCFunctionsWrongTypeError,`
`163`	`163`	`funcAst.Name, dscClass.Name, returnTypes[funcAst.Name], typeName),`
`164`		`- ret.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`164`	`+ ret.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeDSCResource(Ast ast, string fileName`
`86`	`86`	`{`
`87`	`87`	`List<string> functionsNotContainingParam = expectedTargetResourceFunctionNames.Except(mandatoryParameters[paramName]).ToList();`
`88`	`88`	`yield return new DiagnosticRecord(string.Format(CultureInfo.InvariantCulture, Strings.UseIdenticalMandatoryParametersDSCError, paramName, string.Join(", ", functionsNotContainingParam.ToArray())),`
`89`		`- ast.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`89`	`+ ast.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeDSCResource(Ast ast, string fileName`
`48`	`48`	`if (funcParamAsts.Count() != funcParamAsts2.Count())`
`49`	`49`	`{`
`50`	`50`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseIdenticalParametersDSCError),`
`51`		`- firstFunc.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`51`	`+ firstFunc.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`foreach (ParameterAst paramAst in funcParamAsts)`
`@@ -62,7 +62,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeDSCResource(Ast ast, string fileName`
`62`	`62`	`\|\| !CompareParamAsts(paramAst, paramNames[paramAst.Name.VariablePath.UserPath]))`
`63`	`63`	`{`
`64`	`64`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseIdenticalParametersDSCError),`
`65`		`- paramAst.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`65`	`+ paramAst.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeDSCResource(Ast ast, string fileName`
`49`	`49`	`if (!targetResourceFunctionNamesInAst.Contains(expectedTargetResourceFunctionName, StringComparer.CurrentCultureIgnoreCase))`
`50`	`50`	`{`
`51`	`51`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseStandardDSCFunctionsInResourceError, expectedTargetResourceFunctionName),`
`52`		`- ast.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`52`	`+ ast.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`}`
`@@ -80,7 +80,7 @@ item is TypeDefinitionAst`
`80`	`80`	`if (!functions.Any(function => String.Equals(resourceFunctionName, (function as FunctionMemberAst).Name)))`
`81`	`81`	`{`
`82`	`82`	`yield return new DiagnosticRecord(string.Format(CultureInfo.CurrentCulture, Strings.UseStandardDSCFunctionsInClassError, resourceFunctionName),`
`83`		`- dscClass.Extent, GetName(), DiagnosticSeverity.Strict, fileName);`
	`83`	`+ dscClass.Extent, GetName(), DiagnosticSeverity.Information, fileName);`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`	`}`