Skip to content

Commit 3a04d3b

Browse files
authored
Clear code map after example analysis (Azure#19407)
* clean codemap by default * reverse logic * recursively clean output folder
1 parent 8be95cd commit 3a04d3b

File tree

1 file changed

+17
-22
lines changed

1 file changed

+17
-22
lines changed

tools/StaticAnalysis/ExampleAnalyzer/Measure-MarkdownOrScript.ps1

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,21 +67,21 @@ if ($PSCmdlet.ParameterSetName -eq "Markdown") {
6767
$MarkdownPath = Get-Content $MarkdownPaths
6868
}
6969
# When the input $MarkdownPaths is the path of a folder
70-
else{
70+
else {
7171
$MarkdownPath = $MarkdownPaths
7272
}
73-
foreach($_ in Get-ChildItem $MarkdownPath -Recurse:$Recurse.IsPresent){
73+
foreach ($_ in Get-ChildItem $MarkdownPath -Recurse:$Recurse) {
7474
# Filter the .md of overview in "\help\"
7575
if ((Get-Item -Path $_.FullName).Directory.Name -eq "help" -and $_.FullName -cmatch ".*\.md" -and $_.BaseName -cmatch "^[A-Z][a-z]+-([A-Z][a-z0-9]*)+$") {
76-
if((Get-Item -Path $_.FullName).Directory.Parent.Name -eq "netcoreapp3.1"){
76+
if ((Get-Item -Path $_.FullName).Directory.Parent.Name -eq "netcoreapp3.1") {
7777
continue
7878
}
7979
Write-Output "Searching in file $($_.FullName) ..."
80-
if((Get-Item -Path $_.FullName).Directory.Parent.Parent.Name -ne "src"){
80+
if ((Get-Item -Path $_.FullName).Directory.Parent.Parent.Name -ne "src") {
8181
$module = (Get-Item -Path $_.FullName).Directory.Parent.Parent.Name
8282
}
83-
else{
84-
$module = (Get-Item -Path $_.FullName).Directory.Parent.Name
83+
else {
84+
$module = (Get-Item -Path $_.FullName).Directory.Parent.Name
8585
}
8686
$cmdlet = $_.BaseName
8787
$result = Measure-SectionMissingAndOutputScript $module $cmdlet $_.FullName `
@@ -92,31 +92,26 @@ if ($PSCmdlet.ParameterSetName -eq "Markdown") {
9292
$totalLine = $result.TotalLine
9393
}
9494
}
95-
if(!$NotCleanScripts.IsPresent){
96-
$codeMap| Export-Csv $TempScriptMapPath -NoTypeInformation
97-
}
95+
$codeMap | Export-Csv $TempScriptMapPath -NoTypeInformation
9896
}
9997

10098
# Analyze scripts
101-
if ($PSCmdlet.ParameterSetName -eq "Script" -or !$SkipAnalyzing.IsPresent) {
102-
if ($PSCmdlet.ParameterSetName -eq "Script"){
103-
$codeMap = Merge-Scripts -ScriptPaths $ScriptPaths -Recurse:$Recurse.IsPresent -TempScriptPath $TempScriptPath
104-
if(!$NotCleanScripts.IsPresent){
105-
$codeMap| Export-Csv $TempScriptMapPath -NoTypeInformation
106-
}
99+
if ($PSCmdlet.ParameterSetName -eq "Script" -or !$SkipAnalyzing) {
100+
if ($PSCmdlet.ParameterSetName -eq "Script") {
101+
$codeMap = Merge-Scripts -ScriptPaths $ScriptPaths -Recurse:$Recurse -TempScriptPath $TempScriptPath
102+
$codeMap | Export-Csv $TempScriptMapPath -NoTypeInformation
107103
}
108104
# Read and analyze ".ps1" in \ScriptsByExample
109105
Write-Output "Analyzing file ..."
110-
$analysisResultsTable += Get-ScriptAnalyzerResult -ScriptPath $TempScriptPath -RulePaths $RulePaths -IncludeDefaultRules:$IncludeDefaultRules.IsPresent -CodeMap $codeMap -ErrorAction Continue
111-
106+
$analysisResultsTable += Get-ScriptAnalyzerResult -ScriptPath $TempScriptPath -RulePaths $RulePaths -IncludeDefaultRules:$IncludeDefaultRules -CodeMap $codeMap -ErrorAction Continue
107+
112108
# Summarize analysis results, output in Result.csv
113-
if($analysisResultsTable){
114-
$analysisResultsTable| Where-Object {$_ -ne $null} | Export-Csv "$PSScriptRoot\..\..\..\artifacts\StaticAnalysisResults\ExampleIssues.csv" -NoTypeInformation
109+
if ($analysisResultsTable) {
110+
$analysisResultsTable | Where-Object { $_ -ne $null } | Export-Csv "$PSScriptRoot\..\..\..\artifacts\StaticAnalysisResults\ExampleIssues.csv" -NoTypeInformation
115111
}
116112
}
117113

118114
# Clean caches
119-
if (!$NotCleanScripts.IsPresent) {
120-
Remove-Item $TempScriptPath -ErrorAction Continue
121-
Remove-Item $OutputFolder -ErrorAction SilentlyContinue
115+
if (-not $NotCleanScripts) {
116+
Remove-Item $OutputFolder -Recurse -ErrorAction SilentlyContinue
122117
}

0 commit comments

Comments
 (0)