microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-16 15:45:27 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #31912 from andrewbranch/bug/31657

Browse Source 
Fix smartSelection returning extra span inside string quotes when cursor is outside them
This commit is contained in:
Andrew Branch
2019-07-01 11:53:24 -07:00
committed by GitHub
parent af20e791fd 54f5f2baf2
commit a890275463
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/smartSelection.ts
View File

@@ -72,9 +72,13 @@ namespace ts.SmartSelectionRange {
function pushSelectionRange(start: number, end: number): void {
// Skip empty ranges
if (start !== end) {
// Skip ranges that are identical to the parent
const textSpan = createTextSpanFromBounds(start, end);
if (!selectionRange || !textSpansEqual(textSpan, selectionRange.textSpan)) {
if (!selectionRange || (
// Skip ranges that are identical to the parent
!textSpansEqual(textSpan, selectionRange.textSpan) &&
// Skip ranges that don’t contain the original position
textSpanIntersectsWithPosition(textSpan, pos)
)) {
selectionRange = { textSpan, ...selectionRange && { parent: selectionRange } };
}
}