mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from master
This commit is contained in:
Raj Musuku
@@ -2,50 +2,35 @@
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
'use strict';
|
||||
|
||||
import 'vs/css!./media/referencesWidget';
|
||||
import * as nls from 'vs/nls';
|
||||
import { onUnexpectedError } from 'vs/base/common/errors';
|
||||
import { Event, Emitter } from 'vs/base/common/event';
|
||||
import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
|
||||
import { Schemas } from 'vs/base/common/network';
|
||||
import * as strings from 'vs/base/common/strings';
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import { Color } from 'vs/base/common/color';
|
||||
import { $, Builder } from 'vs/base/browser/builder';
|
||||
import * as dom from 'vs/base/browser/dom';
|
||||
import { Sash, ISashEvent, IVerticalSashLayoutProvider } from 'vs/base/browser/ui/sash/sash';
|
||||
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
|
||||
import { IMouseEvent } from 'vs/base/browser/mouseEvent';
|
||||
import { GestureEvent } from 'vs/base/browser/touch';
|
||||
import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
|
||||
import { FileLabel } from 'vs/base/browser/ui/iconLabel/iconLabel';
|
||||
import * as tree from 'vs/base/parts/tree/browser/tree';
|
||||
import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
|
||||
import { Range, IRange } from 'vs/editor/common/core/range';
|
||||
import * as editorCommon from 'vs/editor/common/editorCommon';
|
||||
import { TextModel, ModelDecorationOptions } from 'vs/editor/common/model/textModel';
|
||||
import { ISashEvent, IVerticalSashLayoutProvider, Sash } from 'vs/base/browser/ui/sash/sash';
|
||||
import { Color } from 'vs/base/common/color';
|
||||
import { Emitter, Event } from 'vs/base/common/event';
|
||||
import { dispose, IDisposable, IReference } from 'vs/base/common/lifecycle';
|
||||
import { Schemas } from 'vs/base/common/network';
|
||||
import { basenameOrAuthority, dirname } from 'vs/base/common/resources';
|
||||
import 'vs/css!./media/referencesWidget';
|
||||
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
|
||||
import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
|
||||
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
|
||||
import { IRange, Range } from 'vs/editor/common/core/range';
|
||||
import * as editorCommon from 'vs/editor/common/editorCommon';
|
||||
import { IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
|
||||
import { ModelDecorationOptions, TextModel } from 'vs/editor/common/model/textModel';
|
||||
import { Location } from 'vs/editor/common/modes';
|
||||
import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
|
||||
import { AriaProvider, DataSource, Delegate, FileReferencesRenderer, OneReferenceRenderer, TreeElement } from 'vs/editor/contrib/referenceSearch/referencesTree';
|
||||
import * as nls from 'vs/nls';
|
||||
import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { ILabelService } from 'vs/platform/label/common/label';
|
||||
import { WorkbenchAsyncDataTree } from 'vs/platform/list/browser/listService';
|
||||
import { activeContrastBorder, contrastBorder, registerColor } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { ITheme, IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
|
||||
import { PeekViewWidget } from './peekViewWidget';
|
||||
import { FileReferences, OneReference, ReferencesModel } from './referencesModel';
|
||||
import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
|
||||
import { registerColor, activeContrastBorder, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { registerThemingParticipant, ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
|
||||
import { attachBadgeStyler } from 'vs/platform/theme/common/styler';
|
||||
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
|
||||
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
|
||||
import URI from 'vs/base/common/uri';
|
||||
import { TrackedRangeStickiness, IModelDeltaDecoration } from 'vs/editor/common/model';
|
||||
import { WorkbenchTree, WorkbenchTreeController } from 'vs/platform/list/browser/listService';
|
||||
import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
|
||||
import { Location } from 'vs/editor/common/modes';
|
||||
import { ClickBehavior } from 'vs/base/parts/tree/browser/treeDefaults';
|
||||
import { IUriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay';
|
||||
import { dirname, basenameOrAuthority } from 'vs/base/common/resources';
|
||||
|
||||
|
||||
class DecorationsManager implements IDisposable {
|
||||
|
||||
@@ -158,276 +143,6 @@ class DecorationsManager implements IDisposable {
|
||||
}
|
||||
}
|
||||
|
||||
class DataSource implements tree.IDataSource {
|
||||
|
||||
constructor(
|
||||
@ITextModelService private readonly _textModelResolverService: ITextModelService
|
||||
) {
|
||||
//
|
||||
}
|
||||
|
||||
public getId(tree: tree.ITree, element: any): string {
|
||||
if (element instanceof ReferencesModel) {
|
||||
return 'root';
|
||||
} else if (element instanceof FileReferences) {
|
||||
return (<FileReferences>element).id;
|
||||
} else if (element instanceof OneReference) {
|
||||
return (<OneReference>element).id;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
public hasChildren(tree: tree.ITree, element: any): boolean {
|
||||
if (element instanceof ReferencesModel) {
|
||||
return true;
|
||||
}
|
||||
if (element instanceof FileReferences && !(<FileReferences>element).failure) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public getChildren(tree: tree.ITree, element: ReferencesModel | FileReferences): TPromise<any[]> {
|
||||
if (element instanceof ReferencesModel) {
|
||||
return TPromise.as(element.groups);
|
||||
} else if (element instanceof FileReferences) {
|
||||
return element.resolve(this._textModelResolverService).then(val => {
|
||||
if (element.failure) {
|
||||
// refresh the element on failure so that
|
||||
// we can update its rendering
|
||||
return tree.refresh(element).then(() => val.children);
|
||||
}
|
||||
return val.children;
|
||||
});
|
||||
} else {
|
||||
return TPromise.as([]);
|
||||
}
|
||||
}
|
||||
|
||||
public getParent(tree: tree.ITree, element: any): TPromise<any> {
|
||||
let result: any = null;
|
||||
if (element instanceof FileReferences) {
|
||||
result = (<FileReferences>element).parent;
|
||||
} else if (element instanceof OneReference) {
|
||||
result = (<OneReference>element).parent;
|
||||
}
|
||||
return TPromise.as(result);
|
||||
}
|
||||
}
|
||||
|
||||
class Controller extends WorkbenchTreeController {
|
||||
|
||||
private _onDidFocus = new Emitter<any>();
|
||||
readonly onDidFocus: Event<any> = this._onDidFocus.event;
|
||||
|
||||
private _onDidSelect = new Emitter<any>();
|
||||
readonly onDidSelect: Event<any> = this._onDidSelect.event;
|
||||
|
||||
private _onDidOpenToSide = new Emitter<any>();
|
||||
readonly onDidOpenToSide: Event<any> = this._onDidOpenToSide.event;
|
||||
|
||||
public onTap(tree: tree.ITree, element: any, event: GestureEvent): boolean {
|
||||
if (element instanceof FileReferences) {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
return this._expandCollapse(tree, element);
|
||||
}
|
||||
|
||||
let result = super.onTap(tree, element, event);
|
||||
|
||||
this._onDidFocus.fire(element);
|
||||
return result;
|
||||
}
|
||||
|
||||
public onMouseDown(tree: tree.ITree, element: any, event: IMouseEvent): boolean {
|
||||
let isDoubleClick = event.detail === 2;
|
||||
if (event.leftButton) {
|
||||
if (element instanceof FileReferences) {
|
||||
if (this.openOnSingleClick || isDoubleClick || this.isClickOnTwistie(event)) {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
return this._expandCollapse(tree, element);
|
||||
}
|
||||
}
|
||||
|
||||
let result = super.onClick(tree, element, event);
|
||||
let openToSide = event.ctrlKey || event.metaKey || event.altKey;
|
||||
if (openToSide && (isDoubleClick || this.openOnSingleClick)) {
|
||||
this._onDidOpenToSide.fire(element);
|
||||
} else if (isDoubleClick) {
|
||||
this._onDidSelect.fire(element);
|
||||
} else if (this.openOnSingleClick) {
|
||||
this._onDidFocus.fire(element);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public onClick(tree: tree.ITree, element: any, event: IMouseEvent): boolean {
|
||||
if (event.leftButton) {
|
||||
return false; // Already handled by onMouseDown
|
||||
}
|
||||
|
||||
return super.onClick(tree, element, event);
|
||||
}
|
||||
|
||||
private _expandCollapse(tree: tree.ITree, element: any): boolean {
|
||||
|
||||
if (tree.isExpanded(element)) {
|
||||
tree.collapse(element).done(null, onUnexpectedError);
|
||||
} else {
|
||||
tree.expand(element).done(null, onUnexpectedError);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public onEscape(tree: tree.ITree, event: IKeyboardEvent): boolean {
|
||||
return false;
|
||||
}
|
||||
|
||||
dispose(): void {
|
||||
this._onDidFocus.dispose();
|
||||
this._onDidSelect.dispose();
|
||||
this._onDidOpenToSide.dispose();
|
||||
}
|
||||
}
|
||||
|
||||
class FileReferencesTemplate {
|
||||
|
||||
readonly file: FileLabel;
|
||||
readonly badge: CountBadge;
|
||||
readonly dispose: () => void;
|
||||
|
||||
constructor(
|
||||
container: HTMLElement,
|
||||
@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
|
||||
@optional(IEnvironmentService) private _environmentService: IEnvironmentService,
|
||||
@IThemeService themeService: IThemeService,
|
||||
) {
|
||||
const parent = document.createElement('div');
|
||||
dom.addClass(parent, 'reference-file');
|
||||
container.appendChild(parent);
|
||||
this.file = new FileLabel(parent, URI.parse('no:file'), this._contextService, this._environmentService);
|
||||
|
||||
this.badge = new CountBadge($('.count').appendTo(parent).getHTMLElement());
|
||||
const styler = attachBadgeStyler(this.badge, themeService);
|
||||
|
||||
this.dispose = () => {
|
||||
this.file.dispose();
|
||||
styler.dispose();
|
||||
};
|
||||
}
|
||||
|
||||
set(element: FileReferences) {
|
||||
this.file.setFile(element.uri, this._contextService, this._environmentService);
|
||||
const len = element.children.length;
|
||||
this.badge.setCount(len);
|
||||
if (element.failure) {
|
||||
this.badge.setTitleFormat(nls.localize('referencesFailre', "Failed to resolve file."));
|
||||
} else if (len > 1) {
|
||||
this.badge.setTitleFormat(nls.localize('referencesCount', "{0} references", len));
|
||||
} else {
|
||||
this.badge.setTitleFormat(nls.localize('referenceCount', "{0} reference", len));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class OneReferenceTemplate {
|
||||
|
||||
readonly before: HTMLSpanElement;
|
||||
readonly inside: HTMLSpanElement;
|
||||
readonly after: HTMLSpanElement;
|
||||
|
||||
constructor(container: HTMLElement) {
|
||||
const parent = document.createElement('div');
|
||||
this.before = document.createElement('span');
|
||||
this.inside = document.createElement('span');
|
||||
this.after = document.createElement('span');
|
||||
dom.addClass(this.inside, 'referenceMatch');
|
||||
dom.addClass(parent, 'reference');
|
||||
parent.appendChild(this.before);
|
||||
parent.appendChild(this.inside);
|
||||
parent.appendChild(this.after);
|
||||
container.appendChild(parent);
|
||||
}
|
||||
|
||||
set(element: OneReference): void {
|
||||
const { before, inside, after } = element.parent.preview.preview(element.range);
|
||||
this.before.innerHTML = strings.escape(before);
|
||||
this.inside.innerHTML = strings.escape(inside);
|
||||
this.after.innerHTML = strings.escape(after);
|
||||
}
|
||||
}
|
||||
|
||||
class Renderer implements tree.IRenderer {
|
||||
|
||||
private static readonly _ids = {
|
||||
FileReferences: 'FileReferences',
|
||||
OneReference: 'OneReference'
|
||||
};
|
||||
|
||||
constructor(
|
||||
@IWorkspaceContextService private readonly _contextService: IWorkspaceContextService,
|
||||
@IThemeService private readonly _themeService: IThemeService,
|
||||
@optional(IEnvironmentService) private _environmentService: IEnvironmentService,
|
||||
) {
|
||||
//
|
||||
}
|
||||
|
||||
getHeight(tree: tree.ITree, element: FileReferences | OneReference): number {
|
||||
return 23;
|
||||
}
|
||||
|
||||
getTemplateId(tree: tree.ITree, element: FileReferences | OneReference): string {
|
||||
if (element instanceof FileReferences) {
|
||||
return Renderer._ids.FileReferences;
|
||||
} else if (element instanceof OneReference) {
|
||||
return Renderer._ids.OneReference;
|
||||
}
|
||||
throw element;
|
||||
}
|
||||
|
||||
renderTemplate(tree: tree.ITree, templateId: string, container: HTMLElement) {
|
||||
if (templateId === Renderer._ids.FileReferences) {
|
||||
return new FileReferencesTemplate(container, this._contextService, this._environmentService, this._themeService);
|
||||
} else if (templateId === Renderer._ids.OneReference) {
|
||||
return new OneReferenceTemplate(container);
|
||||
}
|
||||
throw templateId;
|
||||
}
|
||||
|
||||
renderElement(tree: tree.ITree, element: FileReferences | OneReference, templateId: string, templateData: any): void {
|
||||
if (element instanceof FileReferences) {
|
||||
(<FileReferencesTemplate>templateData).set(element);
|
||||
} else if (element instanceof OneReference) {
|
||||
(<OneReferenceTemplate>templateData).set(element);
|
||||
} else {
|
||||
throw templateId;
|
||||
}
|
||||
}
|
||||
|
||||
disposeTemplate(tree: tree.ITree, templateId: string, templateData: FileReferencesTemplate | OneReferenceTemplate): void {
|
||||
if (templateData instanceof FileReferencesTemplate) {
|
||||
templateData.dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class AriaProvider implements tree.IAccessibilityProvider {
|
||||
|
||||
getAriaLabel(tree: tree.ITree, element: FileReferences | OneReference): string {
|
||||
if (element instanceof FileReferences) {
|
||||
return element.getAriaMessage();
|
||||
} else if (element instanceof OneReference) {
|
||||
return element.getAriaMessage();
|
||||
} else {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class VSash {
|
||||
|
||||
private _disposables: IDisposable[] = [];
|
||||
@@ -519,23 +234,24 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
private _callOnDispose: IDisposable[] = [];
|
||||
private _onDidSelectReference = new Emitter<SelectionEvent>();
|
||||
|
||||
private _tree: WorkbenchTree;
|
||||
private _treeContainer: Builder;
|
||||
private _treeDataSource: DataSource;
|
||||
private _tree: WorkbenchAsyncDataTree<TreeElement>;
|
||||
private _treeContainer: HTMLElement;
|
||||
private _sash: VSash;
|
||||
private _preview: ICodeEditor;
|
||||
private _previewModelReference: IReference<ITextEditorModel>;
|
||||
private _previewNotAvailableMessage: TextModel;
|
||||
private _previewContainer: Builder;
|
||||
private _messageContainer: Builder;
|
||||
private _previewContainer: HTMLElement;
|
||||
private _messageContainer: HTMLElement;
|
||||
|
||||
constructor(
|
||||
editor: ICodeEditor,
|
||||
private _defaultTreeKeyboardSupport: boolean,
|
||||
public layoutData: LayoutData,
|
||||
@IThemeService themeService: IThemeService,
|
||||
@ITextModelService private _textModelResolverService: ITextModelService,
|
||||
@IInstantiationService private _instantiationService: IInstantiationService,
|
||||
@IUriDisplayService private _uriDisplay: IUriDisplayService
|
||||
@ITextModelService private readonly _textModelResolverService: ITextModelService,
|
||||
@IInstantiationService private readonly _instantiationService: IInstantiationService,
|
||||
@ILabelService private readonly _uriLabel: ILabelService
|
||||
) {
|
||||
super(editor, { showFrame: false, showArrow: true, isResizeable: true, isAccessible: true });
|
||||
|
||||
@@ -545,7 +261,7 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
}
|
||||
|
||||
private _applyTheme(theme: ITheme) {
|
||||
let borderColor = theme.getColor(peekViewBorder) || Color.transparent;
|
||||
const borderColor = theme.getColor(peekViewBorder) || Color.transparent;
|
||||
this.style({
|
||||
arrowColor: borderColor,
|
||||
frameColor: borderColor,
|
||||
@@ -575,7 +291,7 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
this._tree.domFocus();
|
||||
}
|
||||
|
||||
protected _onTitleClick(e: MouseEvent): void {
|
||||
protected _onTitleClick(e: IMouseEvent): void {
|
||||
if (this._preview && this._preview.getModel()) {
|
||||
this._onDidSelectReference.fire({
|
||||
element: this._getFocusedReference(),
|
||||
@@ -586,96 +302,102 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
}
|
||||
|
||||
protected _fillBody(containerElement: HTMLElement): void {
|
||||
let container = $(containerElement);
|
||||
|
||||
this.setCssClass('reference-zone-widget');
|
||||
|
||||
// message pane
|
||||
container.div({ 'class': 'messages' }, div => {
|
||||
this._messageContainer = div.hide();
|
||||
});
|
||||
this._messageContainer = dom.append(containerElement, dom.$('div.messages'));
|
||||
dom.hide(this._messageContainer);
|
||||
|
||||
// editor
|
||||
container.div({ 'class': 'preview inline' }, (div: Builder) => {
|
||||
|
||||
let options: IEditorOptions = {
|
||||
scrollBeyondLastLine: false,
|
||||
scrollbar: {
|
||||
verticalScrollbarSize: 14,
|
||||
horizontal: 'auto',
|
||||
useShadows: true,
|
||||
verticalHasArrows: false,
|
||||
horizontalHasArrows: false
|
||||
},
|
||||
overviewRulerLanes: 2,
|
||||
fixedOverflowWidgets: true,
|
||||
minimap: {
|
||||
enabled: false
|
||||
}
|
||||
};
|
||||
|
||||
this._preview = this._instantiationService.createInstance(EmbeddedCodeEditorWidget, div.getHTMLElement(), options, this.editor);
|
||||
this._previewContainer = div.hide();
|
||||
this._previewNotAvailableMessage = TextModel.createFromString(nls.localize('missingPreviewMessage', "no preview available"));
|
||||
});
|
||||
this._previewContainer = dom.append(containerElement, dom.$('div.preview.inline'));
|
||||
let options: IEditorOptions = {
|
||||
scrollBeyondLastLine: false,
|
||||
scrollbar: {
|
||||
verticalScrollbarSize: 14,
|
||||
horizontal: 'auto',
|
||||
useShadows: true,
|
||||
verticalHasArrows: false,
|
||||
horizontalHasArrows: false
|
||||
},
|
||||
overviewRulerLanes: 2,
|
||||
fixedOverflowWidgets: true,
|
||||
minimap: {
|
||||
enabled: false
|
||||
}
|
||||
};
|
||||
this._preview = this._instantiationService.createInstance(EmbeddedCodeEditorWidget, this._previewContainer, options, this.editor);
|
||||
dom.hide(this._previewContainer);
|
||||
this._previewNotAvailableMessage = TextModel.createFromString(nls.localize('missingPreviewMessage', "no preview available"));
|
||||
|
||||
// sash
|
||||
this._sash = new VSash(containerElement, this.layoutData.ratio || .8);
|
||||
this._sash.onDidChangePercentages(() => {
|
||||
let [left, right] = this._sash.percentages;
|
||||
this._previewContainer.style({ width: left });
|
||||
this._treeContainer.style({ width: right });
|
||||
this._previewContainer.style.width = left;
|
||||
this._treeContainer.style.width = right;
|
||||
this._preview.layout();
|
||||
this._tree.layout();
|
||||
this.layoutData.ratio = this._sash.ratio;
|
||||
});
|
||||
|
||||
// tree
|
||||
container.div({ 'class': 'ref-tree inline' }, (div: Builder) => {
|
||||
let controller = this._instantiationService.createInstance(Controller, { keyboardSupport: this._defaultTreeKeyboardSupport, clickBehavior: ClickBehavior.ON_MOUSE_UP /* our controller already deals with this */ });
|
||||
this._callOnDispose.push(controller);
|
||||
this._treeContainer = dom.append(containerElement, dom.$('div.ref-tree.inline'));
|
||||
|
||||
let config = <tree.ITreeConfiguration>{
|
||||
dataSource: this._instantiationService.createInstance(DataSource),
|
||||
renderer: this._instantiationService.createInstance(Renderer),
|
||||
controller,
|
||||
accessibilityProvider: new AriaProvider()
|
||||
};
|
||||
const renderer = [
|
||||
this._instantiationService.createInstance(FileReferencesRenderer),
|
||||
this._instantiationService.createInstance(OneReferenceRenderer),
|
||||
];
|
||||
|
||||
let options: tree.ITreeOptions = {
|
||||
twistiePixels: 20,
|
||||
ariaLabel: nls.localize('treeAriaLabel', "References")
|
||||
};
|
||||
const treeOptions = {
|
||||
ariaLabel: nls.localize('treeAriaLabel', "References"),
|
||||
keyboardSupport: this._defaultTreeKeyboardSupport,
|
||||
accessibilityProvider: new AriaProvider()
|
||||
};
|
||||
|
||||
this._tree = this._instantiationService.createInstance(WorkbenchTree, div.getHTMLElement(), config, options);
|
||||
this._treeDataSource = this._instantiationService.createInstance(DataSource);
|
||||
|
||||
ctxReferenceWidgetSearchTreeFocused.bindTo(this._tree.contextKeyService);
|
||||
this._tree = this._instantiationService.createInstance(
|
||||
WorkbenchAsyncDataTree, this._treeContainer, new Delegate(),
|
||||
renderer as any,
|
||||
this._treeDataSource,
|
||||
treeOptions
|
||||
) as any as WorkbenchAsyncDataTree<TreeElement>;
|
||||
|
||||
// listen on selection and focus
|
||||
let onEvent = (element: any, kind: 'show' | 'goto' | 'side') => {
|
||||
if (element instanceof OneReference) {
|
||||
if (kind === 'show') {
|
||||
this._revealReference(element, false);
|
||||
}
|
||||
this._onDidSelectReference.fire({ element, kind, source: 'tree' });
|
||||
ctxReferenceWidgetSearchTreeFocused.bindTo(this._tree.contextKeyService);
|
||||
|
||||
// listen on selection and focus
|
||||
let onEvent = (element: any, kind: 'show' | 'goto' | 'side') => {
|
||||
if (element instanceof OneReference) {
|
||||
if (kind === 'show') {
|
||||
this._revealReference(element, false);
|
||||
}
|
||||
};
|
||||
this._disposables.push(this._tree.onDidChangeFocus(event => {
|
||||
if (event && event.payload && event.payload.origin === 'keyboard') {
|
||||
onEvent(event.focus, 'show'); // only handle events from keyboard, mouse/touch is handled by other listeners below
|
||||
}
|
||||
}));
|
||||
this._disposables.push(this._tree.onDidChangeSelection(event => {
|
||||
if (event && event.payload && event.payload.origin === 'keyboard') {
|
||||
onEvent(event.selection[0], 'goto'); // only handle events from keyboard, mouse/touch is handled by other listeners below
|
||||
}
|
||||
}));
|
||||
this._disposables.push(controller.onDidFocus(element => onEvent(element, 'show')));
|
||||
this._disposables.push(controller.onDidSelect(element => onEvent(element, 'goto')));
|
||||
this._disposables.push(controller.onDidOpenToSide(element => onEvent(element, 'side')));
|
||||
|
||||
this._treeContainer = div.hide();
|
||||
this._onDidSelectReference.fire({ element, kind, source: 'tree' });
|
||||
}
|
||||
};
|
||||
this._tree.onDidChangeFocus(e => {
|
||||
onEvent(e.elements[0], 'show');
|
||||
});
|
||||
this._tree.onDidChangeSelection(e => {
|
||||
let aside = false;
|
||||
let goto = false;
|
||||
if (e.browserEvent instanceof KeyboardEvent) {
|
||||
// todo@joh make this a command
|
||||
goto = true;
|
||||
|
||||
} else if (e.browserEvent instanceof MouseEvent) {
|
||||
aside = e.browserEvent.metaKey || e.browserEvent.metaKey || e.browserEvent.altKey;
|
||||
goto = e.browserEvent.detail === 2;
|
||||
}
|
||||
if (aside) {
|
||||
onEvent(e.elements[0], 'side');
|
||||
} else if (goto) {
|
||||
onEvent(e.elements[0], 'goto');
|
||||
} else {
|
||||
onEvent(e.elements[0], 'show');
|
||||
}
|
||||
});
|
||||
|
||||
dom.hide(this._treeContainer);
|
||||
}
|
||||
|
||||
protected _doLayoutBody(heightInPixel: number, widthInPixel: number): void {
|
||||
@@ -687,9 +409,10 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
|
||||
// set height/width
|
||||
const [left, right] = this._sash.percentages;
|
||||
this._previewContainer.style({ height, width: left });
|
||||
this._treeContainer.style({ height, width: right });
|
||||
|
||||
this._previewContainer.style.height = height;
|
||||
this._previewContainer.style.width = left;
|
||||
this._treeContainer.style.height = height;
|
||||
this._treeContainer.style.width = right;
|
||||
// forward
|
||||
this._tree.layout(heightInPixel);
|
||||
this._preview.layout();
|
||||
@@ -708,14 +431,17 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
|
||||
public setSelection(selection: OneReference): Promise<any> {
|
||||
return this._revealReference(selection, true).then(() => {
|
||||
|
||||
if (!this._model) {
|
||||
// disposed
|
||||
return;
|
||||
}
|
||||
// show in tree
|
||||
this._tree.setSelection([selection]);
|
||||
this._tree.setFocus(selection);
|
||||
this._tree.setFocus([selection]);
|
||||
});
|
||||
}
|
||||
|
||||
public setModel(newModel: ReferencesModel): TPromise<any> {
|
||||
public setModel(newModel: ReferencesModel): Thenable<any> {
|
||||
// clean up
|
||||
this._disposeOnNewModel = dispose(this._disposeOnNewModel);
|
||||
this._model = newModel;
|
||||
@@ -725,15 +451,16 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
private _onNewModel(): TPromise<any> {
|
||||
private _onNewModel(): Thenable<any> {
|
||||
|
||||
if (this._model.empty) {
|
||||
this.setTitle('');
|
||||
this._messageContainer.innerHtml(nls.localize('noResults', "No results")).show();
|
||||
return TPromise.as(void 0);
|
||||
this._messageContainer.innerHTML = nls.localize('noResults', "No results");
|
||||
dom.show(this._messageContainer);
|
||||
return Promise.resolve(void 0);
|
||||
}
|
||||
|
||||
this._messageContainer.hide();
|
||||
dom.hide(this._messageContainer);
|
||||
this._decorationsManager = new DecorationsManager(this._preview, this._model);
|
||||
this._disposeOnNewModel.push(this._decorationsManager);
|
||||
|
||||
@@ -743,30 +470,35 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
// listen on editor
|
||||
this._disposeOnNewModel.push(this._preview.onMouseDown(e => {
|
||||
const { event, target } = e;
|
||||
if (event.detail === 2) {
|
||||
this._onDidSelectReference.fire({
|
||||
element: { uri: this._getFocusedReference().uri, range: target.range },
|
||||
kind: (event.ctrlKey || event.metaKey || event.altKey) ? 'side' : 'open',
|
||||
source: 'editor'
|
||||
});
|
||||
if (event.detail !== 2) {
|
||||
return;
|
||||
}
|
||||
const element = this._getFocusedReference();
|
||||
if (!element) {
|
||||
return;
|
||||
}
|
||||
this._onDidSelectReference.fire({
|
||||
element: { uri: element.uri, range: target.range },
|
||||
kind: (event.ctrlKey || event.metaKey || event.altKey) ? 'side' : 'open',
|
||||
source: 'editor'
|
||||
});
|
||||
}));
|
||||
|
||||
// make sure things are rendered
|
||||
dom.addClass(this.container, 'results-loaded');
|
||||
this._treeContainer.show();
|
||||
this._previewContainer.show();
|
||||
dom.show(this._treeContainer);
|
||||
dom.show(this._previewContainer);
|
||||
this._preview.layout();
|
||||
this._tree.layout();
|
||||
this.focus();
|
||||
|
||||
// pick input and a reference to begin with
|
||||
const input = this._model.groups.length === 1 ? this._model.groups[0] : this._model;
|
||||
return this._tree.setInput(input);
|
||||
this._treeDataSource.root = this._model.groups.length === 1 ? this._model.groups[0] : this._model;
|
||||
return this._tree.refresh(null);
|
||||
}
|
||||
|
||||
private _getFocusedReference(): OneReference {
|
||||
const element = this._tree.getFocus();
|
||||
const [element] = this._tree.getFocus();
|
||||
if (element instanceof OneReference) {
|
||||
return element;
|
||||
} else if (element instanceof FileReferences) {
|
||||
@@ -777,46 +509,58 @@ export class ReferenceWidget extends PeekViewWidget {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
private _revealedReference?: OneReference;
|
||||
|
||||
private async _revealReference(reference: OneReference, revealParent: boolean): Promise<void> {
|
||||
|
||||
// check if there is anything to do...
|
||||
if (this._revealedReference === reference) {
|
||||
return;
|
||||
}
|
||||
this._revealedReference = reference;
|
||||
|
||||
// Update widget header
|
||||
if (reference.uri.scheme !== Schemas.inMemory) {
|
||||
this.setTitle(basenameOrAuthority(reference.uri), this._uriDisplay.getLabel(dirname(reference.uri), false));
|
||||
this.setTitle(basenameOrAuthority(reference.uri), this._uriLabel.getUriLabel(dirname(reference.uri)));
|
||||
} else {
|
||||
this.setTitle(nls.localize('peekView.alternateTitle', "References"));
|
||||
}
|
||||
|
||||
const promise = this._textModelResolverService.createModelReference(reference.uri);
|
||||
|
||||
if (revealParent) {
|
||||
await this._tree.reveal(reference.parent);
|
||||
if (this._treeDataSource.root === reference.parent) {
|
||||
this._tree.reveal(reference);
|
||||
} else {
|
||||
if (revealParent) {
|
||||
this._tree.reveal(reference.parent);
|
||||
}
|
||||
await this._tree.expand(reference.parent);
|
||||
this._tree.reveal(reference);
|
||||
}
|
||||
|
||||
return TPromise.join([promise, this._tree.reveal(reference)]).then(values => {
|
||||
const ref = values[0];
|
||||
const ref = await promise;
|
||||
|
||||
if (!this._model) {
|
||||
ref.dispose();
|
||||
// disposed
|
||||
return;
|
||||
}
|
||||
if (!this._model) {
|
||||
// disposed
|
||||
ref.dispose();
|
||||
return;
|
||||
}
|
||||
|
||||
dispose(this._previewModelReference);
|
||||
dispose(this._previewModelReference);
|
||||
|
||||
// show in editor
|
||||
const model = ref.object;
|
||||
if (model) {
|
||||
this._previewModelReference = ref;
|
||||
let isSameModel = (this._preview.getModel() === model.textEditorModel);
|
||||
this._preview.setModel(model.textEditorModel);
|
||||
let sel = Range.lift(reference.range).collapseToStart();
|
||||
this._preview.setSelection(sel);
|
||||
this._preview.revealRangeInCenter(sel, isSameModel ? editorCommon.ScrollType.Smooth : editorCommon.ScrollType.Immediate);
|
||||
} else {
|
||||
this._preview.setModel(this._previewNotAvailableMessage);
|
||||
ref.dispose();
|
||||
}
|
||||
}, onUnexpectedError);
|
||||
// show in editor
|
||||
const model = ref.object;
|
||||
if (model) {
|
||||
const scrollType = this._preview.getModel() === model.textEditorModel ? editorCommon.ScrollType.Smooth : editorCommon.ScrollType.Immediate;
|
||||
const sel = Range.lift(reference.range).collapseToStart();
|
||||
this._previewModelReference = ref;
|
||||
this._preview.setModel(model.textEditorModel);
|
||||
this._preview.setSelection(sel);
|
||||
this._preview.revealRangeInCenter(sel, scrollType);
|
||||
} else {
|
||||
this._preview.setModel(this._previewNotAvailableMessage);
|
||||
ref.dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -841,43 +585,43 @@ export const peekViewEditorMatchHighlightBorder = registerColor('peekViewEditor.
|
||||
|
||||
|
||||
registerThemingParticipant((theme, collector) => {
|
||||
let findMatchHighlightColor = theme.getColor(peekViewResultsMatchHighlight);
|
||||
const findMatchHighlightColor = theme.getColor(peekViewResultsMatchHighlight);
|
||||
if (findMatchHighlightColor) {
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree .referenceMatch { background-color: ${findMatchHighlightColor}; }`);
|
||||
}
|
||||
let referenceHighlightColor = theme.getColor(peekViewEditorMatchHighlight);
|
||||
const referenceHighlightColor = theme.getColor(peekViewEditorMatchHighlight);
|
||||
if (referenceHighlightColor) {
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .preview .reference-decoration { background-color: ${referenceHighlightColor}; }`);
|
||||
}
|
||||
let referenceHighlightBorder = theme.getColor(peekViewEditorMatchHighlightBorder);
|
||||
const referenceHighlightBorder = theme.getColor(peekViewEditorMatchHighlightBorder);
|
||||
if (referenceHighlightBorder) {
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .preview .reference-decoration { border: 2px solid ${referenceHighlightBorder}; box-sizing: border-box; }`);
|
||||
}
|
||||
let hcOutline = theme.getColor(activeContrastBorder);
|
||||
const hcOutline = theme.getColor(activeContrastBorder);
|
||||
if (hcOutline) {
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree .referenceMatch { border: 1px dotted ${hcOutline}; box-sizing: border-box; }`);
|
||||
}
|
||||
let resultsBackground = theme.getColor(peekViewResultsBackground);
|
||||
const resultsBackground = theme.getColor(peekViewResultsBackground);
|
||||
if (resultsBackground) {
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree { background-color: ${resultsBackground}; }`);
|
||||
}
|
||||
let resultsMatchForeground = theme.getColor(peekViewResultsMatchForeground);
|
||||
const resultsMatchForeground = theme.getColor(peekViewResultsMatchForeground);
|
||||
if (resultsMatchForeground) {
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree { color: ${resultsMatchForeground}; }`);
|
||||
}
|
||||
let resultsFileForeground = theme.getColor(peekViewResultsFileForeground);
|
||||
const resultsFileForeground = theme.getColor(peekViewResultsFileForeground);
|
||||
if (resultsFileForeground) {
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree .reference-file { color: ${resultsFileForeground}; }`);
|
||||
}
|
||||
let resultsSelectedBackground = theme.getColor(peekViewResultsSelectionBackground);
|
||||
const resultsSelectedBackground = theme.getColor(peekViewResultsSelectionBackground);
|
||||
if (resultsSelectedBackground) {
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { background-color: ${resultsSelectedBackground}; }`);
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree .monaco-list:focus .monaco-list-rows > .monaco-list-row.selected:not(.highlighted) { background-color: ${resultsSelectedBackground}; }`);
|
||||
}
|
||||
let resultsSelectedForeground = theme.getColor(peekViewResultsSelectionForeground);
|
||||
const resultsSelectedForeground = theme.getColor(peekViewResultsSelectionForeground);
|
||||
if (resultsSelectedForeground) {
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { color: ${resultsSelectedForeground} !important; }`);
|
||||
collector.addRule(`.monaco-editor .reference-zone-widget .ref-tree .monaco-list:focus .monaco-list-rows > .monaco-list-row.selected:not(.highlighted) { color: ${resultsSelectedForeground} !important; }`);
|
||||
}
|
||||
let editorBackground = theme.getColor(peekViewEditorBackground);
|
||||
const editorBackground = theme.getColor(peekViewEditorBackground);
|
||||
if (editorBackground) {
|
||||
collector.addRule(
|
||||
`.monaco-editor .reference-zone-widget .preview .monaco-editor .monaco-editor-background,` +
|
||||
@@ -885,7 +629,7 @@ registerThemingParticipant((theme, collector) => {
|
||||
` background-color: ${editorBackground};` +
|
||||
`}`);
|
||||
}
|
||||
let editorGutterBackground = theme.getColor(peekViewEditorGutterBackground);
|
||||
const editorGutterBackground = theme.getColor(peekViewEditorGutterBackground);
|
||||
if (editorGutterBackground) {
|
||||
collector.addRule(
|
||||
`.monaco-editor .reference-zone-widget .preview .monaco-editor .margin {` +
|
||||
|
||||
Reference in New Issue
Block a user