fix(@angular/cli): correctly build completion with blueprints and opt…

…ions

before, if both blueprints and options are present, a space was missing between
them, resulting in "service--dryrun" instead of "service --dryrun"

Patch v2:
* use template string
* fix indentation of generated bash output

packages/@angular/cli/commands/completion.ts

@@ -7,7 +7,7 @@ const stringUtils = require('ember-cli-string-utils');
 const Command = require('../ember-cli/lib/models/command');
 const lookupCommand = require('../ember-cli/lib/cli/lookup-command');
 
-function extractOptions(opts: any): string {
+function extractOptions(opts: any): string[] {
   const output: string[] = [];
 
   for (let index = 0; index < opts.length; index++) {
@@ -18,18 +18,18 @@ function extractOptions(opts: any): string {
     }
   }
 
-  return output.sort().join(' ');
+  return output;
 }
 
-function extractBlueprints(opts: any): string {
+function extractBlueprints(opts: any): string[] {
   const output: string[] = [];
 
   for (let index = 0; index < opts.length; index++) {
     const element = opts[index];
     output.push(element.name);
   }
 
-  return output.sort().join(' ');
+  return output;
 }
 
 export interface CompletionCommandOptions {
@@ -117,20 +117,21 @@ const CompletionCommand = Command.extend({
         });
       }
 
-      let opts = '';
+      let opts: string[] = [];
       if (command.blueprints && command.blueprints[0]) {
-        opts += extractBlueprints(command.blueprints);
+        opts = opts.concat(extractBlueprints(command.blueprints));
       }
 
       if (command.availableOptions && command.availableOptions[0]) {
-        opts += extractOptions(command.availableOptions);
-        caseBlock = caseBlock + '    ' + com.sort().join('|') + ') opts="' + opts + '" ;;\n';
+        opts = opts.concat(extractOptions(command.availableOptions));
+        const optsStr = opts.sort().join(' ');
+        caseBlock = `${caseBlock}
+             ${com.sort().join('|')}) opts="${optsStr}" ;;`;
       }
     });
 
-    caseBlock = 'ng|help) opts="' + optsNg.sort().join(' ') + '" ;;\n' +
-      caseBlock +
-      '    *) opts="" ;;';
+    caseBlock = `ng|help) opts="${optsNg.sort().join(' ')}" ;;${caseBlock}
+             *) opts="" ;;`;
 
     console.log(stripIndent`
       ###-begin-ng-completion###