ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-07 17:23:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 718331d6f3ebd1b571530ab499edb266ddd493d5

Browse Source
This commit is contained in:
ADS Merger
2020-02-08 04:50:58 +00:00
parent 8c61538a27
commit 2af13c18d2
752 changed files with 16458 additions and 10063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,7 @@ export class TextModelResolverService implements ITextModelService {
private async doCreateModelReference(resource: URI): Promise<IReference<IResolvedTextEditorModel>> {
// Untitled Schema: go through cached input
// Untitled Schema: go through untitled text service
if (resource.scheme === network.Schemas.untitled) {
const model = await this.untitledTextEditorService.resolve({ untitledResource: resource });
@@ -149,7 +149,6 @@ export class TextModelResolverService implements ITextModelService {
// InMemory Schema: go through model service cache
if (resource.scheme === network.Schemas.inMemory) {
const cachedModel = this.modelService.getModel(resource);
if (!cachedModel) {
throw new Error('Cant resolve inmemory resource');
}

4
src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts → src/vs/workbench/services/textmodelResolver/test/browser/textModelResolverService.test.ts
View File

@@ -9,7 +9,7 @@ import { URI } from 'vs/base/common/uri';
import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { workbenchInstantiationService, TestTextFileService } from 'vs/workbench/test/workbenchTestServices';
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
import { toResource } from 'vs/base/test/common/utils';
import { ITextModelService } from 'vs/editor/common/services/resolverService';
import { IModelService } from 'vs/editor/common/services/modelService';
@@ -26,7 +26,7 @@ class ServiceAccessor {
@ITextModelService public textModelResolverService: ITextModelService,
@IModelService public modelService: IModelService,
@IModeService public modeService: IModeService,
@ITextFileService public textFileService: TestTextFileService,
@ITextFileService public textFileService: ITextFileService,
@IUntitledTextEditorService public untitledTextEditorService: IUntitledTextEditorService
) {
}