ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-15 18:46:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79 (#14050)

Browse Source 
* Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79

* Fix breaks

* Extension management fixes

* Fix breaks in windows bundling

* Fix/skip failing tests

* Update distro

* Add clear to nuget.config

* Add hygiene task

* Bump distro

* Fix hygiene issue

* Add build to hygiene exclusion

* Update distro

* Update hygiene

* Hygiene exclusions

* Update tsconfig

* Bump distro for server breaks

* Update build config

* Update darwin path

* Add done calls to notebook tests

* Skip failing tests

* Disable smoke tests
This commit is contained in:
Karl Burtram
2021-02-09 16:15:05 -08:00
committed by GitHub
parent 6f192f9af5
commit ce612a3d96
1929 changed files with 68012 additions and 34564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/workbench/contrib/userDataSync/browser/userDataSyncMergesView.ts
View File

@@ -302,7 +302,11 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
if (previewResource.mergeState === MergeState.Accepted) {
if (previewResource.localChange !== Change.Deleted && previewResource.remoteChange !== Change.Deleted) {
// Do not open deleted preview
await this.editorService.openEditor({ resource: previewResource.accepted, label: localize('preview', "{0} (Preview)", basename(previewResource.accepted)) });
await this.editorService.openEditor({
resource: previewResource.accepted,
label: localize('preview', "{0} (Preview)", basename(previewResource.accepted)),
options: { pinned: true }
});
}
} else {
const leftResource = previewResource.remote;
@@ -314,9 +318,11 @@ export class UserDataSyncMergesViewPane extends TreeViewPane {
leftResource,
rightResource,
label: localize('sideBySideLabels', "{0} ↔ {1}", leftResourceName, rightResourceName),
description: localize('sideBySideDescription', "Settings Sync"),
options: {
preserveFocus: true,
revealIfVisible: true,
pinned: true
},
});
}