Skip to content

Commit 4571e98

Browse files
gabrittogabritto
committed
rename diagnostic to status and remove snippets from public api
1 parent a639aef commit 4571e98

File tree

6 files changed

+21
-61
lines changed

6 files changed

+21
-61
lines changed

‎src/compiler/checker.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ namespace ts {
729729
isDeclarationVisible,
730730
isPropertyAccessible,
731731
getTypeOnlyAliasDeclaration,
732-
getMemberOverrideModifierDiagnostic,
732+
getMemberOverrideModifierStatus: getMemberOverrideModifierStatus,
733733
};
734734

735735
function getResolvedSignatureWorker(nodeIn: CallLikeExpression, candidatesOutArray: Signature[] | undefined, argumentCount: number | undefined, checkMode: CheckMode): Signature | undefined {
@@ -38482,12 +38482,12 @@ namespace ts {
3848238482
member: ClassElement | ParameterPropertyDeclaration,
3848338483
memberIsParameterProperty: boolean,
3848438484
reportErrors = true,
38485-
): MemberOverrideDiagnostic {
38485+
): MemberOverrideStatus {
3848638486
const declaredProp = member.name
3848738487
&& getSymbolAtLocation(member.name)
3848838488
|| getSymbolAtLocation(member);
3848938489
if (!declaredProp) {
38490-
return MemberOverrideDiagnostic.Ok;
38490+
return MemberOverrideStatus.Ok;
3849138491
}
3849238492

3849338493
return checkMemberForOverrideModifier(
@@ -38527,7 +38527,7 @@ namespace ts {
3852738527
memberIsParameterProperty: boolean,
3852838528
memberName: string,
3852938529
errorNode?: Node,
38530-
): MemberOverrideDiagnostic {
38530+
): MemberOverrideStatus {
3853138531
const isJs = isInJSFile(node);
3853238532
const nodeInAmbientContext = !!(node.flags & NodeFlags.Ambient);
3853338533
if (baseWithThis && (memberHasOverrideModifier || compilerOptions.noImplicitOverride)) {
@@ -38556,12 +38556,12 @@ namespace ts {
3855638556
Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0,
3855738557
baseClassName);
3855838558
}
38559-
return MemberOverrideDiagnostic.HasInvalidOverride;
38559+
return MemberOverrideStatus.HasInvalidOverride;
3856038560
}
3856138561
else if (prop && baseProp?.declarations && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
3856238562
const baseHasAbstract = some(baseProp.declarations, hasAbstractModifier);
3856338563
if (memberHasOverrideModifier) {
38564-
return MemberOverrideDiagnostic.Ok;
38564+
return MemberOverrideStatus.Ok;
3856538565
}
3856638566

3856738567
if (!baseHasAbstract) {
@@ -38575,13 +38575,13 @@ namespace ts {
3857538575
Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0;
3857638576
error(errorNode, diag, baseClassName);
3857738577
}
38578-
return MemberOverrideDiagnostic.NeedsOverride;
38578+
return MemberOverrideStatus.NeedsOverride;
3857938579
}
3858038580
else if (memberHasAbstractModifier && baseHasAbstract) {
3858138581
if (errorNode) {
3858238582
error(errorNode, Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0, baseClassName);
3858338583
}
38584-
return MemberOverrideDiagnostic.NeedsOverride;
38584+
return MemberOverrideStatus.NeedsOverride;
3858538585
}
3858638586
}
3858738587
}
@@ -38595,10 +38595,10 @@ namespace ts {
3859538595
Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class,
3859638596
className);
3859738597
}
38598-
return MemberOverrideDiagnostic.HasInvalidOverride;
38598+
return MemberOverrideStatus.HasInvalidOverride;
3859938599
}
3860038600

38601-
return MemberOverrideDiagnostic.Ok;
38601+
return MemberOverrideStatus.Ok;
3860238602
}
3860338603

3860438604
function issueMemberSpecificError(node: ClassLikeDeclaration, typeWithThis: Type, baseWithThis: Type, broadDiag: DiagnosticMessage) {
@@ -38651,9 +38651,9 @@ namespace ts {
3865138651
* @param member Member declaration node.
3865238652
* Note: `member` can be a synthetic node without a parent.
3865338653
*/
38654-
function getMemberOverrideModifierDiagnostic(node: ClassLikeDeclaration, member: ClassElement): MemberOverrideDiagnostic {
38654+
function getMemberOverrideModifierStatus(node: ClassLikeDeclaration, member: ClassElement): MemberOverrideStatus {
3865538655
if (!member.name) {
38656-
return MemberOverrideDiagnostic.Ok;
38656+
return MemberOverrideStatus.Ok;
3865738657
}
3865838658

3865938659
const symbol = getSymbolOfNode(node);

‎src/compiler/factory/emitNode.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,15 @@ namespace ts {
259259
/**
260260
* Gets the SnippetElement of a node.
261261
*/
262+
/* @internal */
262263
export function getSnippetElement(node: Node): SnippetElement | undefined {
263264
return node.emitNode?.snippetElement;
264265
}
265266

266267
/**
267268
* Sets the SnippetElement of a node.
268269
*/
270+
/* @internal */
269271
export function setSnippetElement<T extends Node>(node: T, snippet: SnippetElement): T {
270272
const emitNode = getOrCreateEmitNode(node);
271273
emitNode.snippetElement = snippet;

‎src/compiler/types.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4412,11 +4412,11 @@ namespace ts {
44124412
/* @internal */ isDeclarationVisible(node: Declaration | AnyImportSyntax): boolean;
44134413
/* @internal */ isPropertyAccessible(node: Node, isSuper: boolean, isWrite: boolean, containingType: Type, property: Symbol): boolean;
44144414
/* @internal */ getTypeOnlyAliasDeclaration(symbol: Symbol): TypeOnlyAliasDeclaration | undefined;
4415-
/* @internal */ getMemberOverrideModifierDiagnostic(node: ClassLikeDeclaration, member: ClassElement): MemberOverrideDiagnostic;
4415+
/* @internal */ getMemberOverrideModifierStatus(node: ClassLikeDeclaration, member: ClassElement): MemberOverrideStatus;
44164416
}
44174417

44184418
/* @internal */
4419-
export const enum MemberOverrideDiagnostic {
4419+
export const enum MemberOverrideStatus {
44204420
Ok,
44214421
NeedsOverride,
44224422
HasInvalidOverride
@@ -6812,19 +6812,23 @@ namespace ts {
68126812
snippetElement?: SnippetElement; // Snippet element of the node
68136813
}
68146814

6815+
/* @internal */
68156816
export type SnippetElement = TabStop | Placeholder;
68166817

6818+
/* @internal */
68176819
export interface TabStop {
68186820
kind: SnippetKind.TabStop;
68196821
order: number;
68206822
}
68216823

6824+
/* @internal */
68226825
export interface Placeholder {
68236826
kind: SnippetKind.Placeholder;
68246827
order: number;
68256828
}
68266829

68276830
// Reference: https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax
6831+
/* @internal */
68286832
export const enum SnippetKind {
68296833
TabStop, // `$1`, `$2`
68306834
Placeholder, // `${1:foo}`

‎src/services/completions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ namespace ts.Completions {
901901
}
902902
}
903903
if (isClassElement(node)
904-
&& checker.getMemberOverrideModifierDiagnostic(classLikeDeclaration, node) === MemberOverrideDiagnostic.NeedsOverride) {
904+
&& checker.getMemberOverrideModifierStatus(classLikeDeclaration, node) === MemberOverrideStatus.NeedsOverride) {
905905
requiredModifiers |= ModifierFlags.Override;
906906
}
907907

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3229,21 +3229,6 @@ declare namespace ts {
32293229
text: string;
32303230
skipTrivia?: (pos: number) => number;
32313231
}
3232-
export type SnippetElement = TabStop | Placeholder;
3233-
export interface TabStop {
3234-
kind: SnippetKind.TabStop;
3235-
order: number;
3236-
}
3237-
export interface Placeholder {
3238-
kind: SnippetKind.Placeholder;
3239-
order: number;
3240-
}
3241-
export enum SnippetKind {
3242-
TabStop = 0,
3243-
Placeholder = 1,
3244-
Choice = 2,
3245-
Variable = 3
3246-
}
32473232
export enum EmitFlags {
32483233
None = 0,
32493234
SingleLine = 1,
@@ -4536,14 +4521,6 @@ declare namespace ts {
45364521
* Moves matching emit helpers from a source node to a target node.
45374522
*/
45384523
function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean): void;
4539-
/**
4540-
* Gets the SnippetElement of a node.
4541-
*/
4542-
function getSnippetElement(node: Node): SnippetElement | undefined;
4543-
/**
4544-
* Sets the SnippetElement of a node.
4545-
*/
4546-
function setSnippetElement<T extends Node>(node: T, snippet: SnippetElement): T;
45474524
}
45484525
declare namespace ts {
45494526
function isNumericLiteral(node: Node): node is NumericLiteral;

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3229,21 +3229,6 @@ declare namespace ts {
32293229
text: string;
32303230
skipTrivia?: (pos: number) => number;
32313231
}
3232-
export type SnippetElement = TabStop | Placeholder;
3233-
export interface TabStop {
3234-
kind: SnippetKind.TabStop;
3235-
order: number;
3236-
}
3237-
export interface Placeholder {
3238-
kind: SnippetKind.Placeholder;
3239-
order: number;
3240-
}
3241-
export enum SnippetKind {
3242-
TabStop = 0,
3243-
Placeholder = 1,
3244-
Choice = 2,
3245-
Variable = 3
3246-
}
32473232
export enum EmitFlags {
32483233
None = 0,
32493234
SingleLine = 1,
@@ -4536,14 +4521,6 @@ declare namespace ts {
45364521
* Moves matching emit helpers from a source node to a target node.
45374522
*/
45384523
function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean): void;
4539-
/**
4540-
* Gets the SnippetElement of a node.
4541-
*/
4542-
function getSnippetElement(node: Node): SnippetElement | undefined;
4543-
/**
4544-
* Sets the SnippetElement of a node.
4545-
*/
4546-
function setSnippetElement<T extends Node>(node: T, snippet: SnippetElement): T;
45474524
}
45484525
declare namespace ts {
45494526
function isNumericLiteral(node: Node): node is NumericLiteral;

0 commit comments

Comments
 (0)