Merge branch 'drywolf-master' providing TSX support

Pablissimo · Apr 6, 2016 · e20aa6d · e20aa6d
2 parents 3a8f392 + 7deef0b
commit e20aa6d
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 16 deletions.
diff --git a/src/main/java/com/pablissimo/sonar/TsCoverageSensor.java b/src/main/java/com/pablissimo/sonar/TsCoverageSensor.java
@@ -51,7 +51,7 @@ public TsCoverageSensor(FileSystem moduleFileSystem, Settings settings) {
     }
 
     public boolean shouldExecuteOnProject(Project project) {
-        return moduleFileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_EXTENSION)).iterator().hasNext();
+        return moduleFileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_KEY)).iterator().hasNext();
     }
 
     public void analyse(Project project, SensorContext context) {
@@ -66,7 +66,7 @@ public void analyse(Project project, SensorContext context) {
     }
 
     protected void saveZeroValueForAllFiles(Project project, SensorContext context) {
-        for (File file : moduleFileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_EXTENSION))) {
+        for (File file : moduleFileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_KEY))) {
             saveZeroValueForResource(this.fileFromIoFile(file, project), context);
         }
     }
@@ -85,7 +85,7 @@ protected void saveMeasureFromLCOVFile(Project project, SensorContext context) {
         LCOVParser parser = getParser(moduleFileSystem.baseDir());
         Map<String, CoverageMeasuresBuilder> coveredFiles = parser.parseFile(lcovFile);
 
-        for (File file : moduleFileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_EXTENSION))) {
+        for (File file : moduleFileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_KEY))) {
             try {
                 CoverageMeasuresBuilder fileCoverage = coveredFiles.get(file.getAbsolutePath());
                 org.sonar.api.resources.File resource = this.fileFromIoFile(file, project);

diff --git a/src/main/java/com/pablissimo/sonar/TsLintSensor.java b/src/main/java/com/pablissimo/sonar/TsLintSensor.java
@@ -60,7 +60,7 @@ public boolean shouldExecuteOnProject(Project project) {
     }
 
     private boolean hasFilesToAnalyze() {
-        return fileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_EXTENSION)).iterator().hasNext();
+        return fileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_KEY)).iterator().hasNext();
     }
 
     public void analyse(Project project, SensorContext context) {
@@ -90,7 +90,7 @@ else if (pathToTsLintConfig == null) {
             ruleNames.add(rule.getKey());
         }
 
-        for (File file : fileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_EXTENSION))) {
+        for (File file : fileSystem.files(this.filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_KEY))) {
             if (skipTypeDefFiles && file.getName().toLowerCase().endsWith("." + TypeScriptLanguage.LANGUAGE_DEFINITION_EXTENSION)) {
                 continue;
             }

diff --git a/src/main/java/com/pablissimo/sonar/TsRulesDefinition.java b/src/main/java/com/pablissimo/sonar/TsRulesDefinition.java
@@ -68,7 +68,7 @@ public class TsRulesDefinition implements RulesDefinition {
     public void define(Context context) {
         NewRepository repository =
                 context
-                .createRepository(REPOSITORY_NAME, TypeScriptLanguage.LANGUAGE_EXTENSION)
+                .createRepository(REPOSITORY_NAME, TypeScriptLanguage.LANGUAGE_KEY)
                 .setName("TsLint Analyser");
 
         repository.createRule(RULE_TSLINT_ISSUE).setName("tslint issues that are not yet known to the plugin").setSeverity(Severity.MAJOR);

diff --git a/src/main/java/com/pablissimo/sonar/TypeScriptLanguage.java b/src/main/java/com/pablissimo/sonar/TypeScriptLanguage.java
@@ -4,14 +4,15 @@
 
 public class TypeScriptLanguage extends AbstractLanguage {
     public static final String LANGUAGE_NAME = "TypeScript";
-    public static final String LANGUAGE_EXTENSION = "ts";
+    public static final String LANGUAGE_KEY = "ts";
+    public static final String[] LANGUAGE_EXTENSIONS = { "ts", "tsx" };
     public static final String LANGUAGE_DEFINITION_EXTENSION = "d.ts";
 
     public TypeScriptLanguage(){
-        super(LANGUAGE_EXTENSION, LANGUAGE_NAME);
+        super(LANGUAGE_KEY, LANGUAGE_NAME);
     }
 
     public String[] getFileSuffixes() {
-        return new String[]{ LANGUAGE_EXTENSION };
+        return LANGUAGE_EXTENSIONS;
     }
 }
diff --git a/src/main/java/com/pablissimo/sonar/TypeScriptRuleProfile.java b/src/main/java/com/pablissimo/sonar/TypeScriptRuleProfile.java
@@ -10,7 +10,7 @@ public class TypeScriptRuleProfile extends ProfileDefinition {
 
     @Override
     public RulesProfile createProfile(ValidationMessages validation) {
-        RulesProfile profile = RulesProfile.create("TsLint", TypeScriptLanguage.LANGUAGE_EXTENSION);
+        RulesProfile profile = RulesProfile.create("TsLint", TypeScriptLanguage.LANGUAGE_KEY);
 
         activateRule(profile, TsRulesDefinition.RULE_TSLINT_ISSUE);
         activateRule(profile, TsRulesDefinition.RULE_ALIGN);

diff --git a/src/test/java/com/pablissimo/sonar/LOCSensorTest.java b/src/test/java/com/pablissimo/sonar/LOCSensorTest.java
@@ -59,7 +59,7 @@ public void setUp() throws Exception {
 
         this.filePredicates = mock(FilePredicates.class);
         when(this.fileSystem.predicates()).thenReturn(this.filePredicates);
-        when(filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_EXTENSION)).thenReturn(this.predicate);
+        when(filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_KEY)).thenReturn(this.predicate);
         when(fileSystem.hasFiles(this.predicate)).thenReturn(true);
 
         this.sensor = spy(new LOCSensor(this.fileSystem));

diff --git a/src/test/java/com/pablissimo/sonar/TsCoverageSensorTest.java b/src/test/java/com/pablissimo/sonar/TsCoverageSensorTest.java
@@ -57,7 +57,7 @@ public void setUp() throws Exception {
 
         this.filePredicates = mock(FilePredicates.class);
         when(this.fileSystem.predicates()).thenReturn(this.filePredicates);
-        when(filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_EXTENSION)).thenReturn(this.predicate);
+        when(filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_KEY)).thenReturn(this.predicate);
 
         this.sonarFile = mock(org.sonar.api.resources.File.class);
 

diff --git a/src/test/java/com/pablissimo/sonar/TsLintSensorTest.java b/src/test/java/com/pablissimo/sonar/TsLintSensorTest.java
@@ -74,7 +74,7 @@ public void setUp() throws Exception {
 
         this.filePredicates = mock(FilePredicates.class);
         when(this.fileSystem.predicates()).thenReturn(this.filePredicates);
-        when(filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_EXTENSION)).thenReturn(this.predicate);
+        when(filePredicates.hasLanguage(TypeScriptLanguage.LANGUAGE_KEY)).thenReturn(this.predicate);
 
         this.sonarFile = mock(org.sonar.api.resources.File.class);
 

diff --git a/src/test/java/com/pablissimo/sonar/TsRulesDefinitionTest.java b/src/test/java/com/pablissimo/sonar/TsRulesDefinitionTest.java
@@ -31,7 +31,7 @@ public void CreatesRepository() {
         Context context = mock(Context.class, RETURNS_DEEP_STUBS);
         this.definition.define(context);
 
-        verify(context).createRepository(eq(TsRulesDefinition.REPOSITORY_NAME), eq(TypeScriptLanguage.LANGUAGE_EXTENSION));
+        verify(context).createRepository(eq(TsRulesDefinition.REPOSITORY_NAME), eq(TypeScriptLanguage.LANGUAGE_KEY));
     }
 
     @Test

diff --git a/src/test/java/com/pablissimo/sonar/TypeScriptLanguageTest.java b/src/test/java/com/pablissimo/sonar/TypeScriptLanguageTest.java
@@ -25,10 +25,11 @@ public void identifiesCorrectly() {
     }
 
     @Test
-    public void definesCorrectExtension() {
+    public void definesCorrectExtensions() {
         String[] suffices = this.language.getFileSuffixes();
 
-        assertEquals(1, suffices.length);
+        assertEquals(2, suffices.length);
         assertEquals("ts", suffices[0]);
+		assertEquals("tsx", suffices[1]);
     }
 }