daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

return early from confirmSave when we are in extension development mode

pull/607/merge
Benjamin Pasero 2015-11-25 12:51:24 +01:00
parent 2c09792e1c
commit 5ea34f9dba
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/vscode-api-tests/src/workspace.test.ts
View File

@ -29,6 +29,7 @@ suite('workspace-namespace', () => {
test('openTextDocument', () => { test('openTextDocument', () => {
return workspace.openTextDocument(join(workspace.rootPath, './far.js')).then(doc => { return workspace.openTextDocument(join(workspace.rootPath, './far.js')).then(doc => {
assert.ok(doc); assert.ok(doc);
assert.equal(workspace.textDocuments.length, 1);
}); });
}); });

8
src/vs/workbench/parts/files/electron-browser/textFileServices.ts
View File

@ -63,10 +63,6 @@ export class TextFileService extends BrowserTextFileService {
public beforeShutdown(): boolean | TPromise<boolean> { public beforeShutdown(): boolean | TPromise<boolean> {
super.beforeShutdown(); super.beforeShutdown();
if (!!this.contextService.getConfiguration().env.pluginDevelopmentPath) {
return false; // no veto when we are in plugin dev mode because we want to reload often
}
// Dirty files need treatment on shutdown // Dirty files need treatment on shutdown
if (this.getDirty().length) { if (this.getDirty().length) {
let confirm = this.confirmSave(); let confirm = this.confirmSave();
@ -156,6 +152,10 @@ export class TextFileService extends BrowserTextFileService {
} }
public confirmSave(resource?: URI): ConfirmResult { public confirmSave(resource?: URI): ConfirmResult {
if (!!this.contextService.getConfiguration().env.pluginDevelopmentPath) {
return ConfirmResult.DONT_SAVE; // no veto when we are in plugin dev mode because we cannot assum we run interactive (e.g. tests)
}
let resourcesToConfirm = this.getDirty(resource); let resourcesToConfirm = this.getDirty(resource);
if (resourcesToConfirm.length === 0) { if (resourcesToConfirm.length === 0) {
return ConfirmResult.DONT_SAVE; return ConfirmResult.DONT_SAVE;