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

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/vs/workbench/services/workspace/node/workspaceEditingService.ts
View File

@@ -27,7 +27,6 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
import { distinct } from 'vs/base/common/arrays';
import { isLinux } from 'vs/base/common/platform';
import { isEqual } from 'vs/base/common/resources';
import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
export class WorkspaceEditingService implements IWorkspaceEditingService {
@@ -42,7 +41,6 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
@IStorageService private storageService: IStorageService,
@IExtensionService private extensionService: IExtensionService,
@IBackupFileService private backupFileService: IBackupFileService,
@IChoiceService private choiceService: IChoiceService,
@INotificationService private notificationService: INotificationService,
@ICommandService private commandService: ICommandService
) {
@@ -157,31 +155,33 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
private handleWorkspaceConfigurationEditingError(error: JSONEditingError): TPromise<void> {
switch (error.code) {
case JSONEditingErrorCode.ERROR_INVALID_FILE:
return this.onInvalidWorkspaceConfigurationFileError();
this.onInvalidWorkspaceConfigurationFileError();
return TPromise.as(void 0);
case JSONEditingErrorCode.ERROR_FILE_DIRTY:
return this.onWorkspaceConfigurationFileDirtyError();
this.onWorkspaceConfigurationFileDirtyError();
return TPromise.as(void 0);
}
this.notificationService.error(error.message);
return TPromise.as(void 0);
}
private onInvalidWorkspaceConfigurationFileError(): TPromise<void> {
private onInvalidWorkspaceConfigurationFileError(): void {
const message = nls.localize('errorInvalidTaskConfiguration', "Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again.");
return this.askToOpenWorkspaceConfigurationFile(message);
this.askToOpenWorkspaceConfigurationFile(message);
}
private onWorkspaceConfigurationFileDirtyError(): TPromise<void> {
private onWorkspaceConfigurationFileDirtyError(): void {
const message = nls.localize('errorWorkspaceConfigurationFileDirty', "Unable to write into workspace configuration file because the file is dirty. Please save it and try again.");
return this.askToOpenWorkspaceConfigurationFile(message);
this.askToOpenWorkspaceConfigurationFile(message);
}
private askToOpenWorkspaceConfigurationFile(message: string): TPromise<void> {
return this.choiceService.choose(Severity.Error, message, [nls.localize('openWorkspaceConfigurationFile', "Open Workspace Configuration")])
.then(option => {
if (option === 0) {
this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile');
}
});
private askToOpenWorkspaceConfigurationFile(message: string): void {
this.notificationService.prompt(Severity.Error, message,
[{
label: nls.localize('openWorkspaceConfigurationFile', "Open Workspace Configuration"),
run: () => this.commandService.executeCommand('workbench.action.openWorkspaceConfigFile')
}]
);
}
private doEnterWorkspace(mainSidePromise: () => TPromise<IEnterWorkspaceResult>): TPromise<void> {