Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Some Cleanup #162593

Merged
merged 1 commit into from Oct 3, 2022
Merged

Some Cleanup #162593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.ts
View file
Open in desktop
Expand Up @@ -66,7 +66,7 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput implements
super.dispose();
}

get typeId(): string {
override get typeId(): string {
return MergeEditorInput.ID;
}

Expand All @@ -76,11 +76,9 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput implements

override get capabilities(): EditorInputCapabilities {
let capabilities = super.capabilities | EditorInputCapabilities.MultipleEditors;

if (this.useWorkingCopy) {
capabilities |= EditorInputCapabilities.Untitled;
}

return capabilities;
}

Expand Down Expand Up @@ -171,6 +169,5 @@ export class MergeEditorInput extends AbstractTextResourceEditorInput implements
this._inputModel?.model.setLanguageId(languageId, source);
}

// implement get/set languageId
// implement get/set encoding
}
3 changes: 0 additions & 3 deletions src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.ts
View file
Open in desktop
Expand Up @@ -371,7 +371,6 @@ class WorkspaceMergeEditorInputModel extends EditorModel implements IMergeEditor
shouldConfirmClose(): boolean {
// Always confirm
return true;
//return this.resultTextFileModel.isDirty();
}

async confirmClose(inputModels: IMergeEditorInputModel[]): Promise<ConfirmResult> {
Expand Down Expand Up @@ -400,7 +399,6 @@ class WorkspaceMergeEditorInputModel extends EditorModel implements IMergeEditor
ConfirmResult.SAVE,
],
[localize('workspace.doNotSave', "Don't Save"), ConfirmResult.DONT_SAVE],
// TODO [localize('workspace.discard', "Discard changes"), ConfirmResult.DONT_SAVE],
[localize('workspace.cancel', 'Cancel'), ConfirmResult.CANCEL],
];

Expand All @@ -426,7 +424,6 @@ class WorkspaceMergeEditorInputModel extends EditorModel implements IMergeEditor
: localize('workspace.close', 'Close'),
ConfirmResult.SAVE,
],
// TODO [localize('workspace.discard', "Discard changes"), ConfirmResult.DONT_SAVE],
[localize('workspace.cancel', 'Cancel'), ConfirmResult.CANCEL],
];

Expand Down