Skip to content

Commit c85586f

Browse files
hediethediet
authored
Merge branch 'main' into fix/186206
2 parents 8d4cd14 + 35573c4 commit c85586f

File tree

33 files changed

+540
-447
lines changed

33 files changed

+540
-447
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"@parcel/watcher": "2.1.0",
7171
"@vscode/iconv-lite-umd": "0.7.0",
7272
"@vscode/policy-watcher": "^1.1.4",
73-
"@vscode/proxy-agent": "^0.15.0",
73+
"@vscode/proxy-agent": "^0.16.0",
7474
"@vscode/ripgrep": "^1.15.5",
7575
"@vscode/spdlog": "^0.13.10",
7676
"@vscode/sqlite3": "5.1.6-vscode",
@@ -231,4 +231,4 @@
231231
"optionalDependencies": {
232232
"windows-foreground-love": "0.5.0"
233233
}
234-
}
234+
}

‎remote/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@microsoft/1ds-post-js": "^3.2.2",
88
"@parcel/watcher": "2.1.0",
99
"@vscode/iconv-lite-umd": "0.7.0",
10-
"@vscode/proxy-agent": "^0.15.0",
10+
"@vscode/proxy-agent": "^0.16.0",
1111
"@vscode/ripgrep": "^1.15.5",
1212
"@vscode/spdlog": "^0.13.10",
1313
"@vscode/vscode-languagedetection": "1.0.21",

‎remote/yarn.lock‎

Lines changed: 62 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -48,27 +48,27 @@
4848
node-addon-api "^3.2.1"
4949
node-gyp-build "^4.3.0"
5050

51-
"@tootallnate/once@1", "@tootallnate/once@^1.1.2":
52-
version "1.1.2"
53-
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
54-
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
51+
"@tootallnate/once@^3.0.0":
52+
version "3.0.0"
53+
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-3.0.0.tgz#d52238c9052d746c9689523e650160e70786bc9a"
54+
integrity sha512-OAdBVB7rlwvLD+DiecSAyVKzKVmSfXbouCyM5I6wHGi4MGXIyFqErg1IvyJ7PI1e+GYZuZh7cCHV/c4LA8SKMw==
5555

5656
"@vscode/iconv-lite-umd@0.7.0":
5757
version "0.7.0"
5858
resolved "https://registry.yarnpkg.com/@vscode/iconv-lite-umd/-/iconv-lite-umd-0.7.0.tgz#d2f1e0664ee6036408f9743fee264ea0699b0e48"
5959
integrity sha512-bRRFxLfg5dtAyl5XyiVWz/ZBPahpOpPrNYnnHpOpUZvam4tKH35wdhP4Kj6PbM0+KdliOsPzbGWpkxcdpNB/sg==
6060

61-
"@vscode/proxy-agent@^0.15.0":
62-
version "0.15.0"
63-
resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.15.0.tgz#b8fb8b89180a71295a8f8682775f69ab1dcf6860"
64-
integrity sha512-HpD4A9CUOwKbC6vLa0+MEsCo/qlgbue9U9s8Z7NzJDdf2YEGjUaYf9Mvj5T1LhJX20Hv1COvkGcc7zPhtIbgbA==
65-
dependencies:
66-
"@tootallnate/once" "^1.1.2"
67-
agent-base "^6.0.2"
68-
debug "^4.3.1"
69-
http-proxy-agent "^4.0.1"
70-
https-proxy-agent "^5.0.0"
71-
socks-proxy-agent "^5.0.0"
61+
"@vscode/proxy-agent@^0.16.0":
62+
version "0.16.0"
63+
resolved "https://registry.yarnpkg.com/@vscode/proxy-agent/-/proxy-agent-0.16.0.tgz#32054387f7aaf26d1b5d53f553d53bfd8489eab8"
64+
integrity sha512-b8yBHgdngDrP+9HPJtnPUJjPHd+zfEvOYoc8KioWJVs0rFVT2U77nFDVC70Mrrscf87ya2a/sPY32nTrwFfOQQ==
65+
dependencies:
66+
"@tootallnate/once" "^3.0.0"
67+
agent-base "^7.0.1"
68+
debug "^4.3.4"
69+
http-proxy-agent "^7.0.0"
70+
https-proxy-agent "^7.0.1"
71+
socks-proxy-agent "^8.0.1"
7272
optionalDependencies:
7373
"@vscode/windows-ca-certs" "^0.3.1"
7474

@@ -120,7 +120,7 @@ agent-base@4:
120120
dependencies:
121121
es6-promisify "^5.0.0"
122122

123-
agent-base@6, agent-base@^6.0.2:
123+
agent-base@6:
124124
version "6.0.2"
125125
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
126126
integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -134,6 +134,13 @@ agent-base@^4.3.0:
134134
dependencies:
135135
es6-promisify "^5.0.0"
136136

137+
agent-base@^7.0.1, agent-base@^7.0.2, agent-base@^7.1.0:
138+
version "7.1.0"
139+
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
140+
integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
141+
dependencies:
142+
debug "^4.3.4"
143+
137144
ansi-regex@^2.0.0:
138145
version "2.1.1"
139146
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -237,10 +244,10 @@ debug@4:
237244
dependencies:
238245
ms "^2.1.1"
239246

240-
debug@^4.3.1:
241-
version "4.3.1"
242-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
243-
integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
247+
debug@^4.3.4:
248+
version "4.3.4"
249+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
250+
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
244251
dependencies:
245252
ms "2.1.2"
246253

@@ -356,14 +363,13 @@ http-proxy-agent@^2.1.0:
356363
agent-base "4"
357364
debug "3.1.0"
358365

359-
http-proxy-agent@^4.0.1:
360-
version "4.0.1"
361-
resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
362-
integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
366+
http-proxy-agent@^7.0.0:
367+
version "7.0.0"
368+
resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz#e9096c5afd071a3fce56e6252bb321583c124673"
369+
integrity sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==
363370
dependencies:
364-
"@tootallnate/once" "1"
365-
agent-base "6"
366-
debug "4"
371+
agent-base "^7.1.0"
372+
debug "^4.3.4"
367373

368374
https-proxy-agent@^2.2.3:
369375
version "2.2.4"
@@ -381,6 +387,14 @@ https-proxy-agent@^5.0.0:
381387
agent-base "6"
382388
debug "4"
383389

390+
https-proxy-agent@^7.0.1:
391+
version "7.0.1"
392+
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz#0277e28f13a07d45c663633841e20a40aaafe0ab"
393+
integrity sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==
394+
dependencies:
395+
agent-base "^7.0.2"
396+
debug "4"
397+
384398
ieee754@^1.1.13:
385399
version "1.2.1"
386400
resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -396,10 +410,10 @@ ini@~1.3.0:
396410
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
397411
integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
398412

399-
ip@^1.1.5:
400-
version "1.1.5"
401-
resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
402-
integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
413+
ip@^2.0.0:
414+
version "2.0.0"
415+
resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
416+
integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
403417

404418
is-extglob@^2.1.1:
405419
version "2.1.1"
@@ -691,27 +705,27 @@ simple-get@^4.0.0:
691705
once "^1.3.1"
692706
simple-concat "^1.0.0"
693707

694-
smart-buffer@^4.1.0:
695-
version "4.1.0"
696-
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
697-
integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
708+
smart-buffer@^4.2.0:
709+
version "4.2.0"
710+
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
711+
integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
698712

699-
socks-proxy-agent@^5.0.0:
700-
version "5.0.0"
701-
resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60"
702-
integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==
713+
socks-proxy-agent@^8.0.1:
714+
version "8.0.1"
715+
resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz#ffc5859a66dac89b0c4dab90253b96705f3e7120"
716+
integrity sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==
703717
dependencies:
704-
agent-base "6"
705-
debug "4"
706-
socks "^2.3.3"
718+
agent-base "^7.0.1"
719+
debug "^4.3.4"
720+
socks "^2.7.1"
707721

708-
socks@^2.3.3:
709-
version "2.6.1"
710-
resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
711-
integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
722+
socks@^2.7.1:
723+
version "2.7.1"
724+
resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
725+
integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
712726
dependencies:
713-
ip "^1.1.5"
714-
smart-buffer "^4.1.0"
727+
ip "^2.0.0"
728+
smart-buffer "^4.2.0"
715729

716730
string-width@^1.0.1:
717731
version "1.0.2"

‎src/vs/editor/contrib/hover/browser/contentHover.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class ContentHoverController extends Disposable {
3030

3131
private readonly _participants: IEditorHoverParticipant[];
3232

33-
private readonly _widget = this._register(this._instantiationService.createInstance(ContentHoverWidget, this._editor));
33+
private readonly _widget: ContentHoverWidget;
3434

3535
getWidgetContent(): string | undefined {
3636
const node = this._widget.getDomNode();
@@ -52,6 +52,11 @@ export class ContentHoverController extends Disposable {
5252
) {
5353
super();
5454

55+
const minimumHeight = this._editor.getOption(EditorOption.lineHeight) + 8;
56+
const minimumWidth = 4 / 3 * minimumHeight;
57+
const minimumSize = new dom.Dimension(minimumWidth, minimumHeight);
58+
this._widget = this._register(this._instantiationService.createInstance(ContentHoverWidget, this._editor, minimumSize));
59+
5560
// Instantiate participants and sort them by `hoverOrdinal` which is relevant for rendering order.
5661
this._participants = [];
5762
for (const participant of HoverParticipantRegistry.getAll()) {
@@ -490,9 +495,10 @@ export class ContentHoverWidget extends ResizableContentWidget {
490495

491496
constructor(
492497
editor: ICodeEditor,
498+
minimumSize: dom.Dimension,
493499
@IContextKeyService contextKeyService: IContextKeyService
494500
) {
495-
super(editor);
501+
super(editor, minimumSize);
496502
this._hoverVisibleKey = EditorContextKeys.hoverVisible.bindTo(contextKeyService);
497503
this._hoverFocusedKey = EditorContextKeys.hoverFocused.bindTo(contextKeyService);
498504

‎src/vs/editor/contrib/hover/browser/resizableContentWidget.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ export abstract class ResizableContentWidget extends Disposable implements ICont
2525

2626
constructor(
2727
protected readonly _editor: ICodeEditor,
28-
initialSize: dom.IDimension = new dom.Dimension(10, 10)
28+
minimumSize: dom.IDimension = new dom.Dimension(10, 10)
2929
) {
3030
super();
3131
this._resizableNode.domNode.style.position = 'absolute';
32-
this._resizableNode.minSize = new dom.Dimension(10, 10);
32+
this._resizableNode.minSize = dom.Dimension.lift(minimumSize);
33+
this._resizableNode.layout(minimumSize.height, minimumSize.width);
3334
this._resizableNode.enableSashes(true, true, true, true);
34-
this._resizableNode.layout(initialSize.height, initialSize.width);
3535
this._register(this._resizableNode.onDidResize(e => {
3636
this._resize(new dom.Dimension(e.dimension.width, e.dimension.height));
3737
if (e.done) {

‎src/vs/platform/userDataProfile/common/userDataProfile.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ export class UserDataProfilesService extends Disposable implements IUserDataProf
365365
throw new Error(`Profile '${profileToUpdate.name}' does not exist`);
366366
}
367367

368-
profile = toUserDataProfile(profile.id, options.name ?? profile.name, profile.location, this.profilesCacheHome, { shortName: options.shortName ?? profile.shortName, transient: options.transient ?? profile.isTransient, useDefaultFlags: options.useDefaultFlags ?? profile.useDefaultFlags });
368+
profile = toUserDataProfile(profile.id, options.name ?? profile.name, profile.location, this.profilesCacheHome, { shortName: options.shortName ?? profile.shortName, transient: options.transient ?? profile.isTransient, useDefaultFlags: options.useDefaultFlags ?? profile.useDefaultFlags }, this.defaultProfile);
369369
this.updateProfiles([], [], [profile]);
370370

371371
return profile;

‎src/vs/platform/userDataProfile/test/common/userDataProfileService.test.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,4 +226,13 @@ suite('UserDataProfileService (Common)', () => {
226226
assert.strictEqual(profile.extensionsResource.toString(), testObject.defaultProfile.extensionsResource.toString());
227227
});
228228

229+
test('update profile using default profile for keybindings', async () => {
230+
let profile = await testObject.createNamedProfile('name');
231+
profile = await testObject.updateProfile(profile, { useDefaultFlags: { keybindings: true } });
232+
233+
assert.strictEqual(profile.isDefault, false);
234+
assert.deepStrictEqual(profile.useDefaultFlags, { keybindings: true });
235+
assert.strictEqual(profile.keybindingsResource.toString(), testObject.defaultProfile.keybindingsResource.toString());
236+
});
237+
229238
});

‎src/vs/platform/userDataSync/common/userDataProfilesManifestMerge.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
6+
import { equals } from 'vs/base/common/objects';
7+
import { IUserDataProfile, UseDefaultProfileFlags } from 'vs/platform/userDataProfile/common/userDataProfile';
78
import { ISyncUserDataProfile } from 'vs/platform/userDataSync/common/userDataSync';
89

910
interface IRelaxedMergeResult {
@@ -17,6 +18,7 @@ interface IUserDataProfileInfo {
1718
readonly id: string;
1819
readonly name: string;
1920
readonly shortName?: string;
21+
readonly useDefaultFlags?: UseDefaultProfileFlags;
2022
}
2123

2224
export function merge(local: IUserDataProfile[], remote: ISyncUserDataProfile[] | null, lastSync: ISyncUserDataProfile[] | null, ignored: string[]): IMergeResult {
@@ -117,14 +119,15 @@ function compare(from: IUserDataProfileInfo[] | null, to: IUserDataProfileInfo[]
117119
const removed = fromKeys.filter(key => !toKeys.includes(key));
118120
const updated: string[] = [];
119121

120-
for (const { id, name, shortName } of from) {
122+
for (const { id, name, shortName, useDefaultFlags } of from) {
121123
if (removed.includes(id)) {
122124
continue;
123125
}
124126
const toProfile = to.find(p => p.id === id);
125127
if (!toProfile
126128
|| toProfile.name !== name
127129
|| toProfile.shortName !== shortName
130+
|| !equals(toProfile.useDefaultFlags, useDefaultFlags)
128131
) {
129132
updated.push(id);
130133
}

‎src/vs/platform/userDataSync/common/userDataProfilesManifestSync.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ export class UserDataProfilesManifestSynchroniser extends AbstractSynchroniser i
206206
if (localProfile) {
207207
promises.push((async () => {
208208
this.logService.trace(`${this.syncResourceLogLabel}: Updating '${profile.name}' profile...`);
209-
await this.userDataProfilesService.updateProfile(localProfile, { name: profile.name, shortName: profile.shortName });
209+
await this.userDataProfilesService.updateProfile(localProfile, { name: profile.name, shortName: profile.shortName, useDefaultFlags: profile.useDefaultFlags });
210210
this.logService.info(`${this.syncResourceLogLabel}: Updated profile '${profile.name}'.`);
211211
})());
212212
} else {

‎src/vs/platform/userDataSync/test/common/userDataProfilesManifestMerge.test.ts‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ suite('UserDataProfilesManifestMerge', () => {
7171
toUserDataProfile('5', '5', URI.file('5'), URI.file('cache')),
7272
toUserDataProfile('6', '6', URI.file('6'), URI.file('cache')),
7373
toUserDataProfile('8', '8', URI.file('8'), URI.file('cache')),
74+
toUserDataProfile('10', '10', URI.file('8'), URI.file('cache'), { useDefaultFlags: { tasks: true } }),
75+
toUserDataProfile('11', '11', URI.file('1'), URI.file('cache'), { useDefaultFlags: { keybindings: true } }),
7476
];
7577
const base: ISyncUserDataProfile[] = [
7678
{ id: '1', name: '1', collection: '1' },
@@ -79,6 +81,8 @@ suite('UserDataProfilesManifestMerge', () => {
7981
{ id: '4', name: '4', collection: '4' },
8082
{ id: '5', name: '5', collection: '5' },
8183
{ id: '6', name: '6', collection: '6' },
84+
{ id: '10', name: '10', collection: '10', useDefaultFlags: { tasks: true } },
85+
{ id: '11', name: '11', collection: '11' },
8286
];
8387
const remoteProfiles: ISyncUserDataProfile[] = [
8488
{ id: '1', name: '1', collection: '1' },
@@ -87,15 +91,18 @@ suite('UserDataProfilesManifestMerge', () => {
8791
{ id: '4', name: 'changed remote', collection: '4' },
8892
{ id: '5', name: '5', collection: '5' },
8993
{ id: '7', name: '7', collection: '7' },
94+
{ id: '9', name: '9', collection: '9', useDefaultFlags: { snippets: true } },
95+
{ id: '10', name: '10', collection: '10' },
96+
{ id: '11', name: '11', collection: '11' },
9097
];
9198

9299
const actual = merge(localProfiles, remoteProfiles, base, []);
93100

94-
assert.deepStrictEqual(actual.local.added, [remoteProfiles[5]]);
101+
assert.deepStrictEqual(actual.local.added, [remoteProfiles[5], remoteProfiles[6]]);
95102
assert.deepStrictEqual(actual.local.removed, [localProfiles[4]]);
96-
assert.deepStrictEqual(actual.local.updated, [remoteProfiles[2], remoteProfiles[3]]);
103+
assert.deepStrictEqual(actual.local.updated, [remoteProfiles[2], remoteProfiles[3], remoteProfiles[7]]);
97104
assert.deepStrictEqual(actual.remote?.added, [localProfiles[5]]);
98-
assert.deepStrictEqual(actual.remote?.updated, [localProfiles[0]]);
105+
assert.deepStrictEqual(actual.remote?.updated, [localProfiles[0], localProfiles[7]]);
99106
assert.deepStrictEqual(actual.remote?.removed, [remoteProfiles[1]]);
100107
});
101108

0 commit comments

Comments
 (0)