[couchdb-escodegen] reference refs/pull/166/merge created (now b6a8921)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a change to reference refs/pull/166/merge
in repository https://gitbox.apache.org/repos/asf/couchdb-escodegen.git.


      at b6a8921  Merge 5c290441321314bb65f875caf76d53bf21c51561 into 824f571a6826de6527bab7440f8dbaf69f5fb218

This reference includes the following new commits:

     new 5c29044  Adds padding parameter to statements so that nice output code can be generated.
     new b6a8921  Merge 5c290441321314bb65f875caf76d53bf21c51561 into 824f571a6826de6527bab7440f8dbaf69f5fb218

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-escodegen] 01/01: Merge 5c290441321314bb65f875caf76d53bf21c51561 into 824f571a6826de6527bab7440f8dbaf69f5fb218

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to reference refs/pull/166/merge
in repository https://gitbox.apache.org/repos/asf/couchdb-escodegen.git

commit b6a89211ab660bad6f2eb5c5f065e6a37ad2aad4
Merge: 824f571 5c29044
Author: James Keane <ja...@gmail.com>
AuthorDate: Tue Jan 6 16:00:23 2015 +0000

    Merge 5c290441321314bb65f875caf76d53bf21c51561 into 824f571a6826de6527bab7440f8dbaf69f5fb218

 escodegen.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --cc escodegen.js
index 9c10bf7,dff7334..87770ed
--- a/escodegen.js
+++ b/escodegen.js
@@@ -2187,9 -1997,14 +2206,14 @@@
          // Attach comments
  
          if (extra.comment) {
 -            result = addCommentsToStatement(stmt, result);
 +            result = addComments(stmt, result);
          }
  
+         // Attach newlines
+         if (extra.padding) {
+             result = addPadding(stmt, result);
+         }
+ 
          fragment = toSourceNodeWhenNeeded(result).toString();
          if (stmt.type === Syntax.Program && !safeConcatenation && newline === '' &&  fragment.charAt(fragment.length - 1) === '\n') {
              result = sourceMap ? toSourceNodeWhenNeeded(result).replaceRight(/\s+$/, '') : fragment.replace(/\s+$/, '');