@@ -3033,7 +3033,7 @@ module ts {
3033
3033
return false ;
3034
3034
}
3035
3035
3036
- function indentIfOnDifferentLines ( parent : Node , node1 : Node , node2 : Node , insertIfNoIndentValue ?: string ) {
3036
+ function indentIfOnDifferentLines ( parent : Node , node1 : Node , node2 : Node , valueToWriteWhenNotIndenting ?: string ) {
3037
3037
// Use a newline for existin code if the original had one, and we're preserving formatting.
3038
3038
var realNodesAreOnDifferentLines = preserveNewLines && ! nodeIsSynthesized ( parent ) && ! nodeEndIsOnSameLineAsNodeStart ( node1 , node2 ) ;
3039
3039
@@ -3046,8 +3046,8 @@ module ts {
3046
3046
return true ;
3047
3047
}
3048
3048
else {
3049
- if ( insertIfNoIndentValue ) {
3050
- write ( insertIfNoIndentValue ) ;
3049
+ if ( valueToWriteWhenNotIndenting ) {
3050
+ write ( valueToWriteWhenNotIndenting ) ;
3051
3051
}
3052
3052
return false ;
3053
3053
}
@@ -3059,15 +3059,11 @@ module ts {
3059
3059
}
3060
3060
3061
3061
emit ( node . expression ) ;
3062
-
3063
- var indentBeforeDot = indentIfOnDifferentLines ( node , node . expression , node . dotToken ) ;
3062
+ var indentedBeforeDot = indentIfOnDifferentLines ( node , node . expression , node . dotToken ) ;
3064
3063
write ( "." ) ;
3065
-
3066
- var indentAfterDot = indentIfOnDifferentLines ( node , node . dotToken , node . name ) ;
3064
+ var indentedAfterDot = indentIfOnDifferentLines ( node , node . dotToken , node . name ) ;
3067
3065
emit ( node . name ) ;
3068
-
3069
- decreaseIndentIf ( indentBeforeDot ) ;
3070
- decreaseIndentIf ( indentAfterDot ) ;
3066
+ decreaseIndentIf ( indentedBeforeDot , indentedAfterDot ) ;
3071
3067
}
3072
3068
3073
3069
function emitQualifiedName ( node : QualifiedName ) {
@@ -3300,15 +3296,11 @@ module ts {
3300
3296
}
3301
3297
else {
3302
3298
emit ( node . left ) ;
3303
-
3304
- var indentBeforeOperator = indentIfOnDifferentLines ( node , node . left , node . operatorToken , node . operatorToken . kind !== SyntaxKind . CommaToken ? " " : undefined ) ;
3299
+ var indentedBeforeOperator = indentIfOnDifferentLines ( node , node . left , node . operatorToken , node . operatorToken . kind !== SyntaxKind . CommaToken ? " " : undefined ) ;
3305
3300
write ( tokenToString ( node . operatorToken . kind ) ) ;
3306
-
3307
- var indentAfterOperator = indentIfOnDifferentLines ( node , node . operatorToken , node . right , " " ) ;
3301
+ var indentedAfterOperator = indentIfOnDifferentLines ( node , node . operatorToken , node . right , " " ) ;
3308
3302
emit ( node . right ) ;
3309
-
3310
- decreaseIndentIf ( indentBeforeOperator ) ;
3311
- decreaseIndentIf ( indentAfterOperator ) ;
3303
+ decreaseIndentIf ( indentedBeforeOperator , indentedAfterOperator ) ;
3312
3304
}
3313
3305
}
3314
3306
@@ -3318,23 +3310,23 @@ module ts {
3318
3310
3319
3311
function emitConditionalExpression ( node : ConditionalExpression ) {
3320
3312
emit ( node . condition ) ;
3321
- var indentBeforeQuestion = indentIfOnDifferentLines ( node , node . condition , node . questionToken , " " ) ;
3313
+ var indentedBeforeQuestion = indentIfOnDifferentLines ( node , node . condition , node . questionToken , " " ) ;
3322
3314
write ( "?" ) ;
3323
- var indentAfterQuestion = indentIfOnDifferentLines ( node , node . questionToken , node . whenTrue , " " ) ;
3315
+ var indentedAfterQuestion = indentIfOnDifferentLines ( node , node . questionToken , node . whenTrue , " " ) ;
3324
3316
emit ( node . whenTrue ) ;
3325
- decreaseIndentIf ( indentBeforeQuestion ) ;
3326
- decreaseIndentIf ( indentAfterQuestion ) ;
3327
-
3328
- var indentBeforeColon = indentIfOnDifferentLines ( node , node . whenTrue , node . colonToken , " " ) ;
3317
+ decreaseIndentIf ( indentedBeforeQuestion , indentedAfterQuestion ) ;
3318
+ var indentedBeforeColon = indentIfOnDifferentLines ( node , node . whenTrue , node . colonToken , " " ) ;
3329
3319
write ( ":" ) ;
3330
- var indentAfterColon = indentIfOnDifferentLines ( node , node . colonToken , node . whenFalse , " " ) ;
3320
+ var indentedAfterColon = indentIfOnDifferentLines ( node , node . colonToken , node . whenFalse , " " ) ;
3331
3321
emit ( node . whenFalse ) ;
3332
- decreaseIndentIf ( indentBeforeColon ) ;
3333
- decreaseIndentIf ( indentAfterColon ) ;
3322
+ decreaseIndentIf ( indentedBeforeColon , indentedAfterColon ) ;
3334
3323
}
3335
3324
3336
- function decreaseIndentIf ( value : boolean ) {
3337
- if ( value ) {
3325
+ function decreaseIndentIf ( value1 : boolean , value2 ?: boolean ) {
3326
+ if ( value1 ) {
3327
+ decreaseIndent ( ) ;
3328
+ }
3329
+ if ( value2 ) {
3338
3330
decreaseIndent ( ) ;
3339
3331
}
3340
3332
}
0 commit comments