IDE-2453: Register test file extensions n4js and n4jsx in headless compiler

Author: Quang Tran

plugins/eu.numberfour.n4js.tester/src/eu/numberfour/n4js/tester/extension/TestFileExtensionsRegistry.java

@@ -19,11 +19,12 @@
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.RegistryFactory;
 
-import eu.numberfour.n4js.N4JSGlobals;
+import com.google.inject.Singleton;
 
 /**
  * This class collect test file extensions from extensions to extension point.
  */
+@Singleton
 public class TestFileExtensionsRegistry {
 	private final static Logger log = Logger.getLogger(TesterRegistry.class);
 
@@ -33,6 +34,14 @@ public class TestFileExtensionsRegistry {
 	private boolean isInitialized = false;
 	private final Collection<String> testFileExtensions = new ArrayList<>();
 
+	/**
+	 * Register a test file extension. This method should only be invoked by client code directly in headless mode. When
+	 * running in Eclipse, test file extensions will be registered via the 'testFileExtension' extension point.
+	 */
+	public void register(String testFileExtension) {
+		testFileExtensions.add(testFileExtension);
+	}
+
 	/**
 	 * Return test file extensions
 	 */
@@ -65,12 +74,7 @@ private void initialize() {
 							ex);
 				}
 			}
-		} else {
-			// Headless compiler does not use extension points. Set default file extension of tests to .n4js
-			// TODO: better way to handle this?
-			testFileExtensions.add(N4JSGlobals.N4JS_FILE_EXTENSION);
 		}
-
 	}
 
 }

tools/eu.numberfour.n4js.hlc/META-INF/MANIFEST.MF

@@ -21,5 +21,6 @@ Require-Bundle: eu.numberfour.n4js,
  eu.numberfour.n4js.tester.nodejs,
  eu.numberfour.n4js.tests.helper,
  eu.numberfour.n4js.external.libraries,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ eu.numberfour.n4jsx
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

tools/eu.numberfour.n4js.hlc/src/main/java/eu/numberfour/n4js/hlc/N4jsc.java

@@ -53,6 +53,7 @@
 import com.google.inject.Provider;
 import com.google.inject.util.Modules;
 
+import eu.numberfour.n4js.N4JSGlobals;
 import eu.numberfour.n4js.N4JSRuntimeModule;
 import eu.numberfour.n4js.N4JSStandaloneSetup;
 import eu.numberfour.n4js.binaries.BinariesPreferenceStore;
@@ -87,13 +88,15 @@
 import eu.numberfour.n4js.tester.TesterFrontEnd;
 import eu.numberfour.n4js.tester.TesterModule;
 import eu.numberfour.n4js.tester.extension.ITesterDescriptor;
+import eu.numberfour.n4js.tester.extension.TestFileExtensionsRegistry;
 import eu.numberfour.n4js.tester.extension.TesterRegistry;
 import eu.numberfour.n4js.tester.nodejs.NodeTester.NodeTesterDescriptorProvider;
 import eu.numberfour.n4js.ts.TypeExpressionsStandaloneSetup;
 import eu.numberfour.n4js.ts.TypesStandaloneSetup;
 import eu.numberfour.n4js.ts.typeRefs.TypeRefsPackage;
 import eu.numberfour.n4js.ts.types.TypesPackage;
 import eu.numberfour.n4js.utils.io.FileDeleter;
+import eu.numberfour.n4jsx.N4JSXGlobals;
 
 /**
  * N4JS Compiler.
@@ -310,6 +313,9 @@ public class N4jsc {
 	@Inject
 	private TypeDefinitionGitLocationProvider gitLocationProvider;
 
+	@Inject
+	private TestFileExtensionsRegistry testFileExtensionRegister;
+
 	/**
 	 * Entry point to start the compiler. Parses the Parameters.
 	 *
@@ -375,9 +381,11 @@ void doMain(String[] args) throws ExitCodeException {
 			// help.
 			initInjection(refProperties());
 
-			// Wire up available runners and testers.
+			// Wire up available runners and testers and test file extensions
 			runnerRegistry.register(nodeRunnerDescriptorProvider.get());
 			testerRegistry.register(nodeTesterDescriptorProvider.get());
+			testFileExtensionRegister.register(N4JSGlobals.N4JS_FILE_EXTENSION);
+			testFileExtensionRegister.register(N4JSXGlobals.N4JSX_FILE_EXTENSION);
 
 			if (listRunners) {
 				printAvailableRunners(System.out);