development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Searching within collapsed regions fails to scroll the match into view. Fixes #44330

Browse source
This commit is contained in:
Martin Aeschlimann 2018-02-27 12:46:28 +01:00
parent d31961f900
commit 3293f204ce
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/editor/contrib/folding/folding.ts
View file

@ -238,14 +238,18 @@ export class FoldingController implements IEditorContribution {
this.getFoldingModel().then(foldingModel => { // null is returned if folding got disabled in the meantime
if (foldingModel) {
let selections = this.editor.getSelections();
if (selections) {
if (selections && selections.length > 0) {
let toToggle = [];
for (let selection of selections) {
let lineNumber = selection.selectionStartLineNumber;
if (this.hiddenRangeModel.isHidden(lineNumber)) {
let toToggle = foldingModel.getAllRegionsAtLine(lineNumber, r => r.isCollapsed && lineNumber > r.startLineNumber);
foldingModel.toggleCollapseState(toToggle);
toToggle.push(...foldingModel.getAllRegionsAtLine(lineNumber, r => r.isCollapsed && lineNumber > r.startLineNumber));
}
}
if (toToggle.length) {
foldingModel.toggleCollapseState(toToggle);
this.reveal(selections[0].getPosition());
}
}
}
});