fix(preprocessor): Better handling of failing preprocessors

dignifiedquire · dignifiedquire · commit a2376b826ca2 · 2015-07-28T20:18:21.000+02:00
Closes #1521
diff --git a/lib/preprocessor.js b/lib/preprocessor.js
@@ -39,6 +39,8 @@ var createPreprocessor = function (config, basePath, injector) {
 
       alreadyDisplayedWarnings[name] = true
     }
+
+    return instances[name]
   }
 
   patterns.forEach(function (pattern) {
@@ -80,9 +82,12 @@ var createPreprocessor = function (config, basePath, injector) {
             config[patterns[i]].join(', '), file.originalPath)
         } else {
           config[patterns[i]].forEach(function (name) {
-            if (!instances[name]) {
-              instantiatePreprocessor(name)
+            var p = instances[name] != null ? instances[name] : instantiatePreprocessor(name)
+
+            if (p == null) {
+              return log.warn('Could not instantiate perprocessor %s', name)
             }
+
             preprocessors.push(instances[name])
           })
         }

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ var createPreprocessor = function (config, basePath, injector) {`
`39`	`39`
`40`	`40`	`alreadyDisplayedWarnings[name] = true`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ return instances[name]`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`patterns.forEach(function (pattern) {`
`@@ -80,9 +82,12 @@ var createPreprocessor = function (config, basePath, injector) {`
`80`	`82`	`config[patterns[i]].join(', '), file.originalPath)`
`81`	`83`	`} else {`
`82`	`84`	`config[patterns[i]].forEach(function (name) {`
`83`		`- if (!instances[name]) {`
`84`		`- instantiatePreprocessor(name)`
	`85`	`+ var p = instances[name] != null ? instances[name] : instantiatePreprocessor(name)`
	`86`	`+`
	`87`	`+ if (p == null) {`
	`88`	`+ return log.warn('Could not instantiate perprocessor %s', name)`
`85`	`89`	`}`
	`90`	`+`
`86`	`91`	`preprocessors.push(instances[name])`
`87`	`92`	`})`
`88`	`93`	`}`