Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into exportEquals #2467

Merged
merged 303 commits into from
Mar 25, 2015
Merged

Merge master into exportEquals #2467

merged 303 commits into from
Mar 25, 2015

Conversation

mhegazy
Copy link
Contributor

@mhegazy mhegazy commented Mar 23, 2015

this brings ES6 module import and export emit into exportEquals branch in preparation of merging it into master.

Yui T and others added 30 commits March 12, 2015 15:19
Parse classDeclaration in strict mode code for ES6
0672923
Clean up redundant tests
800c523
Emit Super as super
af05afd
@mhegazy
Emit export default in ES6
b3c8bcb
@mhegazy
Update error message
b6bbf06
@mhegazy
Merge branch 'master' into es6ImportExportEmit
8e06265
@vladima
merge with master
8796396
@mhegazy
Support an optional type annotation on export default statement
a6a8a96
@vladima
consider binding elements as always initialized with doing shadow check
0675a92
@vladima
merge with master
db324db
@ahejlsberg
Clean up diagnostic timers and -diagnostic output
c4b0302
@ahejlsberg
Removing unused function from emitter
99a6f2b
@ahejlsberg
Merge branch 'master' into cleanupDiagnostics
00ac836
@vladima
accepted baselines
d163205
@vladima
merge with master
a7dac51
@JsonFreeman
Add assert in reportNoCommonSupertypeError
f6de919
@JsonFreeman
Persist inference context object throughout the signature, and add is…
df6f856 
…Fixed property
@JsonFreeman
Optimize the clearing of inferredTypes
495caf0
@JsonFreeman
Get rid of inferenceFailureType, just set the failedTypeParameterInde…
a0b9607 
…x directly
@JsonFreeman
Add tests for type parameter fixing
a29b6fe
@caitp
Disallow line terminator after arrow function parameters, before =>
84634ac 
Closes #2282
@caitp
Perform error reporting in checker
dd16fed
@caitp
Add additional test-cases for arrow function grammar
231f522 
As suggested by @DanielRosenwasser
@caitp
Check that arrow is on same line as parameters
aa3cefb
@caitp
Fix line wrapping
fdc673f
@caitp
Address slew of review comments
5e107e6
@caitp
Parse arrow function body as identifier if missing => or {
bd828e3 
Restores functionality broken in previous commit
@caitp
Restore earlier behaviour when parsing non-simple arrow function bodies
3dc5faf
@caitp
Make sure arrow function grammar rules can deal with type annotations
10925c1
Address code review
13e55ae
steveluc and others added 26 commits March 24, 2015 14:03
Moved findConfigFile to program.ts. Addressed pull request comments.
4848207
@CyrusNajmabadi
Merge branch 'master' into findReferences
927e60d
@rbuckton
Changed emit for decorators
70bd582
@rbuckton
Updated typecheck for property, method, and parameter decorators
e6ccaf0
@CyrusNajmabadi
Merge pull request #2446 from Microsoft/findReferences
62b5ffa 
Add a new findReferences API that buckets results with the definition th...
@steveluc
Merge pull request #2450 from Microsoft/tsconfigServer
baac6d8 
Add support to TypeScript server for tsconfig.json files.
@mhegazy
return undefined if we are not renaming to ensure we get the correct …
515cdcd 
…text
@CyrusNajmabadi
Merge branch 'master' into completionEntryDetails
614b106
@vladima
Merge pull request #2471 from Microsoft/revisedNameGen2
e5e5ad8 
Revised name generation #2, fixes #2449, #2447
@vladima
Merge pull request #2476 from Microsoft/immutableBindings
20a0ac5 
Disallow assignments to imported exports
@CyrusNajmabadi
Don't bother with a predicate. It doesn't provide enough of a perf sa…
63278ca 
…vings.
@CyrusNajmabadi
PR feedback.
e26c260
@CyrusNajmabadi
PR feedback.
69ff9b3
@rbuckton
Updates to emit and updated baselines
f531193
@CyrusNajmabadi
Merge pull request #2475 from Microsoft/completionEntryDetails
4f0dc28 
Share code between getCompletionsAtPosition and getCompletionEntryDetails.
@rbuckton
Merge pull request #2399 from Microsoft/decorators_min
ea15225
@rbuckton
Cleanup of duplicate code due to merge
a60d591
@mhegazy
Merge branch 'exportEquals' into exportEqualsMerged
4361e6e
@mhegazy
Rename isES6ModuleMemberDeclaration to isES6ExportedDeclaration.
352633d
@mhegazy
use the correct check for import and export specifiers
27c5d6f
@mhegazy
Disallow export declarations in internal modules
6c40c95
@mhegazy
Make isReferencedAliasDeclaration check children
ab5c09a
@mhegazy
In ES6 use "export var x" for internal modules and enums instead of a…
bc51dd1 
…n after the fact "export {x};"
@mhegazy
Move es6 alias name handeling to getAliasNameSubstitution to match ge…
aa01dcd 
…tExportNameSubstitution
@mhegazy
Merge branch 'master' into exportEqualsMerged
1c45b77
@mhegazy
Merge branch 'master' into exportEqualsMerged
fad8892 
Conflicts:
	src/compiler/checker.ts
	src/compiler/emitter.ts
	src/compiler/types.ts
	tests/baselines/reference/APISample_compile.js
	tests/baselines/reference/APISample_linter.js
	tests/baselines/reference/APISample_transform.js
	tests/baselines/reference/APISample_watcher.js
	tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
	tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
	tests/baselines/reference/es6ExportAllInEs5.js
	tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
ahejlsberg added a commit that referenced this pull request Mar 25, 2015
@ahejlsberg
Merge pull request #2467 from Microsoft/exportEqualsMerged
a05f1e8 
Merge master into exportEquals
@ahejlsberg ahejlsberg merged commit a05f1e8 into exportEquals Mar 25, 2015
@ahejlsberg ahejlsberg deleted the exportEqualsMerged branch March 25, 2015 16:47
@microsoft microsoft locked and limited conversation to collaborators Jun 18, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.