New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add API to force quit with the ability to revert changes silently #21593

Merged
merged 4 commits into from Mar 1, 2017

Conversation

Projects
None yet
4 participants
@misoguy
Contributor

misoguy commented Mar 1, 2017

Fix #21536
Adds "workbench.action.forceCloseActiveEditor" to externalAPI

@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Mar 1, 2017

@misoguy, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bpasero and @egamma to be potential reviewers.

mention-bot commented Mar 1, 2017

@misoguy, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bpasero and @egamma to be potential reviewers.

@msftclas

This comment has been minimized.

Show comment
Hide comment
@msftclas

msftclas Mar 1, 2017

@misoguy,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by Microsoft. We will now review your pull request.
Thanks,
Microsoft Pull Request Bot

msftclas commented Mar 1, 2017

@misoguy,
Thanks for having already signed the Contribution License Agreement. Your agreement was validated by Microsoft. We will now review your pull request.
Thanks,
Microsoft Pull Request Bot

@bpasero

Thanks much better, added some minor feedback.

Show outdated Hide outdated src/vs/workbench/electron-browser/actions.ts
@@ -59,6 +59,31 @@ export class CloseEditorAction extends Action {
}
}
export class ForceCloseEditorAction extends Action {
public static ID = 'workbench.action.forceCloseActiveEditor';

This comment has been minimized.

@bpasero

bpasero Mar 1, 2017

Member

Maybe better workbench.action.revertAndCloseActiveEditor ?

@bpasero

bpasero Mar 1, 2017

Member

Maybe better workbench.action.revertAndCloseActiveEditor ?

Show outdated Hide outdated src/vs/workbench/electron-browser/actions.ts
@@ -59,6 +59,31 @@ export class CloseEditorAction extends Action {
}
}
export class ForceCloseEditorAction extends Action {

This comment has been minimized.

@bpasero

bpasero Mar 1, 2017

Member

Suggest to move this into editorActions.ts

@bpasero

bpasero Mar 1, 2017

Member

Suggest to move this into editorActions.ts

This comment has been minimized.

@misoguy

misoguy Mar 1, 2017

Contributor

I have added a commit to move this into vs/workbench/browser/parts/editor/editorActions.ts.

I have previously added it into vs/workbench/electron-browser/actions.ts
because i found the command "workbench.action.closeActiveEditor" to be at 2 files (actions.ts & editorActions.ts) and it seemed like main.contribution.ts was importing the CloseEditorAction from the one in vs/workbench/electron-browser/actions.ts.

It'd be nice if you could briefly explain the difference between the two files(actions.ts & editorActions.ts) with the same command "workbench.action.closeActiveEditor"

@misoguy

misoguy Mar 1, 2017

Contributor

I have added a commit to move this into vs/workbench/browser/parts/editor/editorActions.ts.

I have previously added it into vs/workbench/electron-browser/actions.ts
because i found the command "workbench.action.closeActiveEditor" to be at 2 files (actions.ts & editorActions.ts) and it seemed like main.contribution.ts was importing the CloseEditorAction from the one in vs/workbench/electron-browser/actions.ts.

It'd be nice if you could briefly explain the difference between the two files(actions.ts & editorActions.ts) with the same command "workbench.action.closeActiveEditor"

Show outdated Hide outdated src/vs/workbench/electron-browser/actions.ts
export class ForceCloseEditorAction extends Action {
public static ID = 'workbench.action.forceCloseActiveEditor';
public static LABEL = nls.localize('forceCloseActiveEditor', "Force Close Editor");

This comment has been minimized.

@bpasero

bpasero Mar 1, 2017

Member

Revert and Close Editor

@bpasero

bpasero Mar 1, 2017

Member

Revert and Close Editor

@bpasero bpasero self-assigned this Mar 1, 2017

@bpasero bpasero merged commit 8020067 into Microsoft:master Mar 1, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@bpasero

This comment has been minimized.

Show comment
Hide comment
@bpasero

bpasero Mar 1, 2017

Member

Thanks 👍

Member

bpasero commented Mar 1, 2017

Thanks 👍

@bpasero bpasero added this to the March 2017 milestone Mar 1, 2017

@misoguy misoguy deleted the misoguy:force-quit branch Mar 1, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment