Merge pull request #1529 from jparet/master

 Overdrive the default args with the customed ones

Author: rgbkrk

lib/runner.js

@@ -149,7 +149,21 @@ export default class Runner {
   }
 
   args(codeContext, extraArgs) {
-    let args = (this.scriptOptions.cmdArgs.concat(extraArgs)).concat(this.scriptOptions.scriptArgs);
+    // extraArgs = default command args from:
+    // - the grammars/<grammar>.coffee file
+
+    // cmdArgs = customed command args from:
+    // - a user's profil
+    // - the 'Configure Run Options' panel
+    const cmdArgs = this.scriptOptions.cmdArgs;
+
+    // Let's overdrive the default args with the customed ones
+    let args = (cmdArgs.length) ? cmdArgs : extraArgs;
+
+    // Do not forget to concat the script args after the command args
+    const scriptArgs = this.scriptOptions.scriptArgs;
+    args = args.concat(scriptArgs);
+
     const projectPath = this.getProjectPath || '';
     args = (args.map(arg => this.fillVarsInArg(arg, codeContext, projectPath)));