development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-06 11:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

proper fix for #68597

Browse source
This commit is contained in:
isidor 2019-02-26 12:01:47 +01:00
parent 172a2df376
commit c0de575949
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/workbench/contrib/files/browser/views/explorerView.ts
View file

@ -64,6 +64,7 @@ export class ExplorerView extends ViewletPanel {
private dragHandler: DelayedDragHandler;
private decorationProvider: ExplorerDecorationsProvider;
private autoReveal = false;
private ignoreActiveEditorChange = false;
constructor(
options: IViewletPanelOptions,
@ -194,7 +195,10 @@ export class ExplorerView extends ViewletPanel {
// When the explorer viewer is loaded, listen to changes to the editor input
this.disposables.push(this.editorService.onDidActiveEditorChange(() => {
this.selectActiveFile();
if (!this.ignoreActiveEditorChange) {
this.selectActiveFile();
}
this.ignoreActiveEditorChange = false;
}));
// Also handle configuration updates
@ -336,6 +340,7 @@ export class ExplorerView extends ViewletPanel {
"from": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
}*/
this.telemetryService.publicLog('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'explorer' });
this.ignoreActiveEditorChange = true;
this.editorService.openEditor({ resource: selection[0].resource, options: { preserveFocus: e.editorOptions.preserveFocus, pinned: e.editorOptions.pinned } }, e.sideBySide ? SIDE_GROUP : ACTIVE_GROUP)
.then(undefined, onUnexpectedError);
}