Clean up outliningElementsCollector #20143
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
ghost
requested a review
from 
uniqueiniquity
suggested changes
Nov 20, 2017
| addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n), /*useFullStart*/ !isArrayLiteralExpression(n.parent)); | ||
| break; | ||
| case SyntaxKind.ModuleBlock: | ||
| return spanForNode(n.parent); |
There was a problem hiding this comment.
Won't this not properly find the open and close brace tokens? They're children of the block itself, but we want to pass the parent to createOutliningSpan.
There was a problem hiding this comment.
spanForNode closes over n and uses that to find tokens. The argument is hintSpanNode which is only used for its own span, not for its tokens.
| return elements.sort((span1, span2) => span1.textSpan.start - span2.textSpan.start); | ||
| function addNodeOutliningSpans(sourceFile: SourceFile, cancellationToken: CancellationToken, out: Push<OutliningSpan>): void { | ||
| let depth = 0; | ||
| const maxDepth = 39; |
There was a problem hiding this comment.
Any particular reason we changed from 40 to 39?
There was a problem hiding this comment.
Was fixing an off-by-one error. I pushed a better fix.
ghost
commented
Nov 21, 2017
| let depthRemaining = 40; | ||
| sourceFile.forEachChild(function walk(n) { | ||
| if (depthRemaining === 0) return; | ||
| cancellationToken.throwIfCancellationRequested(); |
There was a problem hiding this comment.
We are calling this on every single node -- we should come up with a way to call this less often.
uniqueiniquity
approved these changes
Nov 21, 2017
errendir
added a commit
to errendir/TypeScript
that referenced
this pull request
Nov 27, 2017
* origin/master: (28 commits) LEGO: check in for master to temporary branch. LEGO: check in for master to temporary branch. Removes redundant comments (microsoft#20214) Catch illegal jsdoc tags on constructors (microsoft#20045) Use stricter types for event bodies Use {} instead of any to improve type checking Update public API baseline Update project on PackageInstalledResponse Unswap arguments LEGO: check in for master to temporary branch. Fix visibility checking of mutually recursive exports (microsoft#19929) Add dt baseline folder to gitignore (microsoft#20205) Support getJSDocCommentsAndTags for special property assignments (microsoft#20193) Clean up outliningElementsCollector (microsoft#20143) Correct project root path passed to Typings Installer Check hasOwnProperty before copying property Convert legacy safe list keys to lowercase on construction Port generated lib files (microsoft#20177) Clean up lexical classifier (microsoft#20123) Allow curly around `@type` jsdoc to be optional (microsoft#20074) ...
ghost
mentioned this pull request
This pull request was closed.
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.
Move stuff out of the big stateful closure into their own functions. There are all pure or at most take an
outarray.