ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode e74405d11443c5361c31e2bc341866d146eee206 (#8740)

Browse Source
This commit is contained in:
Anthony Dresser
2019-12-18 23:36:29 -08:00
committed by GitHub
parent 48dcb7258e
commit 099916bf19
109 changed files with 1327 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts
View File

@@ -256,17 +256,17 @@ suite('Workbench base editor', () => {
}
class TestEditorInput extends EditorInput {
constructor(private resource: URI, private id = 'testEditorInput') {
constructor(private resource: URI, private id = 'testEditorInputForMementoTest') {
super();
}
public getTypeId() { return 'testEditorInput'; }
public resolve(): Promise<IEditorModel> { return Promise.resolve(null!); }
getTypeId() { return 'testEditorInputForMementoTest'; }
resolve(): Promise<IEditorModel> { return Promise.resolve(null!); }
public matches(other: TestEditorInput): boolean {
matches(other: TestEditorInput): boolean {
return other && this.id === other.id && other instanceof TestEditorInput;
}
public getResource(): URI {
getResource(): URI {
return this.resource;
}
}

2
src/vs/workbench/test/browser/parts/views/views.test.ts
View File

@@ -15,7 +15,7 @@ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/
import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyService';
import sinon = require('sinon');
const container = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer('test', ViewContainerLocation.Sidebar);
const container = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({ id: 'test', name: 'test' }, ViewContainerLocation.Sidebar);
const ViewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);
class ViewDescriptorSequence {

7
src/vs/workbench/test/browser/quickopen.test.ts
View File

@@ -11,7 +11,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
import { QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenAction, QuickOpenHandler } from 'vs/workbench/browser/quickopen';
export class TestQuickOpenService implements IQuickOpenService {
public _serviceBrand: undefined;
_serviceBrand: undefined;
private callback?: (prefix?: string) => void;
@@ -44,8 +45,8 @@ export class TestQuickOpenService implements IQuickOpenService {
return null!;
}
public dispose() { }
public navigate(): void { }
dispose() { }
navigate(): void { }
}
suite('QuickOpen', () => {

2
src/vs/workbench/test/browser/viewlet.test.ts
View File

@@ -16,7 +16,7 @@ suite('Viewlets', () => {
super('id', null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);
}
public layout(dimension: any): void {
layout(dimension: any): void {
throw new Error('Method not implemented.');
}
}