提交 c90d64ac 编写于 作者: B Benjamin Pasero

more uses of pinned: true

上级 ed5a9f26
......@@ -201,7 +201,7 @@ class ResolveSaveConflictMessage implements IMessageWithAction {
const name = paths.basename(resource.fsPath);
const editorLabel = nls.localize('saveConflictDiffLabel', "{0} (on disk) ↔ {1} (in {2}) - Resolve save conflict", name, name, this.environmentService.appNameLong);
return this.editorService.openEditor({ leftResource: URI.from({ scheme: CONFLICT_RESOLUTION_SCHEME, path: resource.fsPath }), rightResource: resource, label: editorLabel }).then(() => {
return this.editorService.openEditor({ leftResource: URI.from({ scheme: CONFLICT_RESOLUTION_SCHEME, path: resource.fsPath }), rightResource: resource, label: editorLabel, options: { pinned: true } }).then(() => {
// We have to bring the model into conflict resolution mode to prevent subsequent save erros when the user makes edits
this.model.setConflictResolutionMode();
......
......@@ -137,7 +137,7 @@ export abstract class AbstractShowReleaseNotesAction extends Action {
this.enabled = false;
return this.instantiationService.invokeFunction(loadReleaseNotes, this.version)
.then(text => this.editorService.openEditor(this.instantiationService.createInstance(ReleaseNotesInput, this.version, text)))
.then(text => this.editorService.openEditor(this.instantiationService.createInstance(ReleaseNotesInput, this.version, text), { pinned: true }))
.then(() => true)
.then(null, () => {
const action = this.instantiationService.createInstance(OpenLatestReleaseNotesInBrowserAction);
......@@ -207,7 +207,7 @@ export class UpdateContribution implements IWorkbenchContribution {
if (product.releaseNotesUrl && lastVersion && pkg.version !== lastVersion) {
instantiationService.invokeFunction(loadReleaseNotes, pkg.version)
.then(
text => editorService.openEditor(instantiationService.createInstance(ReleaseNotesInput, pkg.version, text)),
text => editorService.openEditor(instantiationService.createInstance(ReleaseNotesInput, pkg.version, text), { pinned: true }),
() => {
messageService.show(Severity.Info, {
message: nls.localize('read the release notes', "Welcome to {0} v{1}! Would you like to read the Release Notes?", product.nameLong, pkg.version),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册