Skip to content

Commit e549f2f

Browse files
committed
renamed QMark to QuestionMark
1 parent a25c99e commit e549f2f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/services/formatting/rules.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ module ts.formatting {
3535
// Space after keyword but not before ; or : or ?
3636
public NoSpaceBeforeSemicolon: Rule;
3737
public NoSpaceBeforeColon: Rule;
38-
public NoSpaceBeforeQMark: Rule;
38+
public NoSpaceBeforeQuestionMark: Rule;
3939
public SpaceAfterColon: Rule;
4040
// insert space after '?' only when it is used in conditional operator
41-
public SpaceAfterQMarkInConditionalOperator: Rule;
41+
public SpaceAfterQuestionMarkInConditionalOperator: Rule;
4242
// in other cases there should be no space between '?' and next token
43-
public NoSpaceAfterQMark: Rule;
43+
public NoSpaceAfterQuestionMark: Rule;
4444

4545
public SpaceAfterSemicolon: Rule;
4646

@@ -219,10 +219,10 @@ module ts.formatting {
219219
// Space after keyword but not before ; or : or ?
220220
this.NoSpaceBeforeSemicolon = new Rule(RuleDescriptor.create2(Shared.TokenRange.Any, SyntaxKind.SemicolonToken), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Delete));
221221
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));
223223
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));
226226
this.SpaceAfterSemicolon = new Rule(RuleDescriptor.create3(SyntaxKind.SemicolonToken, Shared.TokenRange.Any), RuleOperation.create2(new RuleOperationContext(Rules.IsSameLineTokenContext), RuleAction.Space));
227227

228228
// Space after }.
@@ -346,8 +346,8 @@ module ts.formatting {
346346
this.HighPriorityCommonRules =
347347
[
348348
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,
351351
this.NoSpaceBeforeDot, this.NoSpaceAfterDot,
352352
this.NoSpaceAfterUnaryPrefixOperator,
353353
this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator,

0 commit comments

Comments
 (0)