Merge pull request #31912 from andrewbranch/bug/31657

Fix smartSelection returning extra span inside string quotes when cursor is outside them

src/services/smartSelection.ts

@@ -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 } };
                 }
             }

tests/baselines/reference/smartSelection_stringLiteral.baseline

@@ -0,0 +1,10 @@
+const a = 'a';
+const b = /**/'b';
+
+
+          'b' 
+
+const b = 'b';
+
+const a = 'a';
+const b = 'b';

tests/cases/fourslash/smartSelection_stringLiteral.ts

@@ -0,0 +1,6 @@
+/// <reference path="fourslash.ts" />
+
+//// const a = 'a';
+//// const b = /**/'b';
+
+verify.baselineSmartSelection();