Skip to content

Commit e5c7b58

Browse files
committed
Small fixes
1 parent 71601b8 commit e5c7b58

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

sonar-ps-plugin/src/main/java/org/sonar/plugins/powershell/fillers/IssuesFiller.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ public void fill(final SensorContext context, final File sourceDir, final Object
2727
final List<Objects.Object.Property> props = o.getProperty();
2828
final String ruleName = getProperty("RuleName", props);
2929
final String initialFile = getProperty("File", props);
30+
31+
// skip reporting temp files
32+
if (initialFile.contains(".scannerwork")) {
33+
continue;
34+
}
3035
final String fsFile = new PathResolver().relativePath(sourceDir, new File(initialFile));
36+
3137
final String message = getProperty("Message", props);
3238
final String line = getProperty("Line", props);
3339
int issueLine = getLine(line);

sonar-ps-plugin/src/main/java/org/sonar/plugins/powershell/sensors/ScriptAnalyzerSensor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ public class ScriptAnalyzerSensor extends BaseSensor implements org.sonar.api.ba
2424

2525
private static final Logger LOGGER = Loggers.get(ScriptAnalyzerSensor.class);
2626

27-
private final IssuesFiller issuesFiller;
27+
private final IssuesFiller issuesFiller = new IssuesFiller();
2828

2929
public ScriptAnalyzerSensor(final TempFolder folder) {
3030
this.folder = folder;
31-
this.issuesFiller = new IssuesFiller();
32-
3331
}
3432

3533
public void describe(final SensorDescriptor descriptor) {
@@ -63,7 +61,7 @@ public void execute(final SensorContext context) {
6361
final FileSystem fileSystem = context.fileSystem();
6462
final File baseDir = fileSystem.baseDir();
6563
final String sourceDir = baseDir.toPath().toFile().getAbsolutePath();
66-
64+
6765
final String outFile = folder.newFile().toPath().toFile().getAbsolutePath();
6866

6967
final String[] args = new String[] { powershellExecutable, scriptFile, "-inputDir", sourceDir, "-output",

sonar-ps-plugin/src/main/java/org/sonar/plugins/powershell/sensors/TokenizerSensor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,17 @@ public void execute(final SensorContext context) {
8282
final String scriptFile = parserFile.getAbsolutePath();
8383
final org.sonar.api.batch.fs.FileSystem fs = context.fileSystem();
8484
final FilePredicates p = fs.predicates();
85-
final Iterable<InputFile> inputFiles = fs.inputFiles(p.and(p.hasLanguage(PowershellLanguage.KEY),
86-
p.hasType(Type.MAIN)));
85+
final Iterable<InputFile> inputFiles = fs.inputFiles(p.and(p.hasLanguage(PowershellLanguage.KEY)));
8786
for (final InputFile inputFile : inputFiles) {
8887
try {
8988

9089
final String analysisFile = inputFile.file().getAbsolutePath();
90+
91+
// skip reporting temp files
9192
if (analysisFile.contains(".scannerwork")) {
9293
continue;
9394
}
95+
9496
final String resultsFile = folder.newFile().toPath().toFile().getAbsolutePath();
9597
final String[] args = new String[] { powershellExecutable, scriptFile, "-inputFile", analysisFile,
9698
"-output", resultsFile };

0 commit comments

Comments
 (0)