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

Jump to bottom

Fix for #32342 #35463

Merged
merged 2 commits into from Oct 12, 2017
Merged

Fix for #32342 #35463

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b47570
When expanding abbreviations, do so from bottom to top. This way a c…
jmdowns2 Oct 1, 2017
ef29dcd
When expanding abbreviations, do so from bottom to top. This way a c…
jmdowns2 Oct 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion extensions/emmet/src/abbreviationActions.ts
View file
Open in desktop
Expand Up @@ -139,7 +139,12 @@ export function expandEmmetAbbreviation(args): Thenable<boolean> {
return [new vscode.Range(abbreviationRange.start.line, abbreviationRange.start.character, abbreviationRange.end.line, abbreviationRange.end.character), abbreviation, filter];
};

editor.selections.forEach(selection => {
let selectionsInReverseOrder = editor.selections.slice(0);
selectionsInReverseOrder.sort((a, b) => {
return a.anchor.compareTo(b.anchor) * -1;
Copy link
Contributor

Choose a reason for hiding this comment

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

What we should compare here is the ending position of the abbreviation

anchor comes after active when selection.isReversed is true.

So instead of a.anchor.compareTo(b.anchor), this should probably be
(a.isReversed ? a.anchor: a:active).compareTo(b.isReversed ? b.anchor: b:active) ?

Copy link
Contributor

Choose a reason for hiding this comment

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

@jmdowns2 ?

});

selectionsInReverseOrder.forEach(selection => {
let position = selection.isReversed ? selection.anchor : selection.active;
let [rangeToReplace, abbreviation, filter] = getAbbreviation(editor.document, selection, position, syntax);
if (!rangeToReplace) {
Expand Down