Ensure bracketsNewLine options for all templates

Author: Filippo Conti

node_translators/class.js

@@ -32,7 +32,11 @@ module.exports = function (node, indent) {
 
  // begin curly brace
  if (node.name) {
- str += this.nl + indent + '{' + this.nl;
+ if( this.options.bracketsNewLine ) {
+ str += this.nl + indent + '{' + this.nl;
+ } else {
+ str += this.ws + '{' + this.nl;
+ }
  } else {
  str += this.ws + '{' + this.nl;
  }

node_translators/function.js

@@ -29,7 +29,7 @@ module.exports = function(node, indent) {
  if (this.options.bracketsNewLine) {
  str += this.nl + indent + '{' + this.nl;
  } else {
- str += '{' + this.nl;
+ str += this.ws + '{' + this.nl;
  }
 
  str += doBody(codegen, indent, this.indent, this.nl, node.body.children);

node_translators/index.js

@@ -2,13 +2,10 @@
 'use strict';
 
 function CodeGen(options) {
- 
- this.ws = ' ';
- if (options.dontUseWhitespaces) {
- this.ws = '';
- }
 
+ // Get options
  this.options = options;
+ this.ws = options.dontUseWhitespaces ? '' : ' ';
  this.indent = typeof options.indent === 'string' ? options.indent : ' ';
  this.nl = this.indent !== '' ? '\n' : '';
  this.shortArray = options.shortArray || false;
@@ -31,9 +28,7 @@ function CodeGen(options) {
  )
  );
  } else {
- err = new Error(
- 'Bad AST structure'
- );
+ err = new Error('Bad AST structure');
  }
  err.node = node;
  throw err;

node_translators/interface.js

@@ -18,7 +18,11 @@ module.exports = function (node, indent) {
  }
 
  // begin curly brace
- str += this.nl + indent + '{' + this.nl;
+ if( this.options.bracketsNewLine ) {
+ str += this.nl + indent + '{' + this.nl;
+ } else {
+ str += this.ws + '{' + this.nl;
+ }
 
  // interface body
  str += doBody(codegen, indent, this.indent, this.nl, node.body);

node_translators/method.js

@@ -48,7 +48,7 @@ module.exports = function(node, indent) {
  if (this.options.bracketsNewLine) {
  str += this.nl + indent + '{' + this.nl;
  } else {
- str += '{' + this.nl;
+ str +=  this.ws + '{' + this.nl;
  }
 
  str += doBody(codegen, indent, this.indent, this.nl, node.body.children);

node_translators/namespace.js

@@ -5,7 +5,6 @@ var body = require('./helper/body');
 module.exports = function (node, indent) {
  var str, codegen;
 
-
  str = 'namespace ' + node.name + this.ws + '\n{\n\n';
  codegen = this.process.bind(this);
  str += body(codegen, indent, this.indent, this.nl, node.children);

node_translators/trait.js

@@ -18,7 +18,11 @@ module.exports = function (node, indent) {
  }
 
  // begin curly brace
- str += this.nl + indent + '{' + this.nl;
+ if( this.options.bracketsNewLine ) {
+ str += this.nl + indent + '{' + this.nl;
+ } else {
+ str += this.ws + '{' + this.nl;
+ }
 
  // trait body
  str += doBody(codegen, indent, this.indent, this.nl, node.body);