Skip to content

Fix AST visitor for external rules #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: bring master up to 1.18.1
merged 2 commits into from
Sep 16, 2016
Merged

Fix AST visitor for external rules #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f75737
Search nested script blocks for external rules
Sep 15, 2016
02b0a89
Fix failing tests for PowerShell Core
Sep 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Engine/ScriptAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,10 +861,6 @@ private IEnumerable<T> GetInterfaceImplementationsFromAssembly<T>(string ruleDll
"Creating Instance of {0}", type.Name));

var ruleObj = Activator.CreateInstance(type);
outputWriter.WriteVerbose(
string.Format(
"Created Instance of {0}", type.Name));

T rule = ruleObj as T;
if (rule == null)
{
Expand Down Expand Up @@ -1164,7 +1160,7 @@ internal IEnumerable<DiagnosticRecord> GetExternalRecord(Ast ast, Token[] token,
{
// Find all AstTypes that appeared in rule groups.
IEnumerable<Ast> childAsts = ast.FindAll(new Func<Ast, bool>((testAst) =>
(astRuleGroup.Key.IndexOf(testAst.GetType().FullName, StringComparison.OrdinalIgnoreCase) != -1)), false);
(astRuleGroup.Key.IndexOf(testAst.GetType().FullName, StringComparison.OrdinalIgnoreCase) != -1)), true);

foreach (Ast childAst in childAsts)
{
Expand Down
2 changes: 1 addition & 1 deletion Rules/AvoidAlias.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public List<string> WhiteList
get { return whiteList; }
}

AvoidAlias()
public AvoidAlias()
{
isPropertiesSet = false;
}
Expand Down
2 changes: 1 addition & 1 deletion Rules/UseLiteralInitializerForHashtable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.BuiltinRules
#if !CORECLR
[Export(typeof(IScriptRule))]
#endif
class UseLiteralInitializerForHashtable : AstVisitor, IScriptRule
public class UseLiteralInitializerForHashtable : AstVisitor, IScriptRule
{
private List<DiagnosticRecord> diagnosticRecords;
private HashSet<string> presetTypeNameSet;
Expand Down
6 changes: 3 additions & 3 deletions Tests/Rules/AvoidUsingAlias.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Describe "AvoidUsingAlias" {
}

Context "Settings file provides whitelist" {
$whiteListTestScriptDef = 'gci; cd; iwr'
$whiteListTestScriptDef = 'gci; cd;'

It "honors the whitelist provided as hashtable" {
$settings = @{
Expand All @@ -44,14 +44,14 @@ Describe "AvoidUsingAlias" {
}
}
$violations = Invoke-ScriptAnalyzer -ScriptDefinition $whiteListTestScriptDef -Settings $settings -IncludeRule $violationName
$violations.Count | Should Be 2
$violations.Count | Should Be 1
}

It "honors the whitelist provided through settings file" {
# even though join-path returns string, if we do not use tostring, then invoke-scriptanalyzer cannot cast it to string type
$settingsFilePath = (Join-Path $directory (Join-Path 'TestSettings' 'AvoidAliasSettings.psd1')).ToString()
$violations = Invoke-ScriptAnalyzer -ScriptDefinition $whiteListTestScriptDef -Settings $settingsFilePath -IncludeRule $violationName
$violations.Count | Should be 2
$violations.Count | Should be 1
}
}
}