From c7bb95bb29cf1004686e1ad202589ba569939c78 Mon Sep 17 00:00:00 2001 From: rbuckton Date: Mon, 12 Sep 2016 14:22:25 -0700 Subject: [PATCH] Fix missing asteriskToken for target=es6/module=amd. Fixes #10857. --- src/compiler/transformers/module/module.ts | 2 +- .../baselines/reference/generatorES6InAMDModule.js | 13 +++++++++++++ .../reference/generatorES6InAMDModule.symbols | 6 ++++++ .../reference/generatorES6InAMDModule.types | 7 +++++++ tests/cases/compiler/generatorES6InAMDModule.ts | 5 +++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/generatorES6InAMDModule.js create mode 100644 tests/baselines/reference/generatorES6InAMDModule.symbols create mode 100644 tests/baselines/reference/generatorES6InAMDModule.types create mode 100644 tests/cases/compiler/generatorES6InAMDModule.ts diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts index 61db452cf5..da7bf32f80 100644 --- a/src/compiler/transformers/module/module.ts +++ b/src/compiler/transformers/module/module.ts @@ -705,7 +705,7 @@ namespace ts { createFunctionDeclaration( /*decorators*/ undefined, /*modifiers*/ undefined, - /*asteriskToken*/ undefined, + node.asteriskToken, name, /*typeParameters*/ undefined, node.parameters, diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js new file mode 100644 index 0000000000..594d2c3263 --- /dev/null +++ b/tests/baselines/reference/generatorES6InAMDModule.js @@ -0,0 +1,13 @@ +//// [generatorES6InAMDModule.ts] +export function* foo() { + yield +} + +//// [generatorES6InAMDModule.js] +define(["require", "exports"], function (require, exports) { + "use strict"; + function* foo() { + yield; + } + exports.foo = foo; +}); diff --git a/tests/baselines/reference/generatorES6InAMDModule.symbols b/tests/baselines/reference/generatorES6InAMDModule.symbols new file mode 100644 index 0000000000..aafd2a4f79 --- /dev/null +++ b/tests/baselines/reference/generatorES6InAMDModule.symbols @@ -0,0 +1,6 @@ +=== tests/cases/compiler/generatorES6InAMDModule.ts === +export function* foo() { +>foo : Symbol(foo, Decl(generatorES6InAMDModule.ts, 0, 0)) + + yield +} diff --git a/tests/baselines/reference/generatorES6InAMDModule.types b/tests/baselines/reference/generatorES6InAMDModule.types new file mode 100644 index 0000000000..9a12a72f00 --- /dev/null +++ b/tests/baselines/reference/generatorES6InAMDModule.types @@ -0,0 +1,7 @@ +=== tests/cases/compiler/generatorES6InAMDModule.ts === +export function* foo() { +>foo : () => IterableIterator + + yield +>yield : any +} diff --git a/tests/cases/compiler/generatorES6InAMDModule.ts b/tests/cases/compiler/generatorES6InAMDModule.ts new file mode 100644 index 0000000000..a79170c685 --- /dev/null +++ b/tests/cases/compiler/generatorES6InAMDModule.ts @@ -0,0 +1,5 @@ +// @target: es6 +// @module: amd +export function* foo() { + yield +} \ No newline at end of file