Add cache, update several Emmet commands #112597
Merged
Conversation
This file contains 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
rzhao271
force-pushed
the
rzhao271/cache-test
branch
from
82dd0c4
to
f3bb417
Compare
|
This PR also fixes #89821 |
rzhao271
force-pushed
the
rzhao271/cache-test
branch
from
f3bb417
to
58215fc
Compare
rzhao271
force-pushed
the
rzhao271/cache-test
branch
from
3020e6a
to
5da75aa
Compare
|
I glanced over it and it looks good! |
aeschli
approved these changes
Dec 16, 2020
extensions/emmet/src/matchTag.ts
Outdated
|
|
||
| // If no closing tag or cursor is between open and close tag, then no-op | ||
| if (!currentNode.close || (position.isAfter(currentNode.open.end) && position.isBefore(currentNode.close.start))) { | ||
| if (!currentNode?.endTagStart |
There was a problem hiding this comment.
currentNode is defined here, so the '?' can be removed.
0 is a valid offset, admittedly not possible for the tagStart. So better currentNode.endTagStart === undefined
extensions/emmet/src/emmetCommon.ts
Outdated
| @@ -145,6 +146,14 @@ export function activateEmmetExtension(context: vscode.ExtensionContext) { | |||
| updateEmmetExtensionsPath(true); | |||
| } | |||
| })); | |||
|
|
|||
| context.subscriptions.push(vscode.workspace.onDidOpenTextDocument((e) => { | |||
| addFileToParseCache(toLSTextDocument(e)); | |||
There was a problem hiding this comment.
I found addFileToParseCache confusing. Looking at the implementation, it set and entry with undefined to the cache. Is that necessary? it's done for all URI, regardless if html or not.
There was a problem hiding this comment.
Right, I should make it only save markup files like HTML or XML
- Explicitly use undefined in if statements to avoid if (0) - Add only markup files to cache - Do not push to stack for balanceOut if newSelection same as original
rzhao271
force-pushed
the
rzhao271/cache-test
branch
from
100dc52
to
98f7cf1
Compare
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.
This PR fixes #99896 and affects #71996 and #110577