ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 16:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 8ef8aa6b3cb5b96870660fdd3bb8d0755e62fe51 (#5422)

Browse Source
This commit is contained in:
Anthony Dresser
2019-05-09 11:10:57 -07:00
committed by GitHub
parent 1cc3cb5408
commit 2b9a8b9136
15 changed files with 113 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts
View File

@@ -173,7 +173,7 @@ class OpenExtensionAction extends Action {
}
}
export class ExtensionsTree extends WorkbenchAsyncDataTree<IExtensionData, any> {
export class ExtensionsTree extends WorkbenchAsyncDataTree<IExtensionData, IExtensionData> {
constructor(
input: IExtensionData,
@@ -212,7 +212,9 @@ export class ExtensionsTree extends WorkbenchAsyncDataTree<IExtensionData, any>
this.setInput(input);
this.disposables.push(this.onDidChangeSelection(event => {
extensionsWorkdbenchService.open(event.elements[0], event.browserEvent instanceof MouseEvent && (event.browserEvent.ctrlKey || event.browserEvent.metaKey || event.browserEvent.altKey));
if (event.browserEvent && event.browserEvent instanceof KeyboardEvent) {
extensionsWorkdbenchService.open(event.elements[0].extension, false);
}
}));
}
}

2
src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts
View File

@@ -1066,6 +1066,7 @@ export class SettingsEditor2 extends BaseEditor {
}
this.tocTree.setFocus([]);
this.viewState.filterToCategory = undefined;
this.tocTreeModel.currentSearchModel = this.searchResultModel;
this.onSearchModeToggled();
@@ -1207,6 +1208,7 @@ export class SettingsEditor2 extends BaseEditor {
}
this.tocTree.setFocus([]);
this.viewState.filterToCategory = undefined;
this.tocTree.expandAll();
this.renderTree(undefined, true);

8
src/vs/workbench/contrib/search/browser/search.contribution.ts
View File

@@ -476,6 +476,14 @@ Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new Vie
1
));
Registry.as<PanelRegistry>(PanelExtensions.Panels).registerPanel(new PanelDescriptor(
SearchPanel,
PANEL_ID,
nls.localize('name', "Search"),
'search',
10
));
class RegisterSearchViewContribution implements IWorkbenchContribution {
constructor(