fix JSX expression indentation bug (#5056)

* fix JSX expression indentation bug

* fixes from code review

* tweak test

Author: helixbass

lib/coffeescript/lexer.js

@@ -794,6 +794,8 @@ exports.Lexer = class Lexer
 
       # Remove leading `'TERMINATOR'` (if any).
       nested.splice 1, 1 if nested[1]?[0] is 'TERMINATOR'
+      # Remove trailing `'INDENT'/'OUTDENT'` pair (if any).
+      nested.splice -3, 2 if nested[nested.length - 3]?[0] is 'INDENT' and nested[nested.length - 2][0] is 'OUTDENT'
 
       unless braceInterpolator
         # We are not using `{` and `}`, so wrap the interpolated tokens instead.

src/lexer.coffee

@@ -786,3 +786,38 @@ test 'JSX fragments: fragment with component nodes', ->
       </Fragment>;
     };
   '''
+
+test '#5055: JSX expression indentation bug', ->
+  eqJS '''
+    <div>
+      {someCondition &&
+        <span />
+      }
+    </div>
+  ''', '''
+    <div>
+      {someCondition && <span />}
+    </div>;
+  '''
+
+  eqJS '''
+    <div>{someString +
+         "abc"
+      }
+    </div>
+  ''', '''
+    <div>{someString + "abc"}
+    </div>;
+  '''
+
+  eqJS '''
+    <div>
+      {a ?
+      <span />
+      }
+    </div>
+  ''', '''
+    <div>
+      {typeof a !== "undefined" && a !== null ? a : <span />}
+    </div>;
+  '''