提交 e09d5fc5 编写于 作者: B Benjamin Pasero

💄

上级 153c398b
......@@ -360,7 +360,7 @@ export interface IResourceResultsNavigationOptions {
openOnFocus: boolean;
}
export default class ResourceResultsNavigation extends Disposable {
export class TreeResourceNavigator extends Disposable {
private _openResource: Emitter<IOpenResourceOptions> = new Emitter<IOpenResourceOptions>();
public readonly openResource: Event<IOpenResourceOptions> = this._openResource.event;
......
......@@ -24,7 +24,7 @@ import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { Source } from 'vs/workbench/parts/debug/common/debugSource';
import { basenameOrAuthority } from 'vs/base/common/resources';
import ResourceResultsNavigation, { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService';
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
const $ = dom.$;
......@@ -104,9 +104,9 @@ export class CallStackView extends TreeViewsViewletPanel {
twistiePixels
});
const fileResultsNavigation = new ResourceResultsNavigation(this.tree);
this.disposables.push(fileResultsNavigation);
this.disposables.push(fileResultsNavigation.openResource(e => {
const callstackNavigator = new TreeResourceNavigator(this.tree);
this.disposables.push(callstackNavigator);
this.disposables.push(callstackNavigator.openResource(e => {
if (this.ignoreSelectionChangedEvent) {
return;
}
......
......@@ -30,7 +30,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
import { debounceEvent } from 'vs/base/common/event';
import { SimpleFileResourceDragAndDrop } from 'vs/base/parts/tree/browser/treeDnd';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import ResourceResultsNavigation, { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService';
import { IMarkersWorkbenchService } from 'vs/workbench/parts/markers/common/markers';
export class MarkersPanel extends Panel {
......@@ -210,8 +210,8 @@ export class MarkersPanel extends Panel {
Constants.MarkerFocusContextKey.bindTo(this.tree.contextKeyService);
const fileResultsNavigation = this._register(new ResourceResultsNavigation(this.tree, { openOnFocus: true }));
this._register(debounceEvent(fileResultsNavigation.openResource, (last, event) => event, 75, true)(options => {
const markersNavigator = this._register(new TreeResourceNavigator(this.tree, { openOnFocus: true }));
this._register(debounceEvent(markersNavigator.openResource, (last, event) => event, 75, true)(options => {
this.openFileAtElement(options.element, options.editorOptions.preserveFocus, options.sideBySide, options.editorOptions.pinned);
}));
}
......
......@@ -57,7 +57,7 @@ import { getOutOfWorkspaceEditorResources } from 'vs/workbench/parts/search/comm
import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
import { SimpleFileResourceDragAndDrop } from 'vs/base/parts/tree/browser/treeDnd';
import { isDiffEditor, isCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
import ResourceResultsNavigation, { WorkbenchTree } from 'vs/platform/list/browser/listService';
import { TreeResourceNavigator, WorkbenchTree } from 'vs/platform/list/browser/listService';
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
export class SearchViewlet extends Viewlet {
......@@ -510,8 +510,8 @@ export class SearchViewlet extends Viewlet {
this.tree.setInput(this.viewModel.searchResult);
this.toUnbind.push(renderer);
const fileResultsNavigation = this._register(new ResourceResultsNavigation(this.tree, { openOnFocus: true }));
this._register(debounceEvent(fileResultsNavigation.openResource, (last, event) => event, 75, true)(options => {
const searchResultsNavigator = this._register(new TreeResourceNavigator(this.tree, { openOnFocus: true }));
this._register(debounceEvent(searchResultsNavigator.openResource, (last, event) => event, 75, true)(options => {
if (options.element instanceof Match) {
let selectedMatch: Match = options.element;
if (this.currentSelectedFileMatch) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册