Skip to content

Commit 4b7acaf

Browse files
a-tarasyuka-tarasyuk
committed
feat(44956): remove hyphen separator
1 parent e1532a1 commit 4b7acaf

17 files changed

+83
-72
lines changed

‎src/compiler/parser.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8036,6 +8036,14 @@ namespace ts {
80368036
case SyntaxKind.EndOfFileToken:
80378037
// Done
80388038
break loop;
8039+
case SyntaxKind.MinusToken:
8040+
if (state === JSDocState.SavingComments) {
8041+
pushComment(scanner.getTokenText());
8042+
}
8043+
else {
8044+
nextTokenJSDoc();
8045+
}
8046+
break;
80398047
case SyntaxKind.WhitespaceTrivia:
80408048
if (state === JSDocState.SavingComments || state === JSDocState.SavingBackticks) {
80418049
pushComment(scanner.getTokenText());

‎src/compiler/scanner.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2416,6 +2416,8 @@ namespace ts {
24162416
pos++;
24172417
}
24182418
return token = SyntaxKind.WhitespaceTrivia;
2419+
case CharacterCodes.minus:
2420+
return token = SyntaxKind.MinusToken;
24192421
case CharacterCodes.at:
24202422
return token = SyntaxKind.AtToken;
24212423
case CharacterCodes.carriageReturn:

‎src/compiler/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,7 @@ namespace ts {
734734
| SyntaxKind.Identifier
735735
| SyntaxKind.BacktickToken
736736
| SyntaxKind.HashToken
737+
| SyntaxKind.MinusToken
737738
| SyntaxKind.Unknown
738739
| KeywordSyntaxKind
739740
;

‎src/testRunner/unittests/tsserver/jsdocTag.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,11 @@ x(1)`
386386
displayPartsForJSDoc: false,
387387
tags: [{
388388
name: "param",
389-
text: "y - {@link C}"
389+
text: "y {@link C}"
390390
}],
391391
documentation: [{
392392
kind: "text",
393-
text: "- "
393+
text: ""
394394
}, {
395395
kind: "link",
396396
text: "{@link "
@@ -425,7 +425,7 @@ x(1)`
425425
text: " "
426426
}, {
427427
kind: "text",
428-
text: "- "
428+
text: ""
429429
}, {
430430
kind: "link",
431431
text: "{@link "
@@ -461,11 +461,11 @@ x(1)`
461461
displayPartsForJSDoc: false,
462462
tags: [{
463463
name: "param",
464-
text: "y - {@link C}"
464+
text: "y {@link C}"
465465
}],
466466
documentation: [{
467467
kind: "text",
468-
text: "- "
468+
text: ""
469469
}, {
470470
kind: "link",
471471
text: "{@link "
@@ -496,7 +496,7 @@ x(1)`
496496
text: " "
497497
}, {
498498
kind: "text",
499-
text: "- "
499+
text: ""
500500
}, {
501501
kind: "link",
502502
text: "{@link "
@@ -610,7 +610,7 @@ foo`
610610
text: " "
611611
}, {
612612
kind: "text",
613-
text: "- see "
613+
text: "see "
614614
}, {
615615
kind: "link",
616616
text: "{@link "
@@ -641,7 +641,7 @@ foo`
641641
displayPartsForJSDoc: false,
642642
tags: [{
643643
name: "param",
644-
text: "x - see {@link C}",
644+
text: "x see {@link C}",
645645
}],
646646
});
647647
});
@@ -659,7 +659,7 @@ foo`
659659
text: " "
660660
}, {
661661
kind: "text",
662-
text: "- see "
662+
text: "see "
663663
}, {
664664
kind: "link",
665665
text: "{@link "
@@ -686,7 +686,7 @@ foo`
686686
displayPartsForJSDoc: false,
687687
tags: [{
688688
name: "param",
689-
text: "x - see {@link C}",
689+
text: "x see {@link C}",
690690
}],
691691
});
692692
});

‎tests/baselines/reference/api/tsserverlibrary.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ declare namespace ts {
500500
export type KeywordTypeSyntaxKind = SyntaxKind.AnyKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.IntrinsicKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VoidKeyword;
501501
export type TokenSyntaxKind = SyntaxKind.Unknown | SyntaxKind.EndOfFileToken | TriviaSyntaxKind | LiteralSyntaxKind | PseudoLiteralSyntaxKind | PunctuationSyntaxKind | SyntaxKind.Identifier | KeywordSyntaxKind;
502502
export type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
503-
export type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.HashToken | SyntaxKind.Unknown | KeywordSyntaxKind;
503+
export type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.HashToken | SyntaxKind.MinusToken | SyntaxKind.Unknown | KeywordSyntaxKind;
504504
export enum NodeFlags {
505505
None = 0,
506506
Let = 1,

‎tests/baselines/reference/api/typescript.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ declare namespace ts {
500500
export type KeywordTypeSyntaxKind = SyntaxKind.AnyKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.IntrinsicKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VoidKeyword;
501501
export type TokenSyntaxKind = SyntaxKind.Unknown | SyntaxKind.EndOfFileToken | TriviaSyntaxKind | LiteralSyntaxKind | PseudoLiteralSyntaxKind | PunctuationSyntaxKind | SyntaxKind.Identifier | KeywordSyntaxKind;
502502
export type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
503-
export type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.HashToken | SyntaxKind.Unknown | KeywordSyntaxKind;
503+
export type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.GreaterThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.HashToken | SyntaxKind.MinusToken | SyntaxKind.Unknown | KeywordSyntaxKind;
504504
export enum NodeFlags {
505505
None = 0,
506506
Let = 1,

‎tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespace.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ export namespace myTypes {
5858
type typeA = string | RegExp | Array<string | RegExp>;
5959
type typeB = {
6060
/**
61-
* - Prop 1.
61+
* Prop 1.
6262
*/
6363
prop1: myTypes.typeA;
6464
/**
65-
* - Prop 2.
65+
* Prop 2.
6666
*/
6767
prop2: string;
6868
};

‎tests/baselines/reference/jsDeclarationsImportAliasExposedWithinNamespaceCjs.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ export namespace myTypes {
6666
type typeA = string | RegExp | Array<string | RegExp>;
6767
type typeB = {
6868
/**
69-
* - Prop 1.
69+
* Prop 1.
7070
*/
7171
prop1: myTypes.typeA;
7272
/**
73-
* - Prop 2.
73+
* Prop 2.
7474
*/
7575
prop2: string;
7676
};

‎tests/baselines/reference/jsDeclarationsTypedefDescriptionsPreserved.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
*/
4040
type FooOptions = {
4141
/**
42-
* - Marvin K Mooney
42+
* Marvin K Mooney
4343
*/
4444
bar: boolean;
4545
/**
46-
* - Sylvester McMonkey McBean
46+
* Sylvester McMonkey McBean
4747
*/
4848
baz: string;
4949
};
@@ -54,11 +54,11 @@ type FooOptions = {
5454
*/
5555
type BarOptions = {
5656
/**
57-
* - Marvin K Mooney
57+
* Marvin K Mooney
5858
*/
5959
bar: boolean;
6060
/**
61-
* - Sylvester McMonkey McBean
61+
* Sylvester McMonkey McBean
6262
*/
6363
baz: string;
6464
};

0 commit comments

Comments
 (0)