Add '--add-syntax' flag to specify additional grammars for tests

Author: 1st1

bin/syntaxdev.js

@@ -28,19 +28,23 @@ testCli.addArgument([ '--tests' ], {
     required: true
 });
 
-
 testCli.addArgument([ '--no-color' ], {
     help: "Don't use colored output",
     action: 'storeTrue',
     default: false
 });
 
-
 testCli.addArgument([ '--syntax' ], {
     help: 'Syntax file in YAML format, ex: "--syntax FooLang.YAML-tmLanguage"',
     required: true
 });
 
+testCli.addArgument([ '--add-syntax' ], {
+    help: 'Additional syntax files in YAML format',
+    nargs: '*',
+    action: 'append'
+});
+
 
 var buildCsonCli = sub.addParser('build-cson');
 
@@ -76,7 +80,9 @@ function main() {
             _.chain(options.tests).flatten().uniq().sort().value(),
             options.syntax,
             {
-                no_color: options.no_color
+                no_color: options.no_color,
+                add_syntaxes: _.chain(options.add_syntax).flatten().
+                                                    uniq().sort().value()
             }
         );
     } else if (options.command == 'build-cson') {

index.js

@@ -12,21 +12,31 @@ var chalk   = require("chalk"),
     plist   = require("plist");
 
 
-function compileGrammar(grammarFile) {
-    var tmp = temp.openSync();
+function compileGrammar(grammarFile, additionalGrammars) {
+    function _compile(filename, registry) {
+        var tmp = temp.openSync();
 
-    try {
-        var yamlSource = fs.readFileSync(grammarFile, 'utf8'),
-            yamlSchema = yaml.safeLoad(yamlSource);
+        try {
+            var yamlSource = fs.readFileSync(filename, 'utf8'),
+                yamlSchema = yaml.safeLoad(yamlSource);
 
-        fs.writeSync(tmp.fd, JSON.stringify(yamlSchema));
-        fs.closeSync(tmp.fd);
+            fs.writeSync(tmp.fd, JSON.stringify(yamlSchema));
+            fs.closeSync(tmp.fd);
 
-        var registry = new mate.GrammarRegistry,
-            grammar = registry.loadGrammarSync(tmp.path);
+            return registry.loadGrammarSync(tmp.path);
+        }
+        finally {
+            temp.cleanupSync();
+        }
     }
-    finally {
-        temp.cleanupSync();
+
+    var registry = new mate.GrammarRegistry,
+        grammar = _compile(grammarFile, registry);
+
+    if (additionalGrammars) {
+        for (var i = 0; i < additionalGrammars.length; i++) {
+            _compile(additionalGrammars[i], registry);
+        }
     }
 
     return grammar;
@@ -171,7 +181,7 @@ function testFile(file, grammar, options) {
 function test(testFiles, grammarFile, options) {
     options = options || {};
 
-    var grammar = compileGrammar(grammarFile),
+    var grammar = compileGrammar(grammarFile, options.add_syntaxes),
         sep = '--------',
         passed = 0,
         failed = 0,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "syntaxdev",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Unit testing framework for TextMate/Sublime/Atom syntaxes.",
   "main": "index.js",
   "author": "Yury Selivanov <yury@magic.io>",