Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add basic test cases for accessors in interfaces and ambient classes

Browse Source
This commit is contained in:
Ron Buckton
2019-08-07 16:26:08 -07:00
parent 77fc6f3b2e
commit 4e8ffd8e4f
10 changed files with 168 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+8 -6
View File
@@ -33082,13 +33082,15 @@ namespace ts {
function checkGrammarAccessor(accessor: AccessorLike): boolean {
if (isAccessorDeclaration(accessor)) {
if (languageVersion < ScriptTarget.ES5) {
return grammarErrorOnNode(accessor.name, Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher);
if (!(accessor.flags & NodeFlags.Ambient)) {
if (languageVersion < ScriptTarget.ES5) {
return grammarErrorOnNode(accessor.name, Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher);
}
else if (accessor.body === undefined && !hasModifier(accessor, ModifierFlags.Abstract) && !(accessor.flags & NodeFlags.Ambient)) {
return grammarErrorAtPos(accessor, accessor.end - 1, ";".length, Diagnostics._0_expected, "{");
}
}
else if (accessor.body === undefined && !hasModifier(accessor, ModifierFlags.Abstract) && !(accessor.flags & NodeFlags.Ambient)) {
return grammarErrorAtPos(accessor, accessor.end - 1, ";".length, Diagnostics._0_expected, "{");
}
else if (accessor.body && hasModifier(accessor, ModifierFlags.Abstract)) {
if (accessor.body && hasModifier(accessor, ModifierFlags.Abstract)) {
return grammarErrorOnNode(accessor, Diagnostics.An_abstract_accessor_cannot_have_an_implementation);
}
}
src/compiler/transformers/declarations.ts
+22
View File
@@ -830,10 +830,32 @@ namespace ts {
return cleanup(sig);
}
case SyntaxKind.GetAccessor: {
// For now, only emit class accessors as accessors if they were already declared in an ambient context.
if (input.flags & NodeFlags.Ambient) {
const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input);
return cleanup(updateGetAccessor(
input,
/*decorators*/ undefined,
ensureModifiers(input),
input.name,
updateParamsList(input, input.parameters),
!hasModifier(input, ModifierFlags.Private) ? ensureType(input, accessorType) : undefined,
/*body*/ undefined));
}
const newNode = ensureAccessor(input);
return cleanup(newNode);
}
case SyntaxKind.SetAccessor: {
// For now, only emit class accessors as accessors if they were already declared in an ambient context.
if (input.flags & NodeFlags.Ambient) {
return cleanup(updateSetAccessor(
input,
/*decorators*/ undefined,
ensureModifiers(input),
input.name,
updateParamsList(input, input.parameters),
/*body*/ undefined));
}
const newNode = ensureAccessor(input);
return cleanup(newNode);
}
tests/baselines/reference/ambientAccessors(target=es3).js
+19
View File
@@ -0,0 +1,19 @@
//// [ambientAccessors.ts]
// ok to use accessors in ambient class in ES3
declare class C {
get x(): string;
set x(value: string);
static get y(): string;
static set y(value: string);
}
//// [ambientAccessors.js]
//// [ambientAccessors.d.ts]
declare class C {
get x(): string;
set x(value: string);
static get y(): string;
static set y(value: string);
}
tests/baselines/reference/ambientAccessors(target=es3).symbols
+19
View File
@@ -0,0 +1,19 @@
=== tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts ===
// ok to use accessors in ambient class in ES3
declare class C {
>C : Symbol(C, Decl(ambientAccessors.ts, 0, 0))
get x(): string;
>x : Symbol(C.x, Decl(ambientAccessors.ts, 1, 17), Decl(ambientAccessors.ts, 2, 20))
set x(value: string);
>x : Symbol(C.x, Decl(ambientAccessors.ts, 1, 17), Decl(ambientAccessors.ts, 2, 20))
>value : Symbol(value, Decl(ambientAccessors.ts, 3, 10))
static get y(): string;
>y : Symbol(C.y, Decl(ambientAccessors.ts, 3, 25), Decl(ambientAccessors.ts, 4, 27))
static set y(value: string);
>y : Symbol(C.y, Decl(ambientAccessors.ts, 3, 25), Decl(ambientAccessors.ts, 4, 27))
>value : Symbol(value, Decl(ambientAccessors.ts, 5, 17))
}
tests/baselines/reference/ambientAccessors(target=es3).types
+19
View File
@@ -0,0 +1,19 @@
=== tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts ===
// ok to use accessors in ambient class in ES3
declare class C {
>C : C
get x(): string;
>x : string
set x(value: string);
>x : string
>value : string
static get y(): string;
>y : string
static set y(value: string);
>y : string
>value : string
}
tests/baselines/reference/ambientAccessors(target=es5).js
+19
View File
@@ -0,0 +1,19 @@
//// [ambientAccessors.ts]
// ok to use accessors in ambient class in ES3
declare class C {
get x(): string;
set x(value: string);
static get y(): string;
static set y(value: string);
}
//// [ambientAccessors.js]
//// [ambientAccessors.d.ts]
declare class C {
get x(): string;
set x(value: string);
static get y(): string;
static set y(value: string);
}
tests/baselines/reference/ambientAccessors(target=es5).symbols
+19
View File
@@ -0,0 +1,19 @@
=== tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts ===
// ok to use accessors in ambient class in ES3
declare class C {
>C : Symbol(C, Decl(ambientAccessors.ts, 0, 0))
get x(): string;
>x : Symbol(C.x, Decl(ambientAccessors.ts, 1, 17), Decl(ambientAccessors.ts, 2, 20))
set x(value: string);
>x : Symbol(C.x, Decl(ambientAccessors.ts, 1, 17), Decl(ambientAccessors.ts, 2, 20))
>value : Symbol(value, Decl(ambientAccessors.ts, 3, 10))
static get y(): string;
>y : Symbol(C.y, Decl(ambientAccessors.ts, 3, 25), Decl(ambientAccessors.ts, 4, 27))
static set y(value: string);
>y : Symbol(C.y, Decl(ambientAccessors.ts, 3, 25), Decl(ambientAccessors.ts, 4, 27))
>value : Symbol(value, Decl(ambientAccessors.ts, 5, 17))
}
tests/baselines/reference/ambientAccessors(target=es5).types
+19
View File
@@ -0,0 +1,19 @@
=== tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts ===
// ok to use accessors in ambient class in ES3
declare class C {
>C : C
get x(): string;
>x : string
set x(value: string);
>x : string
>value : string
static get y(): string;
>y : string
static set y(value: string);
>y : string
>value : string
}
tests/cases/conformance/classes/propertyMemberDeclarations/memberAccessorDeclarations/ambientAccessors.ts
+9
View File
@@ -0,0 +1,9 @@
// @target: es3, es5
// @declaration: true
// ok to use accessors in ambient class in ES3
declare class C {
get x(): string;
set x(value: string);
static get y(): string;
static set y(value: string);
}
tests/cases/conformance/interfaces/interfaceDeclarations/interfaceWithAccessors.ts
+15
View File
@@ -0,0 +1,15 @@
// @target: esnext
// @declaration: true
interface I0 {
get x(): number;
set x(value);
}
interface I1 {
get x(): number;
}
interface I1 {
set x(value);
}