ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-08 01:28:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

Browse Source 
* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues
This commit is contained in:
Anthony Dresser
2019-12-04 19:28:22 -08:00
committed by GitHub
parent a8818ab0df
commit f5ce7fb2a5
1507 changed files with 42813 additions and 27370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/services/textmodelResolver/common/textModelResolverService.ts
View File

@@ -13,7 +13,7 @@ import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorMo
import { ITextFileService, LoadReason } from 'vs/workbench/services/textfile/common/textfiles';
import * as network from 'vs/base/common/network';
import { ITextModelService, ITextModelContentProvider, ITextEditorModel, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
import { IFileService } from 'vs/platform/files/common/files';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
@@ -126,7 +126,7 @@ export class TextModelResolverService implements ITextModelService {
private resourceModelCollection: ResourceModelCollection;
constructor(
@IUntitledEditorService private readonly untitledEditorService: IUntitledEditorService,
@IUntitledTextEditorService private readonly untitledTextEditorService: IUntitledTextEditorService,
@IInstantiationService private readonly instantiationService: IInstantiationService,
@IModelService private readonly modelService: IModelService
) {
@@ -141,7 +141,7 @@ export class TextModelResolverService implements ITextModelService {
// Untitled Schema: go through cached input
if (resource.scheme === network.Schemas.untitled) {
const model = await this.untitledEditorService.loadOrCreate({ resource });
const model = await this.untitledTextEditorService.loadOrCreate({ resource });
return new ImmortalReference(model as IResolvedTextEditorModel);
}
@@ -179,4 +179,4 @@ export class TextModelResolverService implements ITextModelService {
}
}
registerSingleton(ITextModelService, TextModelResolverService, true);
registerSingleton(ITextModelService, TextModelResolverService, true);

12
src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
View File

@@ -16,7 +16,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
import { IModeService } from 'vs/editor/common/services/modeService';
import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
import { ITextFileService, snapshotToString } from 'vs/workbench/services/textfile/common/textfiles';
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
import { Event } from 'vs/base/common/event';
import { timeout } from 'vs/base/common/async';
@@ -27,7 +27,7 @@ class ServiceAccessor {
@IModelService public modelService: IModelService,
@IModeService public modeService: IModeService,
@ITextFileService public textFileService: TestTextFileService,
@IUntitledEditorService public untitledEditorService: IUntitledEditorService
@IUntitledTextEditorService public untitledTextEditorService: IUntitledTextEditorService
) {
}
}
@@ -50,7 +50,7 @@ suite('Workbench - TextModelResolverService', () => {
}
(<TextFileEditorModelManager>accessor.textFileService.models).clear();
(<TextFileEditorModelManager>accessor.textFileService.models).dispose();
accessor.untitledEditorService.revertAll();
accessor.untitledTextEditorService.revertAll();
});
test('resolve resource', async () => {
@@ -88,11 +88,11 @@ suite('Workbench - TextModelResolverService', () => {
test('resolve file', async function () {
const textModel = instantiationService.createInstance(TextFileEditorModel, toResource.call(this, '/path/file_resolver.txt'), 'utf8', undefined);
(<TextFileEditorModelManager>accessor.textFileService.models).add(textModel.getResource(), textModel);
(<TextFileEditorModelManager>accessor.textFileService.models).add(textModel.resource, textModel);
await textModel.load();
const ref = await accessor.textModelResolverService.createModelReference(textModel.getResource());
const ref = await accessor.textModelResolverService.createModelReference(textModel.resource);
const model = ref.object;
const editorModel = model.textEditorModel;
@@ -111,7 +111,7 @@ suite('Workbench - TextModelResolverService', () => {
});
test('resolve untitled', async () => {
const service = accessor.untitledEditorService;
const service = accessor.untitledTextEditorService;
const input = service.createOrGet();
await input.resolve();