remove duplicated type -- remove TriviaKind, keep TriviaSyntaxKind. (microsoft#42108)

ShuiRuTian · web-flow · commit b9ac2f50b8d6 · 2021-01-04T14:34:53.000-08:00
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -3065,14 +3065,7 @@ namespace ts {
         return !!originalKeywordKind && !isContextualKeyword(originalKeywordKind);
     }
 
-    export type TriviaKind =
-        SyntaxKind.SingleLineCommentTrivia
-        | SyntaxKind.MultiLineCommentTrivia
-        | SyntaxKind.NewLineTrivia
-        | SyntaxKind.WhitespaceTrivia
-        | SyntaxKind.ShebangTrivia
-        | SyntaxKind.ConflictMarkerTrivia;
-    export function isTrivia(token: SyntaxKind): token is TriviaKind {
+    export function isTrivia(token: SyntaxKind): token is TriviaSyntaxKind {
         return SyntaxKind.FirstTriviaToken <= token && token <= SyntaxKind.LastTriviaToken;
     }
 
diff --git a/src/services/formatting/formatting.ts b/src/services/formatting/formatting.ts
@@ -10,7 +10,7 @@ namespace ts.formatting {
         kind: T;
     }
 
-    export type TextRangeWithTriviaKind = TextRangeWithKind<TriviaKind>;
+    export type TextRangeWithTriviaKind = TextRangeWithKind<TriviaSyntaxKind>;
 
     export interface TokenInfo {
         leadingTrivia: TextRangeWithTriviaKind[] | undefined;

Original file line number	Diff line number	Diff line change
`@@ -3065,14 +3065,7 @@ namespace ts {`
`3065`	`3065`	`return !!originalKeywordKind && !isContextualKeyword(originalKeywordKind);`
`3066`	`3066`	`}`
`3067`	`3067`
`3068`		`- export type TriviaKind =`
`3069`		`- SyntaxKind.SingleLineCommentTrivia`
`3070`		`- \| SyntaxKind.MultiLineCommentTrivia`
`3071`		`- \| SyntaxKind.NewLineTrivia`
`3072`		`- \| SyntaxKind.WhitespaceTrivia`
`3073`		`- \| SyntaxKind.ShebangTrivia`
`3074`		`- \| SyntaxKind.ConflictMarkerTrivia;`
`3075`		`- export function isTrivia(token: SyntaxKind): token is TriviaKind {`
	`3068`	`+ export function isTrivia(token: SyntaxKind): token is TriviaSyntaxKind {`
`3076`	`3069`	`return SyntaxKind.FirstTriviaToken <= token && token <= SyntaxKind.LastTriviaToken;`
`3077`	`3070`	`}`
`3078`	`3071`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace ts.formatting {`
`10`	`10`	`kind: T;`
`11`	`11`	`}`
`12`	`12`
`13`		`- export type TextRangeWithTriviaKind = TextRangeWithKind<TriviaKind>;`
	`13`	`+ export type TextRangeWithTriviaKind = TextRangeWithKind<TriviaSyntaxKind>;`
`14`	`14`
`15`	`15`	`export interface TokenInfo {`
`16`	`16`	`leadingTrivia: TextRangeWithTriviaKind[] \| undefined;`