提交 a793d35e 编写于 作者: S Sandeep Somavarapu

Fix #16660

上级 3649c501
...@@ -21,6 +21,7 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer ...@@ -21,6 +21,7 @@ import { IEditorGroupService } from 'vs/workbench/services/group/common/groupSer
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
import { IFileService, IFileOperationResult, FileOperationResult } from 'vs/platform/files/common/files'; import { IFileService, IFileOperationResult, FileOperationResult } from 'vs/platform/files/common/files';
import { IMessageService, Severity, IChoiceService } from 'vs/platform/message/common/message'; import { IMessageService, Severity, IChoiceService } from 'vs/platform/message/common/message';
import { IExtensionService } from 'vs/platform/extensions/common/extensions';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IEnvironmentService } from 'vs/platform/environment/common/environment';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
...@@ -64,7 +65,8 @@ export class PreferencesService extends Disposable implements IPreferencesServic ...@@ -64,7 +65,8 @@ export class PreferencesService extends Disposable implements IPreferencesServic
@IEnvironmentService private environmentService: IEnvironmentService, @IEnvironmentService private environmentService: IEnvironmentService,
@ITelemetryService private telemetryService: ITelemetryService, @ITelemetryService private telemetryService: ITelemetryService,
@ITextModelResolverService private textModelResolverService: ITextModelResolverService, @ITextModelResolverService private textModelResolverService: ITextModelResolverService,
@IConfigurationEditingService private configurationEditingService: IConfigurationEditingService @IConfigurationEditingService private configurationEditingService: IConfigurationEditingService,
@IExtensionService private extensionService: IExtensionService
) { ) {
super(); super();
this.defaultEditorModels = new Map<URI, IPreferencesEditorModel>(); this.defaultEditorModels = new Map<URI, IPreferencesEditorModel>();
...@@ -77,8 +79,9 @@ export class PreferencesService extends Disposable implements IPreferencesServic ...@@ -77,8 +79,9 @@ export class PreferencesService extends Disposable implements IPreferencesServic
} }
if (PreferencesService.DEFAULT_SETTINGS_URI.fsPath === uri.fsPath) { if (PreferencesService.DEFAULT_SETTINGS_URI.fsPath === uri.fsPath) {
return this.fetchMostCommonlyUsedSettings() return TPromise.join<any>([this.extensionService.onReady(), this.fetchMostCommonlyUsedSettings()])
.then(mostCommonSettings => { .then(result => {
const mostCommonSettings = result[1];
const model = this.instantiationService.createInstance(DefaultSettingsEditorModel, uri, mostCommonSettings); const model = this.instantiationService.createInstance(DefaultSettingsEditorModel, uri, mostCommonSettings);
this.defaultEditorModels.set(uri, model); this.defaultEditorModels.set(uri, model);
return model; return model;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册