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.

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

[Transforms] Merge master 07/11 into transform #9697

Merged
merged 423 commits into from
Jul 18, 2016
Merged

Conversation

yuit
Copy link
Contributor

@yuit yuit commented Jul 13, 2016

Merge master into transforms 🎉 There are tests related to classExpressionWithStaticProperties that fail. This require this PR @rbuckton should I just accept baselines for now as we already has issue to track this problem?

Interesting commit starts from dd0cd58

TODO:

  • Port JSDOC unittests into the transforms

zhengbli and others added 30 commits June 20, 2016 14:07
ignore casing when converting a source file path to relative path
Add glob-style file include pattern support for tsconfig.json
export interface used by other exported functions
…nt base indentations.

Use the base indent size if it is greater that the indentation of the inherited predecessor
sandersn and others added 14 commits July 11, 2016 11:41
…thods-returning-this

Provide a symbol for salsa-inferred class types
PR #9574 added a baseline that #9578 caused to be changed. The two PRs
went in so close to each other that the CI build didn't catch the change
to the new test's baseline.
Fix #9542 (allow files under node_modules to be included in the compilation).
# Conflicts:
#	src/compiler/checker.ts
#	src/compiler/commandLineParser.ts
#	src/compiler/core.ts
#	src/compiler/diagnosticMessages.json
#	src/compiler/emitter.ts
#	src/compiler/parser.ts
#	src/compiler/program.ts
#	src/compiler/scanner.ts
#	src/compiler/sys.ts
#	src/compiler/tsconfig.json
#	src/compiler/types.ts
#	src/compiler/utilities.ts
#	src/harness/fourslash.ts
#	src/harness/harness.ts
#	src/harness/harnessLanguageService.ts
#	src/harness/loggedIO.ts
#	src/harness/projectsRunner.ts
#	src/lib/dom.generated.d.ts
#	src/lib/webworker.generated.d.ts
#	src/services/navigationBar.ts
#	src/services/tsconfig.json
#	tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
#	tests/baselines/reference/transpile/Rename dependencies - System.js
#	tests/baselines/reference/transpile/Rename dependencies - UMD.js
#	tests/baselines/reference/transpile/Sets module name.js
#	tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
#	tests/baselines/reference/tsxUnionTypeComponent2.js
#	tests/cases/fourslash/fourslash.ts
#	tests/cases/fourslash/referencesInComment.ts
#	tests/cases/unittests/cachingInServerLSHost.ts
#	tests/cases/unittests/jsDocParsing.ts
#	tests/cases/unittests/matchFiles.ts
#	tests/cases/unittests/transpile.ts
@yuit yuit added the Domain: Transforms Relates to the public transform API label Jul 13, 2016
@yuit yuit changed the title Mergemaster 0711 [Transforms] Merge master 07/11 into transform Jul 13, 2016
@yuit
Copy link
Contributor Author

yuit commented Jul 15, 2016

All tests failure related to classExpression which contains capturing static property

@rbuckton
Copy link
Member

👍

@@ -3239,14 +3214,14 @@ namespace ts {
}

function trySubstituteDecoratedClassName(node: Identifier): Expression {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to rename this function since it is not just decorated class name anynmore

@yuit
Copy link
Contributor Author

yuit commented Jul 18, 2016

👍

@yuit yuit merged commit 1c9df84 into transforms Jul 18, 2016
@yuit yuit deleted the mergemaster_0711 branch July 18, 2016 22:38
@microsoft microsoft locked and limited conversation to collaborators Jun 19, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Domain: Transforms Relates to the public transform API
Projects
None yet
Development

Successfully merging this pull request may close these issues.