[Transforms] Merging Master to Transforms on 06/21 #9294
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… fixLargeProjectTry2 # Conflicts: # src/compiler/types.ts
… fixLargeProjectTry2
… fixLargeProjectTry2 # Conflicts: # src/compiler/commandLineParser.ts # src/compiler/types.ts
… fixLargeProjectTry2 # Conflicts: # src/compiler/sys.ts
Conflicts: Jakefile.js src/compiler/commandLineParser.ts src/compiler/core.ts src/compiler/sys.ts src/harness/harness.ts src/server/editorServices.ts src/services/shims.ts tests/cases/unittests/cachingInServerLSHost.ts
Refactor navigation bar
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
| @@ -1029,6 +1029,7 @@ namespace ts { | |||
| // @kind(SyntaxKind.PropertyAccessExpression) | |||
| export interface PropertyAccessExpression extends MemberExpression, Declaration { | |||
| expression: LeftHandSideExpression; | |||
| dotToken: Node; | |||
There was a problem hiding this comment.
This was removed intentionally. We need to also remove it in our branch.
| } | ||
|
|
||
| export function createPropertyAccessWithDotToken(expression: Expression, dotToken: Node, name: string | Identifier, location?: TextRange, flags?: NodeFlags) { | ||
| export function createPropertyAccessWithDotToken(expression: Expression, name: string | Identifier, location?: TextRange, flags?: NodeFlags) { |
There was a problem hiding this comment.
Just collapse this and the above definition and update all references to just call createPropertyAccess.
| let indentBeforeDot = false; | ||
| let indentAfterDot = false; | ||
| let shouldEmitDotDot = false; | ||
| if (!(node.flags & NodeFlags.Synthesized)) { |
There was a problem hiding this comment.
This should be checking for the NoIndentation flag.
added 2 commits
July 1, 2016 10:51
|
👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@rbuckton. The last two commits are the one you will want to take a look