@@ -35,12 +35,12 @@ module ts.formatting {
35
35
// Space after keyword but not before ; or : or ?
36
36
public NoSpaceBeforeSemicolon : Rule ;
37
37
public NoSpaceBeforeColon : Rule ;
38
- public NoSpaceBeforeQMark : Rule ;
38
+ public NoSpaceBeforeQuestionMark : Rule ;
39
39
public SpaceAfterColon : Rule ;
40
40
// insert space after '?' only when it is used in conditional operator
41
- public SpaceAfterQMarkInConditionalOperator : Rule ;
41
+ public SpaceAfterQuestionMarkInConditionalOperator : Rule ;
42
42
// in other cases there should be no space between '?' and next token
43
- public NoSpaceAfterQMark : Rule ;
43
+ public NoSpaceAfterQuestionMark : Rule ;
44
44
45
45
public SpaceAfterSemicolon : Rule ;
46
46
@@ -219,10 +219,10 @@ module ts.formatting {
219
219
// Space after keyword but not before ; or : or ?
220
220
this . NoSpaceBeforeSemicolon = new Rule ( RuleDescriptor . create2 ( Shared . TokenRange . Any , SyntaxKind . SemicolonToken ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext ) , RuleAction . Delete ) ) ;
221
221
this . NoSpaceBeforeColon = new Rule ( RuleDescriptor . create2 ( Shared . TokenRange . Any , SyntaxKind . ColonToken ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext , Rules . IsNotBinaryOpContext ) , RuleAction . Delete ) ) ;
222
- this . NoSpaceBeforeQMark = new Rule ( RuleDescriptor . create2 ( Shared . TokenRange . Any , SyntaxKind . QuestionToken ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext , Rules . IsNotBinaryOpContext ) , RuleAction . Delete ) ) ;
222
+ this . NoSpaceBeforeQuestionMark = new Rule ( RuleDescriptor . create2 ( Shared . TokenRange . Any , SyntaxKind . QuestionToken ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext , Rules . IsNotBinaryOpContext ) , RuleAction . Delete ) ) ;
223
223
this . SpaceAfterColon = new Rule ( RuleDescriptor . create3 ( SyntaxKind . ColonToken , Shared . TokenRange . Any ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext , Rules . IsNotBinaryOpContext ) , RuleAction . Space ) ) ;
224
- this . SpaceAfterQMarkInConditionalOperator = new Rule ( RuleDescriptor . create3 ( SyntaxKind . QuestionToken , Shared . TokenRange . Any ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext , Rules . IsConditionalOperatorContext ) , RuleAction . Space ) ) ;
225
- this . NoSpaceAfterQMark = new Rule ( RuleDescriptor . create3 ( SyntaxKind . QuestionToken , Shared . TokenRange . Any ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext ) , RuleAction . Delete ) ) ;
224
+ this . SpaceAfterQuestionMarkInConditionalOperator = new Rule ( RuleDescriptor . create3 ( SyntaxKind . QuestionToken , Shared . TokenRange . Any ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext , Rules . IsConditionalOperatorContext ) , RuleAction . Space ) ) ;
225
+ this . NoSpaceAfterQuestionMark = new Rule ( RuleDescriptor . create3 ( SyntaxKind . QuestionToken , Shared . TokenRange . Any ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext ) , RuleAction . Delete ) ) ;
226
226
this . SpaceAfterSemicolon = new Rule ( RuleDescriptor . create3 ( SyntaxKind . SemicolonToken , Shared . TokenRange . Any ) , RuleOperation . create2 ( new RuleOperationContext ( Rules . IsSameLineTokenContext ) , RuleAction . Space ) ) ;
227
227
228
228
// Space after }.
@@ -346,8 +346,8 @@ module ts.formatting {
346
346
this . HighPriorityCommonRules =
347
347
[
348
348
this . IgnoreBeforeComment , this . IgnoreAfterLineComment ,
349
- this . NoSpaceBeforeColon , this . SpaceAfterColon , this . NoSpaceBeforeQMark , this . SpaceAfterQMarkInConditionalOperator ,
350
- this . NoSpaceAfterQMark ,
349
+ this . NoSpaceBeforeColon , this . SpaceAfterColon , this . NoSpaceBeforeQuestionMark , this . SpaceAfterQuestionMarkInConditionalOperator ,
350
+ this . NoSpaceAfterQuestionMark ,
351
351
this . NoSpaceBeforeDot , this . NoSpaceAfterDot ,
352
352
this . NoSpaceAfterUnaryPrefixOperator ,
353
353
this . NoSpaceAfterUnaryPreincrementOperator , this . NoSpaceAfterUnaryPredecrementOperator ,
0 commit comments