Apply rule suppression for DSC and Token rules

Quoc Truong · Quoc Truong · commit 228b727fc422 · 2015-04-17T13:33:02.000-07:00
diff --git a/Engine/Commands/InvokeScriptAnalyzerCommand.cs b/Engine/Commands/InvokeScriptAnalyzerCommand.cs
@@ -356,7 +356,7 @@ private void AnalyzeFile(string filePath)
                         // We want the Engine to continue functioning even if one or more Rules throws an exception
                         try
                         {
-                            diagnostics.AddRange(tokenRule.AnalyzeTokens(tokens, fileName));
+                            diagnostics.AddRange(Helper.Instance.SuppressRule(tokenRule.GetName(), ruleSuppressions, tokenRule.AnalyzeTokens(tokens, fileName).ToList()));
                         }
                         catch (Exception tokenRuleException)
                         {
@@ -384,7 +384,7 @@ private void AnalyzeFile(string filePath)
                         // We want the Engine to continue functioning even if one or more Rules throws an exception
                         try
                         {
-                            diagnostics.AddRange(dscResourceRule.AnalyzeDSCClass(ast, filePath));
+                            diagnostics.AddRange(Helper.Instance.SuppressRule(dscResourceRule.GetName(), ruleSuppressions, dscResourceRule.AnalyzeDSCClass(ast, filePath).ToList()));
                         }
                         catch (Exception dscResourceRuleException)
                         {
@@ -426,7 +426,7 @@ private void AnalyzeFile(string filePath)
                                             // We want the Engine to continue functioning even if one or more Rules throws an exception
                                             try
                                             {
-                                                diagnostics.AddRange(dscResourceRule.AnalyzeDSCResource(ast, filePath));
+                                                diagnostics.AddRange(Helper.Instance.SuppressRule(dscResourceRule.GetName(), ruleSuppressions, dscResourceRule.AnalyzeDSCResource(ast, filePath).ToList()));
                                             }
                                             catch (Exception dscResourceRuleException)
                                             {
diff --git a/Engine/Generic/RuleSuppression.cs b/Engine/Generic/RuleSuppression.cs
@@ -62,7 +62,9 @@ public string RuleName
                     && (ScriptAnalyzer.Instance.TokenRules != null
                         && ScriptAnalyzer.Instance.TokenRules.Count(item => String.Equals(item.GetName(), _ruleName, StringComparison.OrdinalIgnoreCase)) == 0)
                     && (ScriptAnalyzer.Instance.ExternalRules != null
-                        && ScriptAnalyzer.Instance.ExternalRules.Count(item => String.Equals(item.GetName(), _ruleName, StringComparison.OrdinalIgnoreCase)) == 0))
+                        && ScriptAnalyzer.Instance.ExternalRules.Count(item => String.Equals(item.GetName(), _ruleName, StringComparison.OrdinalIgnoreCase)) == 0)
+                    && (ScriptAnalyzer.Instance.DSCResourceRules != null
+                        && ScriptAnalyzer.Instance.DSCResourceRules.Count(item => String.Equals(item.GetName(), _ruleName, StringComparison.OrdinalIgnoreCase)) == 0))
                 {
                     Error = String.Format(Strings.RuleSuppressionRuleNameNotFound, _ruleName);
                 }

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ private void AnalyzeFile(string filePath)`
`356`	`356`	`// We want the Engine to continue functioning even if one or more Rules throws an exception`
`357`	`357`	`try`
`358`	`358`	`{`
`359`		`- diagnostics.AddRange(tokenRule.AnalyzeTokens(tokens, fileName));`
	`359`	`+ diagnostics.AddRange(Helper.Instance.SuppressRule(tokenRule.GetName(), ruleSuppressions, tokenRule.AnalyzeTokens(tokens, fileName).ToList()));`
`360`	`360`	`}`
`361`	`361`	`catch (Exception tokenRuleException)`
`362`	`362`	`{`
`@@ -384,7 +384,7 @@ private void AnalyzeFile(string filePath)`
`384`	`384`	`// We want the Engine to continue functioning even if one or more Rules throws an exception`
`385`	`385`	`try`
`386`	`386`	`{`
`387`		`- diagnostics.AddRange(dscResourceRule.AnalyzeDSCClass(ast, filePath));`
	`387`	`+ diagnostics.AddRange(Helper.Instance.SuppressRule(dscResourceRule.GetName(), ruleSuppressions, dscResourceRule.AnalyzeDSCClass(ast, filePath).ToList()));`
`388`	`388`	`}`
`389`	`389`	`catch (Exception dscResourceRuleException)`
`390`	`390`	`{`
`@@ -426,7 +426,7 @@ private void AnalyzeFile(string filePath)`
`426`	`426`	`// We want the Engine to continue functioning even if one or more Rules throws an exception`
`427`	`427`	`try`
`428`	`428`	`{`
`429`		`- diagnostics.AddRange(dscResourceRule.AnalyzeDSCResource(ast, filePath));`
	`429`	`+ diagnostics.AddRange(Helper.Instance.SuppressRule(dscResourceRule.GetName(), ruleSuppressions, dscResourceRule.AnalyzeDSCResource(ast, filePath).ToList()));`
`430`	`430`	`}`
`431`	`431`	`catch (Exception dscResourceRuleException)`
`432`	`432`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ public string RuleName`
`62`	`62`	`&& (ScriptAnalyzer.Instance.TokenRules != null`
`63`	`63`	`&& ScriptAnalyzer.Instance.TokenRules.Count(item => String.Equals(item.GetName(), _ruleName, StringComparison.OrdinalIgnoreCase)) == 0)`
`64`	`64`	`&& (ScriptAnalyzer.Instance.ExternalRules != null`
`65`		`- && ScriptAnalyzer.Instance.ExternalRules.Count(item => String.Equals(item.GetName(), _ruleName, StringComparison.OrdinalIgnoreCase)) == 0))`
	`65`	`+ && ScriptAnalyzer.Instance.ExternalRules.Count(item => String.Equals(item.GetName(), _ruleName, StringComparison.OrdinalIgnoreCase)) == 0)`
	`66`	`+ && (ScriptAnalyzer.Instance.DSCResourceRules != null`
	`67`	`+ && ScriptAnalyzer.Instance.DSCResourceRules.Count(item => String.Equals(item.GetName(), _ruleName, StringComparison.OrdinalIgnoreCase)) == 0))`
`66`	`68`	`{`
`67`	`69`	`Error = String.Format(Strings.RuleSuppressionRuleNameNotFound, _ruleName);`
`68`	`70`	`}`