Skip to content

refactor: remove hoisting and add JSDoc to matchTag in Emmet #336949

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.

Sign up for GitHub

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

Open
Vedansh Shetti (vedanshshetti) wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −20
Open

refactor: remove hoisting and add JSDoc to matchTag in Emmet #336949

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions extensions/emmet/src/matchTag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,34 @@ import { validate, getHtmlFlatNode, offsetRangeToSelection } from './util';
import { getRootNode } from './parseDocument';
import { HtmlNode as HtmlFlatNode } from 'EmmetFlatNode';

export function matchTag() {
function getUpdatedSelections(document: vscode.TextDocument, rootNode: HtmlFlatNode, position: vscode.Position): vscode.Selection | undefined {
const offset = document.offsetAt(position);
const currentNode = getHtmlFlatNode(document.getText(), rootNode, offset, true);
if (!currentNode) {
return;
}

// If no opening/closing tag or cursor is between open and close tag, then no-op
if (!currentNode.open
|| !currentNode.close
|| (offset > currentNode.open.end && offset < currentNode.close.start)) {
return;
}

// Place cursor inside the close tag if cursor is inside the open tag, else place it inside the open tag
const finalOffset = (offset <= currentNode.open.end) ? currentNode.close.start + 2 : currentNode.start + 1;
return offsetRangeToSelection(document, finalOffset, finalOffset);
}


/**
* This function implements the "Match Tag" feature in VSCode's HTML editing. When the user triggers it
* (usually via a keybinding or command), it jumps your cursor from an opening HTML tag to its corresponding closing tag,
* or vice versa.
* In short: It’s the logic behind "jump to matching tag."
* @returns {void} Void - Updates editor selections in place.
*/
export function matchTag(): void {
if (!validate(false) || !vscode.window.activeTextEditor) {
return;
}
Expand All @@ -32,22 +59,3 @@ export function matchTag() {
editor.revealRange(editor.selections[updatedSelections.length - 1]);
}
}

function getUpdatedSelections(document: vscode.TextDocument, rootNode: HtmlFlatNode, position: vscode.Position): vscode.Selection | undefined {
const offset = document.offsetAt(position);
const currentNode = getHtmlFlatNode(document.getText(), rootNode, offset, true);
if (!currentNode) {
return;
}

// If no opening/closing tag or cursor is between open and close tag, then no-op
if (!currentNode.open
|| !currentNode.close
|| (offset > currentNode.open.end && offset < currentNode.close.start)) {
return;
}

// Place cursor inside the close tag if cursor is inside the open tag, else place it inside the open tag
const finalOffset = (offset <= currentNode.open.end) ? currentNode.close.start + 2 : currentNode.start + 1;
return offsetRangeToSelection(document, finalOffset, finalOffset);
}