Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 83660da7 编写于 作者: R Rob Lourens
浏览文件
操作

Replace TPromise in settings #53526

上级 ca6e101a
隐藏空白更改
内联 并排
Showing with 168 addition and 179 deletion
src/vs/workbench/parts/preferences/browser/preferencesActions.ts
浏览文件 @ 83660da7
......@@ -6,7 +6,6 @@
import { Action } from 'vs/base/common/actions';
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { IModelService } from 'vs/editor/common/services/modelService';
import { IModeService } from 'vs/editor/common/services/modeService';
import * as nls from 'vs/nls';
......@@ -30,7 +29,7 @@ export class OpenRawDefaultSettingsAction extends Action {
super(id, label);
}
public run(event?: any): TPromise<any> {
public run(event?: any): Thenable<any> {
return this.preferencesService.openRawDefaultSettings();
}
}
......@@ -48,7 +47,7 @@ export class OpenSettings2Action extends Action {
super(id, label);
}
public run(event?: any): TPromise<any> {
public run(event?: any): Thenable<any> {
return this.preferencesService.openSettings(false);
}
}
......@@ -66,7 +65,7 @@ export class OpenSettingsAction extends Action {
super(id, label);
}
public run(event?: any): TPromise<any> {
public run(event?: any): Thenable<any> {
return this.preferencesService.openSettings();
}
}
......@@ -84,7 +83,7 @@ export class OpenSettingsJsonAction extends Action {
super(id, label);
}
public run(event?: any): TPromise<any> {
public run(event?: any): Thenable<any> {
return this.preferencesService.openSettings(true);
}
}
......@@ -102,7 +101,7 @@ export class OpenGlobalSettingsAction extends Action {
super(id, label);
}
public run(event?: any): TPromise<any> {
public run(event?: any): Thenable<any> {
return this.preferencesService.openGlobalSettings();
}
}
......@@ -120,7 +119,7 @@ export class OpenGlobalKeybindingsAction extends Action {
super(id, label);
}
public run(event?: any): TPromise<any> {
public run(event?: any): Thenable<any> {
return this.preferencesService.openGlobalKeybindingSettings(false);
}
}
......@@ -138,7 +137,7 @@ export class OpenGlobalKeybindingsFileAction extends Action {
super(id, label);
}
public run(event?: any): TPromise<any> {
public run(event?: any): Thenable<any> {
return this.preferencesService.openGlobalKeybindingSettings(true);
}
}
......@@ -156,7 +155,7 @@ export class OpenDefaultKeybindingsFileAction extends Action {
super(id, label);
}
public run(event?: any): TPromise<any> {
public run(event?: any): Thenable<any> {
return this.preferencesService.openDefaultKeybindingsFile();
}
}
......@@ -183,7 +182,7 @@ export class OpenWorkspaceSettingsAction extends Action {
this.enabled = this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY;
}
public run(event?: any): TPromise<any> {
public run(event?: any): Thenable<any> {
return this.preferencesService.openWorkspaceSettings();
}
......@@ -220,7 +219,7 @@ export class OpenFolderSettingsAction extends Action {
this.enabled = this.workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.workspaceContextService.getWorkspace().folders.length > 0;
}
public run(): TPromise<any> {
public run(): Thenable<any> {
return this.commandService.executeCommand<IWorkspaceFolder>(PICK_WORKSPACE_FOLDER_COMMAND_ID)
.then(workspaceFolder => {
if (workspaceFolder) {
......@@ -253,7 +252,7 @@ export class ConfigureLanguageBasedSettingsAction extends Action {
super(id, label);
}
public run(): TPromise<any> {
public run(): Thenable<any> {
const languages = this.modeService.getRegisteredLanguageNames();
const picks: IQuickPickItem[] = languages.sort().map((lang, index) => {
let description: string = nls.localize('languageDescriptionConfigured', "({0})", this.modeService.getModeIdForLanguageName(lang.toLowerCase()));
......
src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
浏览文件 @ 83660da7
......@@ -16,7 +16,6 @@ import { ArrayNavigator } from 'vs/base/common/iterator';
import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
import * as strings from 'vs/base/common/strings';
import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { EditorExtensionsRegistry, IEditorContributionCtor, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
......@@ -204,7 +203,7 @@ export class PreferencesEditor extends BaseEditor {
super.setEditorVisible(visible, group);
}
private updateInput(newInput: PreferencesEditorInput, options: EditorOptions, token: CancellationToken): TPromise<void> {
private updateInput(newInput: PreferencesEditorInput, options: EditorOptions, token: CancellationToken): Promise<void> {
return this.sideBySidePreferencesWidget.setInput(<DefaultPreferencesEditorInput>newInput.details, <EditorInput>newInput.master, options, token).then(({ defaultPreferencesRenderer, editablePreferencesRenderer }) => {
if (token.isCancellationRequested) {
return void 0;
......@@ -230,12 +229,12 @@ export class PreferencesEditor extends BaseEditor {
});
}
private triggerSearch(query: string): TPromise<void> {
private triggerSearch(query: string): Promise<void> {
if (query) {
return TPromise.join([
return Promise.all([
this.localSearchDelayer.trigger(() => this.preferencesRenderers.localFilterPreferences(query).then(() => { })),
this.remoteSearchThrottle.trigger(() => TPromise.wrap(this.progressService.showWhile(this.preferencesRenderers.remoteSearchPreferences(query), 500)))
]) as TPromise;
this.remoteSearchThrottle.trigger(() => Promise.resolve(this.progressService.showWhile(this.preferencesRenderers.remoteSearchPreferences(query), 500)))
]).then(() => { });
} else {
// When clearing the input, update immediately to clear it
this.localSearchDelayer.cancel();
......@@ -251,8 +250,8 @@ export class PreferencesEditor extends BaseEditor {
if (this.editorService.activeControl !== this) {
this.focus();
}
const promise = this.input && this.input.isDirty() ? this.input.save() : TPromise.as(true);
promise.then(value => {
const promise: Thenable<boolean> = this.input && this.input.isDirty() ? this.input.save() : Promise.resolve(true);
promise.then(() => {
if (target === ConfigurationTarget.USER) {
this.preferencesService.switchSettings(ConfigurationTarget.USER, this.preferencesService.userSettingsResource, true);
} else if (target === ConfigurationTarget.WORKSPACE) {
......@@ -438,7 +437,7 @@ class PreferencesRenderersController extends Disposable {
this._prefsModelsForSearch = new Map<string, ISettingsEditorModel>();
}
remoteSearchPreferences(query: string, updateCurrentResults?: boolean): TPromise<void> {
remoteSearchPreferences(query: string, updateCurrentResults?: boolean): Promise<void> {
if (this.lastFilterResult && this.lastFilterResult.exactMatch) {
// Skip and clear remote search
query = '';
......@@ -467,7 +466,7 @@ class PreferencesRenderersController extends Disposable {
});
}
localFilterPreferences(query: string, updateCurrentResults?: boolean): TPromise<boolean> {
localFilterPreferences(query: string, updateCurrentResults?: boolean): Promise<boolean> {
if (this._settingsNavigator) {
this._settingsNavigator.reset();
}
......@@ -476,10 +475,10 @@ class PreferencesRenderersController extends Disposable {
return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"), 0, undefined, updateCurrentResults);
}
private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken, editableContentOnly?: boolean): TPromise<boolean> {
private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken, editableContentOnly?: boolean): Promise<boolean> {
this._lastQuery = query;
const filterPs: TPromise<IFilterResult>[] = [this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder, token)];
const filterPs: Promise<IFilterResult>[] = [this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder, token)];
if (!editableContentOnly) {
filterPs.push(
this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder, token));
......@@ -487,7 +486,7 @@ class PreferencesRenderersController extends Disposable {
this.searchAllSettingsTargets(query, searchProvider, groupId, groupLabel, groupOrder, token).then(() => null));
}
return TPromise.join(filterPs).then(results => {
return Promise.all(filterPs).then(results => {
let [editableFilterResult, defaultFilterResult] = results;
if (!defaultFilterResult && editableContentOnly) {
......@@ -501,7 +500,7 @@ class PreferencesRenderersController extends Disposable {
});
}
private searchAllSettingsTargets(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): TPromise<void> {
private searchAllSettingsTargets(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): Promise<void> {
const searchPs = [
this.searchSettingsTarget(query, searchProvider, ConfigurationTarget.WORKSPACE, groupId, groupLabel, groupOrder, token),
this.searchSettingsTarget(query, searchProvider, ConfigurationTarget.USER, groupId, groupLabel, groupOrder, token)
......@@ -513,7 +512,7 @@ class PreferencesRenderersController extends Disposable {
}
return TPromise.join(searchPs).then(() => { });
return Promise.all(searchPs).then(() => { });
}
private searchSettingsTarget(query: string, provider: ISearchProvider, target: SettingsTarget, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): Promise<void> {
......@@ -530,7 +529,7 @@ class PreferencesRenderersController extends Disposable {
this._onDidFilterResultsCountChange.fire({ target, count });
}, err => {
if (!isPromiseCanceledError(err)) {
return TPromise.wrapError(err);
return Promise.reject(err);
}
return null;
......@@ -582,9 +581,9 @@ class PreferencesRenderersController extends Disposable {
}
}
private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer<ISetting>, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): TPromise<IFilterResult> {
private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer<ISetting>, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): Promise<IFilterResult> {
if (!preferencesRenderer) {
return TPromise.wrap(null);
return Promise.resolve(null);
}
const model = <ISettingsEditorModel>preferencesRenderer.preferencesModel;
......@@ -594,12 +593,12 @@ class PreferencesRenderersController extends Disposable {
});
}
private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): TPromise<IFilterResult> {
const searchP = provider ? provider.searchModel(model, token) : TPromise.wrap(null);
private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, token?: CancellationToken): Promise<IFilterResult> {
const searchP = provider ? provider.searchModel(model, token) : Promise.resolve(null);
return searchP
.then<ISearchResult>(null, err => {
if (isPromiseCanceledError(err)) {
return TPromise.wrapError(err);
return Promise.reject(err);
} else {
/* __GDPR__
"defaultSettings.searchError" : {
......@@ -845,10 +844,10 @@ class SideBySidePreferencesWidget extends Widget {
this._register(focusTracker.onDidFocus(() => this._onFocus.fire()));
}
public setInput(defaultPreferencesEditorInput: DefaultPreferencesEditorInput, editablePreferencesEditorInput: EditorInput, options: EditorOptions, token: CancellationToken): TPromise<{ defaultPreferencesRenderer?: IPreferencesRenderer<ISetting>, editablePreferencesRenderer?: IPreferencesRenderer<ISetting> }> {
public setInput(defaultPreferencesEditorInput: DefaultPreferencesEditorInput, editablePreferencesEditorInput: EditorInput, options: EditorOptions, token: CancellationToken): Promise<{ defaultPreferencesRenderer?: IPreferencesRenderer<ISetting>, editablePreferencesRenderer?: IPreferencesRenderer<ISetting> }> {
this.getOrCreateEditablePreferencesEditor(editablePreferencesEditorInput);
this.settingsTargetsWidget.settingsTarget = this.getSettingsTarget(editablePreferencesEditorInput.getResource());
return TPromise.join([
return Promise.all([
this.updateInput(this.defaultPreferencesEditor, defaultPreferencesEditorInput, DefaultSettingsEditorContribution.ID, editablePreferencesEditorInput.getResource(), options, token),
this.updateInput(this.editablePreferencesEditor, editablePreferencesEditorInput, SettingsEditorContribution.ID, defaultPreferencesEditorInput.getResource(), options, token)
])
......@@ -1076,13 +1075,13 @@ export class DefaultPreferencesEditor extends BaseTextEditor {
interface ISettingsEditorContribution extends editorCommon.IEditorContribution {
updatePreferencesRenderer(associatedPreferencesModelUri: URI): TPromise<IPreferencesRenderer<ISetting>>;
updatePreferencesRenderer(associatedPreferencesModelUri: URI): Thenable<IPreferencesRenderer<ISetting>>;
}
abstract class AbstractSettingsEditorContribution extends Disposable implements ISettingsEditorContribution {
private preferencesRendererCreationPromise: TPromise<IPreferencesRenderer<ISetting>>;
private preferencesRendererCreationPromise: Thenable<IPreferencesRenderer<ISetting>>;
constructor(protected editor: ICodeEditor,
@IInstantiationService protected instantiationService: IInstantiationService,
......@@ -1093,7 +1092,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
this._register(this.editor.onDidChangeModel(() => this._onModelChanged()));
}
updatePreferencesRenderer(associatedPreferencesModelUri: URI): TPromise<IPreferencesRenderer<ISetting>> {
updatePreferencesRenderer(associatedPreferencesModelUri: URI): Thenable<IPreferencesRenderer<ISetting>> {
if (!this.preferencesRendererCreationPromise) {
this.preferencesRendererCreationPromise = this._createPreferencesRenderer();
}
......@@ -1103,7 +1102,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
.then(changed => changed ? this._updatePreferencesRenderer(associatedPreferencesModelUri) : this.preferencesRendererCreationPromise);
}
return TPromise.as(null);
return Promise.resolve(null);
}
protected _onModelChanged(): void {
......@@ -1114,13 +1113,13 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
}
}
private _hasAssociatedPreferencesModelChanged(associatedPreferencesModelUri: URI): TPromise<boolean> {
private _hasAssociatedPreferencesModelChanged(associatedPreferencesModelUri: URI): Thenable<boolean> {
return this.preferencesRendererCreationPromise.then(preferencesRenderer => {
return !(preferencesRenderer && preferencesRenderer.getAssociatedPreferencesModel() && preferencesRenderer.getAssociatedPreferencesModel().uri.toString() === associatedPreferencesModelUri.toString());
});
}
private _updatePreferencesRenderer(associatedPreferencesModelUri: URI): TPromise<IPreferencesRenderer<ISetting>> {
private _updatePreferencesRenderer(associatedPreferencesModelUri: URI): Thenable<IPreferencesRenderer<ISetting>> {
return this.preferencesService.createPreferencesEditorModel<ISetting>(associatedPreferencesModelUri)
.then(associatedPreferencesEditorModel => {
return this.preferencesRendererCreationPromise.then(preferencesRenderer => {
......@@ -1148,7 +1147,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
preferencesRenderer.dispose();
}
});
this.preferencesRendererCreationPromise = TPromise.as(null);
this.preferencesRendererCreationPromise = Promise.resolve(null);
}
}
......@@ -1157,7 +1156,7 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
super.dispose();
}
protected abstract _createPreferencesRenderer(): TPromise<IPreferencesRenderer<ISetting>>;
protected abstract _createPreferencesRenderer(): Thenable<IPreferencesRenderer<ISetting>>;
abstract getId(): string;
}
......@@ -1169,7 +1168,7 @@ class DefaultSettingsEditorContribution extends AbstractSettingsEditorContributi
return DefaultSettingsEditorContribution.ID;
}
protected _createPreferencesRenderer(): TPromise<IPreferencesRenderer<ISetting>> {
protected _createPreferencesRenderer(): Thenable<IPreferencesRenderer<ISetting>> {
return this.preferencesService.createPreferencesEditorModel(this.editor.getModel().uri)
.then(editorModel => {
if (editorModel instanceof DefaultSettingsEditorModel && this.editor.getModel()) {
......@@ -1199,7 +1198,7 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl
return SettingsEditorContribution.ID;
}
protected _createPreferencesRenderer(): TPromise<IPreferencesRenderer<ISetting>> {
protected _createPreferencesRenderer(): Thenable<IPreferencesRenderer<ISetting>> {
if (this.isSettingsModel()) {
return this.preferencesService.createPreferencesEditorModel(this.editor.getModel().uri)
.then(settingsModel => {
......
src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts
浏览文件 @ 83660da7
......@@ -14,7 +14,6 @@ import { MarkdownString } from 'vs/base/common/htmlContent';
import { KeyCode } from 'vs/base/common/keyCodes';
import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
import { ICodeEditor, IEditorMouseEvent, IViewZone, MouseTargetType } from 'vs/editor/browser/editorBrowser';
import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
......@@ -549,13 +548,13 @@ export class SettingsTargetsWidget extends Widget {
}
}
public updateTarget(settingsTarget: SettingsTarget): TPromise<void> {
public updateTarget(settingsTarget: SettingsTarget): Promise<void> {
const isSameTarget = this.settingsTarget === settingsTarget || settingsTarget instanceof URI && this.settingsTarget instanceof URI && this.settingsTarget.toString() === settingsTarget.toString();
if (!isSameTarget) {
this.settingsTarget = settingsTarget;
this._onDidTargetChange.fire(this.settingsTarget);
}
return TPromise.as(null);
return Promise.resolve(null);
}
private update(): void {
......
src/vs/workbench/parts/preferences/browser/settingsTree.ts
浏览文件 @ 83660da7
......@@ -23,7 +23,6 @@ import { KeyCode } from 'vs/base/common/keyCodes';
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
import { escapeRegExpCharacters, startsWith } from 'vs/base/common/strings';
import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { IAccessibilityProvider, IDataSource, IFilter, IRenderer as ITreeRenderer, ITree, ITreeConfiguration } from 'vs/base/parts/tree/browser/tree';
import { DefaultTreestyler } from 'vs/base/parts/tree/browser/treeDefaults';
import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
......@@ -186,8 +185,8 @@ export class SettingsDataSource implements IDataSource {
return false;
}
getChildren(tree: ITree, element: SettingsTreeElement): TPromise<any> {
return TPromise.as(this._getChildren(element));
getChildren(tree: ITree, element: SettingsTreeElement): Promise<any> {
return Promise.resolve(this._getChildren(element));
}
private _getChildren(element: SettingsTreeElement): SettingsTreeElement[] {
......@@ -199,8 +198,8 @@ export class SettingsDataSource implements IDataSource {
}
}
getParent(tree: ITree, element: SettingsTreeElement): TPromise<any> {
return TPromise.wrap(element && element.parent);
getParent(tree: ITree, element: SettingsTreeElement): Promise<any> {
return Promise.resolve(element && element.parent);
}
shouldAutoexpand(): boolean {
......@@ -241,7 +240,7 @@ export class SimplePagedDataSource implements IDataSource {
return this.realDataSource.hasChildren(tree, element);
}
getChildren(tree: ITree, element: SettingsTreeGroupElement): TPromise<any> {
getChildren(tree: ITree, element: SettingsTreeGroupElement): Thenable<any> {
return this.realDataSource.getChildren(tree, element).then(realChildren => {
return this._getChildren(realChildren);
});
......@@ -258,7 +257,7 @@ export class SimplePagedDataSource implements IDataSource {
}
}
getParent(tree: ITree, element: any): TPromise<any> {
getParent(tree: ITree, element: any): Thenable<any> {
return this.realDataSource.getParent(tree, element);
}
......@@ -400,7 +399,7 @@ export class SettingsRenderer implements ITreeRenderer {
this._onDidChangeSetting.fire({ key: context.setting.key, value: undefined, type: context.setting.type as SettingValueType });
}
return TPromise.wrap(null);
return Promise.resolve(null);
}),
new Separator(),
this.instantiationService.createInstance(CopySettingIdAction),
......@@ -1436,12 +1435,12 @@ export class SettingsAccessibilityProvider implements IAccessibilityProvider {
}
class NonExpandableOrSelectableTree extends Tree {
expand(): TPromise<any> {
return TPromise.wrap(null);
expand(): Promise<any> {
return Promise.resolve(null);
}
collapse(): TPromise<any> {
return TPromise.wrap(null);
collapse(): Promise<any> {
return Promise.resolve(null);
}
public setFocus(element?: any, eventPayload?: any): void {
......@@ -1624,12 +1623,12 @@ class CopySettingIdAction extends Action {
super(CopySettingIdAction.ID, CopySettingIdAction.LABEL);
}
run(context: SettingsTreeSettingElement): TPromise<void> {
run(context: SettingsTreeSettingElement): Promise<void> {
if (context) {
this.clipboardService.writeText(context.setting.key);
}
return TPromise.as(null);
return Promise.resolve(null);
}
}
......@@ -1643,12 +1642,12 @@ class CopySettingAsJSONAction extends Action {
super(CopySettingAsJSONAction.ID, CopySettingAsJSONAction.LABEL);
}
run(context: SettingsTreeSettingElement): TPromise<void> {
run(context: SettingsTreeSettingElement): Promise<void> {
if (context) {
const jsonResult = `"${context.setting.key}": ${JSON.stringify(context.value, undefined, ' ')}`;
this.clipboardService.writeText(jsonResult);
}
return TPromise.as(null);
return Promise.resolve(null);
}
}
src/vs/workbench/parts/preferences/browser/tocTree.ts
浏览文件 @ 83660da7
......@@ -5,7 +5,6 @@
import * as DOM from 'vs/base/browser/dom';
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import { TPromise } from 'vs/base/common/winjs.base';
import { IDataSource, IRenderer, ITree, ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree';
import { DefaultTreestyler } from 'vs/base/parts/tree/browser/treeDefaults';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
......@@ -106,8 +105,8 @@ export class TOCDataSource implements IDataSource {
return false;
}
getChildren(tree: ITree, element: TOCTreeElement): TPromise<SettingsTreeElement[]> {
return TPromise.as(this._getChildren(element));
getChildren(tree: ITree, element: TOCTreeElement): Promise<SettingsTreeElement[]> {
return Promise.resolve(this._getChildren(element));
}
private _getChildren(element: TOCTreeElement): SettingsTreeElement[] {
......@@ -115,8 +114,8 @@ export class TOCDataSource implements IDataSource {
.filter(child => child instanceof SettingsTreeGroupElement);
}
getParent(tree: ITree, element: TOCTreeElement): TPromise<any> {
return TPromise.wrap(element instanceof SettingsTreeGroupElement && element.parent);
getParent(tree: ITree, element: TOCTreeElement): Promise<any> {
return Promise.resolve(element instanceof SettingsTreeGroupElement && element.parent);
}
}
......
src/vs/workbench/parts/preferences/common/preferences.ts
浏览文件 @ 83660da7
......@@ -41,7 +41,7 @@ export interface IPreferencesSearchService {
}
export interface ISearchProvider {
searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): TPromise<ISearchResult>;
searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): Promise<ISearchResult>;
}
export interface IKeybindingsEditor extends IEditor {
......
src/vs/workbench/parts/preferences/common/preferencesContribution.ts
浏览文件 @ 83660da7
......@@ -6,7 +6,6 @@
import { IModelService } from 'vs/editor/common/services/modelService';
import { IModeService } from 'vs/editor/common/services/modeService';
import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { ITextModel } from 'vs/editor/common/model';
import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
import { Registry } from 'vs/platform/registry/common/platform';
......@@ -109,14 +108,14 @@ export class PreferencesContribution implements IWorkbenchContribution {
private start(): void {
this.textModelResolverService.registerTextModelContentProvider('vscode', {
provideTextContent: (uri: URI): TPromise<ITextModel> => {
provideTextContent: (uri: URI): Thenable<ITextModel> => {
if (uri.scheme !== 'vscode') {
return null;
}
if (uri.authority === 'schemas') {
const schemaModel = this.getSchemaModel(uri);
if (schemaModel) {
return TPromise.as(schemaModel);
return Promise.resolve(schemaModel);
}
}
return this.preferencesService.resolveModel(uri);
......
src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
浏览文件 @ 83660da7
......@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { TPromise } from 'vs/base/common/winjs.base';
import { ISettingsEditorModel, ISetting, ISettingsGroup, IFilterMetadata, ISearchResult, IGroupFilter, ISettingMatcher, IScoredResults, ISettingMatch, IRemoteSetting, IExtensionSetting } from 'vs/workbench/services/preferences/common/preferences';
import { IRange } from 'vs/editor/common/core/range';
import { distinct, top } from 'vs/base/common/arrays';
......@@ -32,7 +31,7 @@ export interface IEndpointDetails {
export class PreferencesSearchService extends Disposable implements IPreferencesSearchService {
_serviceBrand: any;
private _installedExtensions: TPromise<ILocalExtension[]>;
private _installedExtensions: Promise<ILocalExtension[]>;
constructor(
@IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService,
......@@ -104,9 +103,9 @@ export class LocalSearchProvider implements ISearchProvider {
.trim();
}
searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): TPromise<ISearchResult> {
searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): Promise<ISearchResult> {
if (!this._filter) {
return TPromise.wrap(null);
return Promise.resolve(null);
}
let orderedScore = LocalSearchProvider.START_SCORE; // Sort is not stable
......@@ -126,12 +125,12 @@ export class LocalSearchProvider implements ISearchProvider {
const filterMatches = preferencesModel.filterSettings(this._filter, this.getGroupFilter(this._filter), settingMatcher);
if (filterMatches[0] && filterMatches[0].score === LocalSearchProvider.EXACT_MATCH_SCORE) {
return TPromise.wrap({
return Promise.resolve({
filterMatches: filterMatches.slice(0, 1),
exactMatch: true
});
} else {
return TPromise.wrap({
return Promise.resolve({
filterMatches
});
}
......@@ -164,19 +163,19 @@ class RemoteSearchProvider implements ISearchProvider {
private static readonly MAX_REQUESTS = 10;
private static readonly NEW_EXTENSIONS_MIN_SCORE = 1;
private _remoteSearchP: TPromise<IFilterMetadata>;
private _remoteSearchP: Promise<IFilterMetadata>;
constructor(private options: IRemoteSearchProviderOptions, private installedExtensions: TPromise<ILocalExtension[]>,
constructor(private options: IRemoteSearchProviderOptions, private installedExtensions: Promise<ILocalExtension[]>,
@IEnvironmentService private environmentService: IEnvironmentService,
@IRequestService private requestService: IRequestService,
@ILogService private logService: ILogService
) {
this._remoteSearchP = this.options.filter ?
TPromise.wrap(this.getSettingsForFilter(this.options.filter)) :
TPromise.wrap(null);
Promise.resolve(this.getSettingsForFilter(this.options.filter)) :
Promise.resolve(null);
}
searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): TPromise<ISearchResult> {
searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): Promise<ISearchResult> {
return this._remoteSearchP.then(remoteResult => {
if (!remoteResult) {
return null;
......@@ -239,7 +238,7 @@ class RemoteSearchProvider implements ISearchProvider {
}
}
return TPromise.join(allRequestDetails.map(details => this.getSettingsFromBing(details))).then(allResponses => {
return Promise.all(allRequestDetails.map(details => this.getSettingsFromBing(details))).then(allResponses => {
// Merge all IFilterMetadata
const metadata = allResponses[0];
metadata.requestCount = 1;
......@@ -253,7 +252,7 @@ class RemoteSearchProvider implements ISearchProvider {
});
}
private getSettingsFromBing(details: IBingRequestDetails): TPromise<IFilterMetadata> {
private getSettingsFromBing(details: IBingRequestDetails): Promise<IFilterMetadata> {
this.logService.debug(`Searching settings via ${details.url}`);
if (details.body) {
this.logService.debug(`Body: ${details.body}`);
......
src/vs/workbench/parts/preferences/electron-browser/settingsEditor2.ts
浏览文件 @ 83660da7
......@@ -14,7 +14,6 @@ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cance
import * as collections from 'vs/base/common/collections';
import { getErrorMessage, isPromiseCanceledError } from 'vs/base/common/errors';
import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
import { collapseAll, expandAll } from 'vs/base/parts/tree/browser/treeUtils';
import 'vs/css!./media/settingsEditor2';
......@@ -211,7 +210,7 @@ export class SettingsEditor2 extends BaseEditor {
}
this._setOptions(options);
this.render(token);
return this.render(token);
})
.then(() => {
// Init TOC selection
......@@ -471,7 +470,7 @@ export class SettingsEditor2 extends BaseEditor {
}
}
private openSettingsFile(query?: string): TPromise<IEditor> {
private openSettingsFile(query?: string): Thenable<IEditor> {
const currentSettingsTarget = this.settingsTargetsWidget.settingsTarget;
const options: ISettingsEditorOptions = { query };
......@@ -592,7 +591,7 @@ export class SettingsEditor2 extends BaseEditor {
}
if (element && (!e.payload || !e.payload.fromScroll)) {
let refreshP = TPromise.wrap(null);
let refreshP: Thenable<void> = Promise.resolve(null);
if (this.settingsTreeDataSource.pageTo(element.index, true)) {
refreshP = this.renderTree();
}
......@@ -724,7 +723,7 @@ export class SettingsEditor2 extends BaseEditor {
}
}
private updateChangedSetting(key: string, value: any): TPromise<void> {
private updateChangedSetting(key: string, value: any): Thenable<void> {
// ConfigurationService displays the error if this fails.
// Force a render afterwards because onDidConfigurationUpdate doesn't fire if the update doesn't result in an effective setting value change
const settingsTarget = this.settingsTargetsWidget.settingsTarget;
......@@ -815,7 +814,7 @@ export class SettingsEditor2 extends BaseEditor {
this.telemetryService.publicLog('settingsEditor.settingModified', data);
}
private render(token: CancellationToken): TPromise<any> {
private render(token: CancellationToken): Thenable<any> {
if (this.input) {
return this.input.resolve()
.then((model: Settings2EditorModel) => {
......@@ -828,7 +827,7 @@ export class SettingsEditor2 extends BaseEditor {
return this.onConfigUpdate();
});
}
return TPromise.as(null);
return Promise.resolve(null);
}
private onSearchModeToggled(): void {
......@@ -863,7 +862,7 @@ export class SettingsEditor2 extends BaseEditor {
});
}
private onConfigUpdate(keys?: string[], forceRefresh = false): TPromise<void> {
private onConfigUpdate(keys?: string[], forceRefresh = false): Thenable<void> {
if (keys && this.settingsTreeModel) {
return this.updateElementsByKey(keys);
}
......@@ -916,10 +915,10 @@ export class SettingsEditor2 extends BaseEditor {
}
}
return TPromise.wrap(null);
return Promise.resolve(null);
}
private updateElementsByKey(keys: string[]): TPromise<void> {
private updateElementsByKey(keys: string[]): Thenable<void> {
if (keys.length) {
if (this.searchResultModel) {
keys.forEach(key => this.searchResultModel.updateElementsByName(key));
......@@ -929,7 +928,7 @@ export class SettingsEditor2 extends BaseEditor {
keys.forEach(key => this.settingsTreeModel.updateElementsByName(key));
}
return TPromise.join(
return Promise.all(
keys.map(key => this.renderTree(key)))
.then(() => { });
} else {
......@@ -943,10 +942,10 @@ export class SettingsEditor2 extends BaseEditor {
null;
}
private renderTree(key?: string, force = false): TPromise<void> {
private renderTree(key?: string, force = false): Thenable<void> {
if (!force && key && this.scheduledRefreshes.has(key)) {
this.updateModifiedLabelForKey(key);
return TPromise.wrap(null);
return Promise.resolve(null);
}
// If a setting control is currently focused, schedule a refresh for later
......@@ -960,24 +959,24 @@ export class SettingsEditor2 extends BaseEditor {
this.updateModifiedLabelForKey(key);
this.scheduleRefresh(focusedSetting, key);
return TPromise.wrap(null);
return Promise.resolve(null);
}
} else {
this.scheduleRefresh(focusedSetting);
return TPromise.wrap(null);
return Promise.resolve(null);
}
}
let refreshP: TPromise<any>;
let refreshP: Thenable<any>;
if (key) {
const elements = this.currentSettingsModel.getElementsByName(key);
if (elements && elements.length) {
// TODO https://github.com/Microsoft/vscode/issues/57360
// refreshP = TPromise.join(elements.map(e => this.settingsTree.refresh(e)));
// refreshP = Promise.join(elements.map(e => this.settingsTree.refresh(e)));
refreshP = this.settingsTree.refresh();
} else {
// Refresh requested for a key that we don't know about
return TPromise.wrap(null);
return Promise.resolve(null);
}
} else {
refreshP = this.settingsTree.refresh();
......@@ -1019,7 +1018,7 @@ export class SettingsEditor2 extends BaseEditor {
return match && match[1];
}
private triggerSearch(query: string): TPromise<void> {
private triggerSearch(query: string): Thenable<void> {
this.viewState.tagFilters = new Set<string>();
if (query) {
const parsedQuery = parseQuery(query);
......@@ -1126,7 +1125,7 @@ export class SettingsEditor2 extends BaseEditor {
this.telemetryService.publicLog('settingsEditor.filter', data);
}
private triggerFilterPreferences(query: string): TPromise<void> {
private triggerFilterPreferences(query: string): Thenable<void> {
if (this.searchInProgress) {
this.searchInProgress.cancel();
this.searchInProgress = null;
......@@ -1141,26 +1140,26 @@ export class SettingsEditor2 extends BaseEditor {
this.remoteSearchThrottle.trigger(() => {
return searchInProgress && !searchInProgress.token.isCancellationRequested ?
this.remoteSearchPreferences(query, this.searchInProgress.token) :
TPromise.wrap(null);
Promise.resolve(null);
});
}
});
} else {
return TPromise.wrap(null);
return Promise.resolve(null);
}
});
}
private localFilterPreferences(query: string, token?: CancellationToken): TPromise<ISearchResult> {
private localFilterPreferences(query: string, token?: CancellationToken): Thenable<ISearchResult> {
const localSearchProvider = this.preferencesSearchService.getLocalSearchProvider(query);
return this.filterOrSearchPreferences(query, SearchResultIdx.Local, localSearchProvider, token);
}
private remoteSearchPreferences(query: string, token?: CancellationToken): TPromise<void> {
private remoteSearchPreferences(query: string, token?: CancellationToken): Thenable<void> {
const remoteSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query);
const newExtSearchProvider = this.preferencesSearchService.getRemoteSearchProvider(query, true);
return TPromise.join([
return Promise.all([
this.filterOrSearchPreferences(query, SearchResultIdx.Remote, remoteSearchProvider, token),
this.filterOrSearchPreferences(query, SearchResultIdx.NewExtensions, newExtSearchProvider, token)
]).then(() => {
......@@ -1168,7 +1167,7 @@ export class SettingsEditor2 extends BaseEditor {
});
}
private filterOrSearchPreferences(query: string, type: SearchResultIdx, searchProvider: ISearchProvider, token?: CancellationToken): TPromise<ISearchResult> {
private filterOrSearchPreferences(query: string, type: SearchResultIdx, searchProvider: ISearchProvider, token?: CancellationToken): Thenable<ISearchResult> {
return this._filterOrSearchPreferencesModel(query, this.defaultSettingsEditorModel, searchProvider, token).then(result => {
if (token && token.isCancellationRequested) {
// Handle cancellation like this because cancellation is lost inside the search provider due to async/await
......@@ -1215,12 +1214,12 @@ export class SettingsEditor2 extends BaseEditor {
}
}
private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, token?: CancellationToken): TPromise<ISearchResult> {
const searchP = provider ? provider.searchModel(model, token) : TPromise.wrap(null);
private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, token?: CancellationToken): Thenable<ISearchResult> {
const searchP = provider ? provider.searchModel(model, token) : Promise.resolve(null);
return searchP
.then<ISearchResult>(null, err => {
if (isPromiseCanceledError(err)) {
return TPromise.wrapError(err);
return Promise.reject(err);
} else {
/* __GDPR__
"settingsEditor.searchError" : {
......@@ -1284,8 +1283,8 @@ class FilterByTagAction extends Action {
super(FilterByTagAction.ID, label, 'toggle-filter-tag');
}
run(): TPromise<void> {
run(): Thenable<void> {
this.settingsEditor.focusSearch(this.tag === MODIFIED_SETTING_TAG ? `@${this.tag} ` : `@tag:${this.tag} `, false);
return TPromise.as(null);
return Promise.resolve(null);
}
}
src/vs/workbench/services/preferences/browser/preferencesService.ts
浏览文件 @ 83660da7
......@@ -10,7 +10,6 @@ import * as network from 'vs/base/common/network';
import { assign } from 'vs/base/common/objects';
import * as strings from 'vs/base/common/strings';
import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { getCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { EditOperation } from 'vs/editor/common/core/editOperation';
import { IPosition, Position } from 'vs/editor/common/core/position';
......@@ -104,7 +103,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return this.getEditableSettingsURI(ConfigurationTarget.WORKSPACE_FOLDER, resource);
}
resolveModel(uri: URI): TPromise<ITextModel> {
resolveModel(uri: URI): Thenable<ITextModel> {
if (this.isDefaultSettingsResource(uri)) {
const target = this.getConfigurationTargetFromDefaultSettingsResource(uri);
......@@ -131,27 +130,27 @@ export class PreferencesService extends Disposable implements IPreferencesServic
this.modelService.updateModel(model, defaultSettings.getContent(true));
}
return TPromise.as(model);
return Promise.resolve(model);
}
if (this.defaultSettingsRawResource.toString() === uri.toString()) {
let defaultSettings: DefaultSettings = this.getDefaultSettings(ConfigurationTarget.USER);
const languageSelection = this.modeService.create('jsonc');
const model = this._register(this.modelService.createModel(defaultSettings.raw, languageSelection, uri));
return TPromise.as(model);
return Promise.resolve(model);
}
if (this.defaultKeybindingsResource.toString() === uri.toString()) {
const defaultKeybindingsEditorModel = this.instantiationService.createInstance(DefaultKeybindingsEditorModel, uri);
const languageSelection = this.modeService.create('jsonc');
const model = this._register(this.modelService.createModel(defaultKeybindingsEditorModel.content, languageSelection, uri));
return TPromise.as(model);
return Promise.resolve(model);
}
return TPromise.as(null);
return Promise.resolve(null);
}
createPreferencesEditorModel(uri: URI): TPromise<IPreferencesEditorModel<any>> {
createPreferencesEditorModel(uri: URI): Thenable<IPreferencesEditorModel<any>> {
if (this.isDefaultSettingsResource(uri)) {
return this.createDefaultSettingsEditorModel(uri);
}
......@@ -169,18 +168,18 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return this.createEditableSettingsEditorModel(ConfigurationTarget.WORKSPACE_FOLDER, uri);
}
return TPromise.wrap<IPreferencesEditorModel<any>>(null);
return Promise.resolve<IPreferencesEditorModel<any>>(null);
}
openRawDefaultSettings(): TPromise<IEditor> {
openRawDefaultSettings(): Thenable<IEditor> {
return this.editorService.openEditor({ resource: this.defaultSettingsRawResource });
}
openRawUserSettings(): TPromise<IEditor> {
openRawUserSettings(): Thenable<IEditor> {
return this.editorService.openEditor({ resource: this.userSettingsResource });
}
openSettings(jsonEditor?: boolean): TPromise<IEditor> {
openSettings(jsonEditor?: boolean): Thenable<IEditor> {
jsonEditor = typeof jsonEditor === 'undefined' ?
this.configurationService.getValue('workbench.settings.editor') === 'json' :
jsonEditor;
......@@ -195,13 +194,13 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return this.openOrSwitchSettings(target, resource);
}
private openSettings2(): TPromise<IEditor> {
private openSettings2(): Thenable<IEditor> {
const input = this.settingsEditor2Input;
return this.editorGroupService.activeGroup.openEditor(input)
.then(() => this.editorGroupService.activeGroup.activeControl);
}
openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
jsonEditor = typeof jsonEditor === 'undefined' ?
this.configurationService.getValue('workbench.settings.editor') === 'json' :
jsonEditor;
......@@ -211,14 +210,14 @@ export class PreferencesService extends Disposable implements IPreferencesServic
this.openOrSwitchSettings2(ConfigurationTarget.USER, undefined, options, group);
}
openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
jsonEditor = typeof jsonEditor === 'undefined' ?
this.configurationService.getValue('workbench.settings.editor') === 'json' :
jsonEditor;
if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY) {
this.notificationService.info(nls.localize('openFolderFirst', "Open a folder first to create workspace settings"));
return TPromise.as(null);
return Promise.resolve(null);
}
return jsonEditor ?
......@@ -226,7 +225,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
this.openOrSwitchSettings2(ConfigurationTarget.WORKSPACE, undefined, options, group);
}
openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
jsonEditor = typeof jsonEditor === 'undefined' ?
this.configurationService.getValue('workbench.settings.editor') === 'json' :
jsonEditor;
......@@ -236,7 +235,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
this.openOrSwitchSettings2(ConfigurationTarget.WORKSPACE_FOLDER, folder, options, group);
}
switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): TPromise<void> {
switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): Thenable<void> {
if (!jsonEditor) {
return this.doOpenSettings2(target, resource).then(() => null);
}
......@@ -249,7 +248,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
}
}
openGlobalKeybindingSettings(textual: boolean): TPromise<void> {
openGlobalKeybindingSettings(textual: boolean): Thenable<void> {
/* __GDPR__
"openKeybindings" : {
"textual" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
......@@ -266,7 +265,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
if (openDefaultKeybindings) {
const activeEditorGroup = this.editorGroupService.activeGroup;
const sideEditorGroup = this.editorGroupService.addGroup(activeEditorGroup.id, GroupDirection.RIGHT);
return TPromise.join([
return Promise.all([
this.editorService.openEditor({ resource: this.defaultKeybindingsResource, options: { pinned: true, preserveFocus: true }, label: nls.localize('defaultKeybindings', "Default Keybindings"), description: '' }),
this.editorService.openEditor({ resource: editableKeybindings, options: { pinned: true } }, sideEditorGroup.id)
]).then(editors => void 0);
......@@ -279,7 +278,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return this.editorService.openEditor(this.instantiationService.createInstance(KeybindingsEditorInput), { pinned: true }).then(() => null);
}
openDefaultKeybindingsFile(): TPromise<IEditor> {
openDefaultKeybindingsFile(): Thenable<IEditor> {
return this.editorService.openEditor({ resource: this.defaultKeybindingsResource, label: nls.localize('defaultKeybindings', "Default Keybindings") });
}
......@@ -301,7 +300,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
}));
}
private openOrSwitchSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): TPromise<IEditor> {
private openOrSwitchSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): Thenable<IEditor> {
const editorInput = this.getActiveSettingsEditorInput(group);
if (editorInput && editorInput.master.getResource().fsPath !== resource.fsPath) {
return this.doSwitchSettings(configurationTarget, resource, editorInput, group, options);
......@@ -309,11 +308,11 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return this.doOpenSettings(configurationTarget, resource, options, group);
}
private openOrSwitchSettings2(configurationTarget: ConfigurationTarget, folderUri?: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): TPromise<IEditor> {
private openOrSwitchSettings2(configurationTarget: ConfigurationTarget, folderUri?: URI, options?: ISettingsEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): Thenable<IEditor> {
return this.doOpenSettings2(configurationTarget, folderUri, options, group);
}
private doOpenSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
private doOpenSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
const openDefaultSettings = !!this.configurationService.getValue(DEFAULT_SETTINGS_EDITOR_SETTING);
return this.getOrCreateEditableSettingsEditorInput(configurationTarget, resource)
.then(editableSettingsEditorInput => {
......@@ -337,7 +336,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return this.instantiationService.createInstance(Settings2EditorModel, this.getDefaultSettings(ConfigurationTarget.USER));
}
private doOpenSettings2(target: ConfigurationTarget, folderUri: URI | undefined, options?: IEditorOptions, group?: IEditorGroup): TPromise<IEditor> {
private doOpenSettings2(target: ConfigurationTarget, folderUri: URI | undefined, options?: IEditorOptions, group?: IEditorGroup): Thenable<IEditor> {
const input = this.settingsEditor2Input;
const settingsOptions: ISettingsEditorOptions = {
...options,
......@@ -348,7 +347,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return this.editorService.openEditor(input, SettingsEditorOptions.create(settingsOptions), group);
}
private doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, group: IEditorGroup, options?: ISettingsEditorOptions): TPromise<IEditor> {
private doSwitchSettings(target: ConfigurationTarget, resource: URI, input: PreferencesEditorInput, group: IEditorGroup, options?: ISettingsEditorOptions): Thenable<IEditor> {
return this.getOrCreateEditableSettingsEditorInput(target, this.getEditableSettingsURI(target, resource))
.then(toInput => {
return group.openEditor(input).then(() => {
......@@ -423,12 +422,12 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return target === ConfigurationTarget.WORKSPACE_FOLDER ? nls.localize('folderSettingsName', "{0} (Folder Settings)", name) : name;
}
private getOrCreateEditableSettingsEditorInput(target: ConfigurationTarget, resource: URI): TPromise<EditorInput> {
private getOrCreateEditableSettingsEditorInput(target: ConfigurationTarget, resource: URI): Thenable<EditorInput> {
return this.createSettingsIfNotExists(target, resource)
.then(() => <EditorInput>this.editorService.createInput({ resource }));
}
private createEditableSettingsEditorModel(configurationTarget: ConfigurationTarget, resource: URI): TPromise<SettingsEditorModel> {
private createEditableSettingsEditorModel(configurationTarget: ConfigurationTarget, resource: URI): Thenable<SettingsEditorModel> {
const settingsUri = this.getEditableSettingsURI(configurationTarget, resource);
if (settingsUri) {
const workspace = this.contextService.getWorkspace();
......@@ -439,10 +438,10 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return this.textModelResolverService.createModelReference(settingsUri)
.then(reference => this.instantiationService.createInstance(SettingsEditorModel, reference, configurationTarget));
}
return TPromise.wrap<SettingsEditorModel>(null);
return Promise.resolve<SettingsEditorModel>(null);
}
private createDefaultSettingsEditorModel(defaultSettingsUri: URI): TPromise<DefaultSettingsEditorModel> {
private createDefaultSettingsEditorModel(defaultSettingsUri: URI): Thenable<DefaultSettingsEditorModel> {
return this.textModelResolverService.createModelReference(defaultSettingsUri)
.then(reference => {
const target = this.getConfigurationTargetFromDefaultSettingsResource(defaultSettingsUri);
......@@ -486,7 +485,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return null;
}
private createSettingsIfNotExists(target: ConfigurationTarget, resource: URI): TPromise<void> {
private createSettingsIfNotExists(target: ConfigurationTarget, resource: URI): Thenable<void> {
if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && target === ConfigurationTarget.WORKSPACE) {
return this.fileService.resolveContent(this.contextService.getWorkspace().configuration)
.then(content => {
......@@ -499,15 +498,15 @@ export class PreferencesService extends Disposable implements IPreferencesServic
return this.createIfNotExists(resource, emptyEditableSettingsContent).then(() => { });
}
private createIfNotExists(resource: URI, contents: string): TPromise<any> {
private createIfNotExists(resource: URI, contents: string): Thenable<any> {
return this.fileService.resolveContent(resource, { acceptTextOnly: true }).then(null, error => {
if ((<FileOperationError>error).fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
return this.fileService.updateContent(resource, contents).then(null, error => {
return TPromise.wrapError(new Error(nls.localize('fail.createSettings', "Unable to create '{0}' ({1}).", this.labelService.getUriLabel(resource, { relative: true }), error)));
return Promise.reject(new Error(nls.localize('fail.createSettings', "Unable to create '{0}' ({1}).", this.labelService.getUriLabel(resource, { relative: true }), error)));
});
}
return TPromise.wrapError(error);
return Promise.reject(error);
});
}
......@@ -527,7 +526,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
];
}
private getPosition(language: string, settingsModel: IPreferencesEditorModel<ISetting>, codeEditor: ICodeEditor): TPromise<IPosition> {
private getPosition(language: string, settingsModel: IPreferencesEditorModel<ISetting>, codeEditor: ICodeEditor): Thenable<IPosition> {
const languageKey = `[${language}]`;
let setting = settingsModel.getPreference(languageKey);
const model = codeEditor.getModel();
......@@ -544,9 +543,9 @@ export class PreferencesService extends Disposable implements IPreferencesServic
}
const editOperation = EditOperation.insert(new Position(lastSetting.valueRange.endLineNumber, lastSetting.valueRange.endColumn), content);
model.pushEditOperations([], [editOperation], () => []);
return TPromise.as({ lineNumber: lastSetting.valueRange.endLineNumber + 1, column: model.getLineMaxColumn(lastSetting.valueRange.endLineNumber + 1) });
return Promise.resolve({ lineNumber: lastSetting.valueRange.endLineNumber + 1, column: model.getLineMaxColumn(lastSetting.valueRange.endLineNumber + 1) });
}
return TPromise.as({ lineNumber: setting.valueRange.startLineNumber, column: setting.valueRange.startColumn + 1 });
return Promise.resolve({ lineNumber: setting.valueRange.startLineNumber, column: setting.valueRange.startColumn + 1 });
}
return this.configurationService.updateValue(languageKey, {}, ConfigurationTarget.USER)
.then(() => {
......
src/vs/workbench/services/preferences/common/preferences.ts
浏览文件 @ 83660da7
......@@ -3,23 +3,22 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { IStringDictionary } from 'vs/base/common/collections';
import { Event } from 'vs/base/common/event';
import { join } from 'vs/base/common/paths';
import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IEditorOptions } from 'vs/platform/editor/common/editor';
import { IEditor, EditorOptions } from 'vs/workbench/common/editor';
import { ITextModel } from 'vs/editor/common/model';
import { IRange } from 'vs/editor/common/core/range';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { join } from 'vs/base/common/paths';
import { ITextModel } from 'vs/editor/common/model';
import { localize } from 'vs/nls';
import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
import { Event } from 'vs/base/common/event';
import { IStringDictionary } from 'vs/base/common/collections';
import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
import { IEditorOptions } from 'vs/platform/editor/common/editor';
import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
import { localize } from 'vs/nls';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { EditorOptions, IEditor } from 'vs/workbench/common/editor';
import { IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService';
import { Settings2EditorModel } from 'vs/workbench/services/preferences/common/preferencesModels';
import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
export enum SettingValueType {
Null = 'null',
......@@ -202,18 +201,18 @@ export interface IPreferencesService {
workspaceSettingsResource: URI;
getFolderSettingsResource(resource: URI): URI;
resolveModel(uri: URI): TPromise<ITextModel>;
createPreferencesEditorModel<T>(uri: URI): TPromise<IPreferencesEditorModel<T>>;
resolveModel(uri: URI): Thenable<ITextModel>;
createPreferencesEditorModel<T>(uri: URI): Thenable<IPreferencesEditorModel<T>>;
createSettings2EditorModel(): Settings2EditorModel; // TODO
openRawDefaultSettings(): TPromise<IEditor>;
openSettings(jsonEditor?: boolean): TPromise<IEditor>;
openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor>;
openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor>;
openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): TPromise<IEditor>;
switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): TPromise<void>;
openGlobalKeybindingSettings(textual: boolean): TPromise<void>;
openDefaultKeybindingsFile(): TPromise<IEditor>;
openRawDefaultSettings(): Thenable<IEditor>;
openSettings(jsonEditor?: boolean): Thenable<IEditor>;
openGlobalSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor>;
openWorkspaceSettings(jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor>;
openFolderSettings(folder: URI, jsonEditor?: boolean, options?: ISettingsEditorOptions, group?: IEditorGroup): Thenable<IEditor>;
switchSettings(target: ConfigurationTarget, resource: URI, jsonEditor?: boolean): Thenable<void>;
openGlobalKeybindingSettings(textual: boolean): Thenable<void>;
openDefaultKeybindingsFile(): Thenable<IEditor>;
configureSettingsForLanguage(language: string): void;
}
......
src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
浏览文件 @ 83660da7
......@@ -5,7 +5,6 @@
import { OS } from 'vs/base/common/platform';
import { URI } from 'vs/base/common/uri';
import { TPromise } from 'vs/base/common/winjs.base';
import { ITextModelService } from 'vs/editor/common/services/resolverService';
import * as nls from 'vs/nls';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
......@@ -70,8 +69,8 @@ export class KeybindingsEditorInput extends EditorInput {
return nls.localize('keybindingsInputName', "Keyboard Shortcuts");
}
resolve(): TPromise<KeybindingsEditorModel> {
return TPromise.as(this.keybindingsModel);
resolve(): Promise<KeybindingsEditorModel> {
return Promise.resolve(this.keybindingsModel);
}
matches(otherInput: any): boolean {
......@@ -104,8 +103,8 @@ export class SettingsEditor2Input extends EditorInput {
return nls.localize('settingsEditor2InputName', "Settings");
}
resolve(): TPromise<Settings2EditorModel> {
return TPromise.as(this._settingsModel);
resolve(): Promise<Settings2EditorModel> {
return Promise.resolve(this._settingsModel);
}
public getResource(): URI {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或