ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-10 10:12:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

revert vscode cahnges (#4879)

Browse Source
This commit is contained in:
Anthony Dresser
2019-04-05 09:15:38 -07:00
committed by GitHub
parent 572010ded1
commit 9bd7e30d18
9 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/browser/mainThreadSearch.ts
View File

@@ -117,7 +117,7 @@ class RemoteSearchProvider implements ISearchResultProvider, IDisposable {
return this.doSearch(query, undefined, token);
}
textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token: CancellationToken = CancellationToken.None): Promise<ISearchComplete | undefined> {
textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token: CancellationToken = CancellationToken.None): Promise<ISearchComplete> {
return this.doSearch(query, onProgress, token);
}

14
src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
View File

@@ -106,18 +106,6 @@ export class ActivitybarPart extends Part implements IActivityBarService {
this.onDidRegisterViewlets(viewletService.getViewlets());
}
// {{SQL CARBON EDIT}}
private getViewlets(): ViewletDescriptor[] {
const pinnedViewlets = JSON.parse(this.storageService.get(ActivitybarPart.PINNED_VIEWLETS, StorageScope.GLOBAL, null)) as string[];
const allViewLets = this.viewletService.getViewlets();
if (!pinnedViewlets) {
return allViewLets.filter(viewlet => viewlet.id !== 'workbench.view.extensions') ;
}
return allViewLets;
}
private registerListeners(): void {
// Viewlet registration
@@ -523,4 +511,4 @@ export class ActivitybarPart extends Part implements IActivityBarService {
}
}
registerSingleton(IActivityBarService, ActivitybarPart);
registerSingleton(IActivityBarService, ActivitybarPart);

4
src/vs/workbench/browser/parts/editor/editor.contribution.ts
View File

@@ -123,7 +123,7 @@ class UntitledEditorInputFactory implements IEditorInputFactory {
// {{SQL CARBON EDIT}}
if (!untitledEditorInput.getResource()) {
return null;
return undefined;
}
let resource = untitledEditorInput.getResource();
@@ -927,4 +927,4 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
title: nls.localize({ key: 'miSwitchGroup', comment: ['&& denotes a mnemonic'] }, "Switch &&Group"),
submenu: MenuId.MenubarSwitchGroupMenu,
order: 2
});
});

4
src/vs/workbench/contrib/preferences/electron-browser/preferences.contribution.ts
View File

@@ -256,8 +256,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_E),
handler: (accessor, args: any) => {
const control = accessor.get(IEditorService).activeControl as IKeybindingsEditor;
if (control && control instanceof KeybindingsEditor && control.activeKeybindingEntry.keybindingItem.keybinding) {
control.defineWhenExpression(control.activeKeybindingEntry);
if (control && control instanceof KeybindingsEditor && control.activeKeybindingEntry!.keybindingItem.keybinding) {
control.defineWhenExpression(control.activeKeybindingEntry!);
}
}
});

2
src/vs/workbench/contrib/search/browser/searchActions.ts
View File

@@ -71,7 +71,7 @@ export function getSearchView(viewletService: IViewletService, panelService: IPa
return (activePanel as SearchPanel).getSearchView();
}
return null;
return undefined;
}
function doAppendKeyBindingLabel(label: string, keyBinding: ResolvedKeybinding | undefined): string {

5
src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
View File

@@ -111,11 +111,6 @@ export class ExtensionHostProcessWorker implements IExtensionHostStarter {
}));
}
// {{SQL CARBON EDIT}}
public getExtenstionHostProcess(): ChildProcess {
return this._extensionHostProcess;
}
public dispose(): void {
this.terminate();
}

4
src/vs/workbench/services/search/common/search.ts
View File

@@ -48,8 +48,8 @@ export const enum SearchProviderType {
}
export interface ISearchResultProvider {
textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): Promise<ISearchComplete | undefined>;
fileSearch(query: IFileQuery, token?: CancellationToken): Promise<ISearchComplete | undefined>;
textSearch(query: ITextQuery, onProgress?: (p: ISearchProgressItem) => void, token?: CancellationToken): Promise<ISearchComplete>;
fileSearch(query: IFileQuery, token?: CancellationToken): Promise<ISearchComplete>;
clearCache(cacheKey: string): Promise<void>;
}