refactor loader regex patterns for different programming languages

ShMcK · ShMcK · commit 9cbf8f82ec54 · 2016-04-01T15:02:57.000-07:00
diff --git a/lib/reducers/run-tests/parse-loaders.js b/lib/reducers/run-tests/parse-loaders.js
@@ -1,25 +1,24 @@
 "use strict";
 var path = require('path');
 var fs = require('fs');
-var supportedFileTypes = ['js', 'jsx', 'ts', 'py'];
-var js = /^\/\/\s?load\(['"`](.+)['"`](\,\s?true)?\)/m;
-var loaderMatch = {
-    js: js,
-    ts: js,
-    jsx: js,
-    py: /^#\s?load\(['"`](.+)['"`](,\s?true)?\)/m
+var comments = {
+    py: '#'
 };
-function parseLoaders(data, fileType) {
-    if (supportedFileTypes.indexOf(fileType) < 0) {
-        console.log("File type \"" + fileType + "\" not supported.");
-        return '';
+function loaderRegex(fileType) {
+    var comment = '\/{2,3}';
+    if (comments[fileType]) {
+        comment = comments[fileType];
     }
+    return new RegExp("^" + comment + " ?load\\(['\"](.+)['\"](,s?true)?\\)", 'm');
+}
+function parseLoaders(data, fileType) {
     var i = -1;
     var lines = data.split('\n');
     var filesLoaded = [];
+    var loaderMatch = loaderRegex(fileType);
     while (i < lines.length - 1) {
         i += 1;
-        var loader = lines[i].match(loaderMatch[fileType]);
+        var loader = lines[i].match(loaderMatch);
         if (loader) {
             var fileToLoad = loader[1];
             if (filesLoaded.indexOf(fileToLoad) > -1) {
diff --git a/src/reducers/run-tests/parse-loaders.ts b/src/reducers/run-tests/parse-loaders.ts
@@ -1,31 +1,31 @@
 import * as path from 'path';
 import * as fs from 'fs';
 
-const supportedFileTypes = ['js', 'jsx', 'ts', 'py'];
-const js = /^\/\/\s?load\(['"`](.+)['"`](\,\s?true)?\)/m; // // load('file'),
-const loaderMatch = {
-  js,
-  ts: js,
-  jsx: js,
-  py: /^#\s?load\(['"`](.+)['"`](,\s?true)?\)/m      // # load('file')
+// other languages may handle comments differently
+const comments = {
+  py: '#'
 };
 
-export default function parseLoaders(data: string, fileType: string) {
-
-  if (supportedFileTypes.indexOf(fileType) < 0) {
-    console.log(`File type "${fileType}" not supported.`);
-    return '';
+function loaderRegex(fileType: string) {
+  let comment = '\/{2,3}';
+  if (comments[fileType]) {
+    comment = comments[fileType];
   }
+  return new RegExp(`^${comment} ?load\\(['"](.+)['"](\,\s?true)?\\)`, 'm');
+}
+
+export default function parseLoaders(data: string, fileType: string) {
 
   // loop over lines and add editor files
   let i = -1;
   let lines = data.split('\n');
 
   let filesLoaded = [];
+  let loaderMatch = loaderRegex(fileType);
 
   while (i < lines.length - 1) {
     i += 1;
-    let loader: string[] = lines[i].match(loaderMatch[fileType]);
+    let loader: string[] = lines[i].match(loaderMatch);
 
     if (loader) {
       // loader found
diff --git a/src/reducers/task-tests/task-tests.ts b/src/reducers/task-tests/task-tests.ts
@@ -1,7 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs';
 import * as Type from '../../actions/actionTypes';
-import concatTests from './concat-tests';
 
 export default function taskTestsReducer(taskTests = '', action: CR.Action): string {
   switch (action.type) {
