aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-css-plugin/src/main/java/org/sonar
diff options
context:
space:
mode:
authorElena Vilchik2019-06-14 10:01:23 +0200
committerTibor Blenessy2019-06-14 10:01:23 +0200
commiteb017c3b5e0b4652210fb7bcd0a68fe0c36b29cf (patch)
tree48fc01eeddd1ac38351e57d3ea7d7a4dcd2d1ef1 /sonar-css-plugin/src/main/java/org/sonar
parent479b21eb67bd2f5f7170cb4e14b19561ed59ddcf (diff)
downloadsonar-css-eb017c3b5e0b4652210fb7bcd0a68fe0c36b29cf.tar.bz2
Analyse CSS inside other language files (html, vue) (#183)
Diffstat (limited to 'sonar-css-plugin/src/main/java/org/sonar')
-rw-r--r--sonar-css-plugin/src/main/java/org/sonar/css/plugin/StylelintCommandProvider.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/StylelintCommandProvider.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/StylelintCommandProvider.java
index 26541bd..1f6d6b2 100644
--- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/StylelintCommandProvider.java
+++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/StylelintCommandProvider.java
@@ -20,8 +20,11 @@
package org.sonar.css.plugin;
import java.io.File;
-import java.nio.file.Paths;
+import java.nio.file.Paths;import java.util.Arrays;
+import java.util.List;
import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.sonar.api.batch.ScannerSide;
import org.sonar.api.batch.sensor.SensorContext;
import org.sonarsource.nodejs.NodeCommand;
@@ -30,11 +33,17 @@ import org.sonarsource.nodejs.NodeCommand;
public class StylelintCommandProvider implements LinterCommandProvider {
private static final String CONFIG_PATH = "css-bundle/stylelintconfig.json";
+ private static final List<String> LANGUAGES_TO_ANALYZE = Arrays.asList("css", "html", "php", "javascript", "typescript");
@Override
public NodeCommand nodeCommand(File deployDestination, SensorContext context, Consumer<String> output, Consumer<String> error) {
String projectBaseDir = context.fileSystem().baseDir().getAbsolutePath();
- String[] suffixes = context.config().getStringArray(CssPlugin.FILE_SUFFIXES_KEY);
+
+ List<String> suffixes = LANGUAGES_TO_ANALYZE.stream()
+ .map(language -> context.config().getStringArray("sonar." + language + ".file.suffixes"))
+ .flatMap(Stream::of)
+ .collect(Collectors.toList());
+
String filesGlob = "**" + File.separator + "*{" + String.join(",", suffixes) + "}";
String filesToAnalyze = Paths.get(projectBaseDir, "TOREPLACE").toString();
filesToAnalyze = filesToAnalyze.replace("TOREPLACE", filesGlob);