Merge pull request microsoft#65222 from irrationalRock/fix59961

rebornix · web-flow · commit e6adf2040bbe · 2019-10-23T16:31:02.000-07:00
Fixed microsoft#59961
diff --git a/src/vs/editor/contrib/multicursor/multicursor.ts b/src/vs/editor/contrib/multicursor/multicursor.ts
@@ -603,6 +603,17 @@ export class MultiCursorSelectionController extends Disposable implements IEdito
 			matches = this._session.selectAll();
 		}
 
+		if (findState.searchScope) {
+			const state = findState.searchScope;
+			let inSelection: FindMatch[] | null = [];
+			for (let i = 0; i < matches.length; i++) {
+				if (matches[i].range.endLineNumber <= state.endLineNumber && matches[i].range.startLineNumber >= state.startLineNumber) {
+					inSelection.push(matches[i]);
+				}
+			}
+			matches = inSelection;
+		}
+
 		if (matches.length > 0) {
 			const editorSelection = this._editor.getSelection();
 			// Have the primary cursor remain the one where the action was invoked
