Vihren Atlas

settingsMerge.ts ×1

Joint frontier

unlabeled · c_7414b81789f1

11 tests · 10789 LOC · 47 files · introduces 8 tests · 2 LOC · 1 file

Introduces — evidence that enters the hierarchy at this concept

Code
1 range2 lines · 1 files
Tests
8 tests

Contains — complete concept membership

All code (extent)
1138 ranges10789 lines · 47 files · Browse complete extent
All tests (intent)
11 testsBrowse complete intent

Neighbourhood graph

The orange circle is the focus. Violet and green circles are every ancestor and descendant, broader and narrower, at any distance; blue squares and pink diamonds are the introduced files and exact introduced tests of every visible concept, not only the focus's. Arrows point from broader to narrower concepts and bridge only concepts omitted from this view. Undirected links show source or test introduction. Concept and file size follows LOC; exact test nodes use test-count units.

Introduced files, introduced tests, and structurally relevant concept specialization

In the embedded map, ordinary wheel input scrolls the page; use the visible controls to zoom and drag to pan. Open the full-screen map for canvas navigation: wheel pans, Ctrl/Command plus wheel zooms, and arrow keys pan when this region is focused. On touch screens, open the full-screen map to pan or pinch. If JavaScript or WebGL is unavailable, use the native relationship evidence on this page.

Introduced files, introduced tests, and structurally relevant concept specializationuserDataSyncService.test|title=UserDataSyncService test sync when there is a remote profile that uses default profile|occurrence=1 · 0 introduced LOCuserDataSyncService.test…userDataSyncService.test|title=UserDataSyncService test sync when there are remote changes with profile|occurrence=1 · 0 introduced LOCuserDataSyncService.test…userDataSyncService.test|title=UserDataSyncService test sync when there are remote changes|occurrence=1 · 0 introduced LOCuserDataSyncService.test…settingsMerge.ts ×1 · 2 introduced LOCsettingsMerge.ts ×1settingsMerge.ts ×1 · 2 introduced LOCsettingsMerge.ts ×1settingsMerge.ts ×7 · 27 introduced LOCsettingsMerge.ts ×7settingsMerge.ts ×1 · 2 introduced LOCsettingsMerge.ts ×1settingsMerge.ts ×1 · 1 introduced LOCsettingsMerge.ts ×1settingsMerge.ts ×19 · 77 introduced LOCsettingsMerge.ts ×19userDataSync.ts ×15 · 532 introduced LOCuserDataSync.ts ×15extensionManagement.ts ×10 · 660 introduced LOCextensionManagement.ts ×…nls.ts ×2 · 13 introduced LOCnls.ts ×2configurationRegistry.ts ×1 · 2 introduced LOCconfigurationRegistry.ts…files.ts ×1 · 4 introduced LOCfiles.ts ×1files.ts ×1 · 4 introduced LOCfiles.ts ×1files.ts ×1 · 4 introduced LOCfiles.ts ×1files.ts ×41 · 1348 introduced LOCfiles.ts ×41ternarySearchTree.ts ×60 · 193 introduced LOCternarySearchTree.ts ×60extensions.ts ×24 · 483 introduced LOCextensions.ts ×24remoteHosts.ts ×7 · 52 introduced LOCremoteHosts.ts ×7configurationRegistry.ts ×1 · 2 introduced LOCconfigurationRegistry.ts…configurationRegistry.ts ×1 · 2 introduced LOCconfigurationRegistry.ts…network.ts ×20 · 292 introduced LOCnetwork.ts ×20strings.test|title=Strings trimWhitespace|occurrence=1 · 0 introduced LOCstrings.test|title=Strin…configurationRegistry.ts ×17 · 38 introduced LOCconfigurationRegistry.ts…configurationRegistry.ts ×1 · 2 introduced LOCconfigurationRegistry.ts…configurationRegistry.ts ×7 · 15 introduced LOCconfigurationRegistry.ts…strings.ts ×101 · 542 introduced LOCstrings.ts ×101configurationRegistry.ts ×7 · 42 introduced LOCconfigurationRegistry.ts…configurationRegistry.ts ×1 · 3 introduced LOCconfigurationRegistry.ts…configurationRegistry.ts ×5 · 10 introduced LOCconfigurationRegistry.ts…configurationRegistry.ts ×1 · 2 introduced LOCconfigurationRegistry.ts…policy.ts ×1 · 161 introduced LOCpolicy.ts ×1configurationRegistry.ts ×40 · 487 introduced LOCconfigurationRegistry.ts…jsonContributionRegistry.ts ×9 · 100 introduced LOCjsonContributionRegistry…cancellation.test|title=CancellationToken None|occurrence=1 · 0 introduced LOCcancellation.test|title=…cancellation.ts ×18 · 90 introduced LOCcancellation.ts ×18lifecycle.ts ×2 · 3 introduced LOClifecycle.ts ×2event.ts ×1 · 1 introduced LOCevent.ts ×1event.ts ×4 · 9 introduced LOCevent.ts ×4event.ts ×2 · 4 introduced LOCevent.ts ×2event.ts ×2 · 6 introduced LOCevent.ts ×2event.ts ×93 · 864 introduced LOCevent.ts ×93jsonEdit.ts ×5 · 18 introduced LOCjsonEdit.ts ×5jsonFormatter.ts ×6 · 69 introduced LOCjsonFormatter.ts ×6json.ts ×14 · 399 introduced LOCjson.ts ×14configuration.ts ×12 · 203 introduced LOCconfiguration.ts ×12platform.ts ×1 · 2 introduced LOCplatform.ts ×1types.test|title=Types isUndefinedOrNull|occurrence=1 · 0 introduced LOCtypes.test|title=Types i…platform.ts ×1 · 6 introduced LOCplatform.ts ×1types.test|title=Types isString|occurrence=1 · 0 introduced LOCtypes.test|title=Types i…types.test|title=Types isUndefined|occurrence=1 · 0 introduced LOCtypes.test|title=Types i…uri.test|title=URI URI#file, win-speciale|occurrence=1, charCode.test|title=CharCode has good values|occurrence=1, +2 · 0 introduced LOCuri.test|title=URI URI#f…product.ts ×4 · 39 introduced LOCproduct.ts ×4utils.ts ×3 · 9 introduced LOCutils.ts ×3nls.ts ×1 · 1 introduced LOCnls.ts ×1linkedList.ts ×13 · 44 introduced LOClinkedList.ts ×13nls.ts ×6 · 13 introduced LOCnls.ts ×6objects.ts ×13 · 65 introduced LOCobjects.ts ×13instantiation.ts ×5 · 111 introduced LOCinstantiation.ts ×5platform.ts ×5 · 46 introduced LOCplatform.ts ×5types.ts ×1 · 2 introduced LOCtypes.ts ×1jsonSchema.ts ×3 · 194 introduced LOCjsonSchema.ts ×3lifecycle.ts ×2 · 4 introduced LOClifecycle.ts ×2types.ts ×1 · 2 introduced LOCtypes.ts ×1assert.ts ×2 · 2 introduced LOCassert.ts ×2lifecycle.ts ×1 · 3 introduced LOClifecycle.ts ×1lifecycle.ts ×3 · 9 introduced LOClifecycle.ts ×3types.ts ×1 · 2 introduced LOCtypes.ts ×1types.ts ×2 · 5 introduced LOCtypes.ts ×2lifecycle.ts ×1 · 2 introduced LOClifecycle.ts ×1types.ts ×1 · 2 introduced LOCtypes.ts ×1types.ts ×1 · 2 introduced LOCtypes.ts ×1lifecycle.ts ×4 · 8 introduced LOClifecycle.ts ×4lifecycle.ts ×6 · 16 introduced LOClifecycle.ts ×6lifecycle.ts ×2 · 2 introduced LOClifecycle.ts ×2lazy.ts ×1 · 2 introduced LOClazy.ts ×1lifecycle.ts ×1 · 3 introduced LOClifecycle.ts ×1lazy.ts ×3 · 37 introduced LOClazy.ts ×3lifecycle.ts ×1 · 2 introduced LOClifecycle.ts ×1lifecycle.ts ×1 · 2 introduced LOClifecycle.ts ×1uint.ts ×2 · 43 introduced LOCuint.ts ×2lifecycle.ts ×1 · 3 introduced LOClifecycle.ts ×1map.ts ×97 · 3334 introduced LOCmap.ts ×97src/vs/base/common/arrays.ts · 949 LOCcommon/arrays.tssrc/vs/base/common/arraysFind.ts · 226 LOCcommon/arraysFind.tssrc/vs/base/common/assert.ts · 91 LOCcommon/assert.tssrc/vs/base/common/cache.ts · 153 LOCcommon/cache.tssrc/vs/base/common/cancellation.ts · 206 LOCcommon/cancellation.tssrc/vs/base/common/charCode.ts · 450 LOCcommon/charCode.tssrc/vs/base/common/collections.ts · 176 LOCcommon/collections.tssrc/vs/base/common/errors.ts · 357 LOCcommon/errors.tssrc/vs/base/common/event.ts · 1964 LOCcommon/event.tssrc/vs/base/common/functional.ts · 32 LOCcommon/functional.tssrc/vs/base/common/iterator.ts · 194 LOCcommon/iterator.tssrc/vs/base/common/json.ts · 1326 LOCcommon/json.tssrc/vs/base/common/jsonEdit.ts · 176 LOCcommon/jsonEdit.tssrc/vs/base/common/jsonFormatter.ts · 261 LOCcommon/jsonFormatter.tssrc/vs/base/common/jsonSchema.ts · 330 LOCcommon/jsonSchema.tssrc/vs/base/common/lazy.ts · 57 LOCcommon/lazy.tssrc/vs/base/common/lifecycle.ts · 974 LOCcommon/lifecycle.tssrc/vs/base/common/linkedList.ts · 151 LOCcommon/linkedList.tssrc/vs/base/common/map.ts · 1016 LOCcommon/map.tssrc/vs/base/common/marshallingIds.ts · 33 LOCcommon/marshallingIds.tssrc/vs/base/common/network.ts · 440 LOCcommon/network.tssrc/vs/base/common/objects.ts · 286 LOCcommon/objects.tssrc/vs/base/common/path.ts · 1589 LOCcommon/path.tssrc/vs/base/common/platform.ts · 281 LOCcommon/platform.tssrc/vs/base/common/policy.ts · 161 LOCcommon/policy.tssrc/vs/base/common/process.ts · 76 LOCcommon/process.tssrc/vs/base/common/stopwatch.ts · 41 LOCcommon/stopwatch.tssrc/vs/base/common/strings.ts · 1413 LOCcommon/strings.tssrc/vs/base/common/ternarySearchTree.ts · 796 LOCcommon/ternarySearchTree…src/vs/base/common/types.ts · 410 LOCcommon/types.tssrc/vs/base/common/uint.ts · 59 LOCcommon/uint.tssrc/vs/base/common/uri.ts · 754 LOCcommon/uri.tssrc/vs/base/test/common/utils.ts · 107 LOCcommon/utils.tssrc/vs/nls.ts · 244 LOCvs/nls.tssrc/vs/platform/configuration/common/configuration.ts · 358 LOCcommon/configuration.tssrc/vs/platform/configuration/common/configurationRegistry.ts · 1089 LOCcommon/configurationRegi…src/vs/platform/extensionManagement/common/extensionManagement.ts · 808 LOCcommon/extensionManageme…src/vs/platform/extensions/common/extensions.ts · 570 LOCcommon/extensions.tssrc/vs/platform/files/common/files.ts · 1658 LOCcommon/files.tssrc/vs/platform/instantiation/common/instantiation.ts · 130 LOCcommon/instantiation.tssrc/vs/platform/jsonschemas/common/jsonContributionRegistry.ts · 143 LOCcommon/jsonContributionR…src/vs/platform/product/common/product.ts · 93 LOCcommon/product.tssrc/vs/platform/registry/common/platform.ts · 63 LOCcommon/platform.tssrc/vs/platform/remote/common/remoteHosts.ts · 109 LOCcommon/remoteHosts.tssrc/vs/platform/userDataSync/common/content.ts · 53 LOCcommon/content.tssrc/vs/platform/userDataSync/common/settingsMerge.ts · 656 LOCcommon/settingsMerge.tssrc/vs/platform/userDataSync/common/userDataSync.ts · 666 LOCcommon/userDataSync.tscancellation.test|title=CancellationToken None|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/base/test/common/cancellation.test|title=CancellationToken None|occurrence=1cancellation.test|title=…charCode.test|title=CharCode has good values|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/base/test/common/charCode.test|title=CharCode has good values|occurrence=1charCode.test|title=Char…path.test|title=Paths (Node Implementation) path|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/base/test/common/path.test|title=Paths (Node Implementation) path|occurrence=1path.test|title=Paths (N…strings.test|title=Strings trimWhitespace|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/base/test/common/strings.test|title=Strings trimWhitespace|occurrence=1strings.test|title=Strin…types.test|title=Types isString|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/base/test/common/types.test|title=Types isString|occurrence=1types.test|title=Types i…types.test|title=Types isUndefinedOrNull|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/base/test/common/types.test|title=Types isUndefinedOrNull|occurrence=1types.test|title=Types i…types.test|title=Types isUndefined|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/base/test/common/types.test|title=Types isUndefined|occurrence=1types.test|title=Types i…uri.test|title=URI File paths containing apostrophes break URI parsing and cannot be opened #276075|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/base/test/common/uri.test|title=URI File paths containing apostrophes break URI parsing and cannot be opened #276075|occurrence=1uri.test|title=URI File …uri.test|title=URI URI#file, win-speciale|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/base/test/common/uri.test|title=URI URI#file, win-speciale|occurrence=1uri.test|title=URI URI#f…settingsMerge.test|title=SettingsMerge - Compute Remote Content local content is returned when there are no ignored settings|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Compute Remote Content local content is returned when there are no ignored settings|occurrence=1settingsMerge.test|title…settingsMerge.test|title=SettingsMerge - Merge merge when all entries are removed from base and local has not changed|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when all entries are removed from base and local has not changed|occurrence=1settingsMerge.test|title…settingsMerge.test|title=SettingsMerge - Merge merge when an entry is removed from remote from base and local has not changed|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when an entry is removed from remote from base and local has not changed|occurrence=1settingsMerge.test|title…settingsMerge.test|title=SettingsMerge - Merge merge when an entry is updated in remote from base and local has not changed|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when an entry is updated in remote from base and local has not changed|occurrence=1settingsMerge.test|title…settingsMerge.test|title=SettingsMerge - Merge merge when multiple new entries are added to remote from base and local has not changed|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when multiple new entries are added to remote from base and local has not changed|occurrence=1settingsMerge.test|title…settingsMerge.test|title=SettingsMerge - Merge merge when remote has moved forwareded with comment and order changes and local stays with base|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when remote has moved forwareded with comment and order changes and local stays with base|occurrence=1settingsMerge.test|title…settingsMerge.test|title=SettingsMerge - Merge merge when remote has moved forwareded with comment changes and local stays with base|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when remote has moved forwareded with comment changes and local stays with base|occurrence=1settingsMerge.test|title…settingsMerge.test|title=SettingsMerge - Merge merge when remote has moved forwareded with multiple changes and local stays with base|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when remote has moved forwareded with multiple changes and local stays with base|occurrence=1settingsMerge.test|title…settingsMerge.test|title=SettingsMerge - Merge merge when remote has moved forwareded with order changes and local stays with base|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/settingsMerge.test|title=SettingsMerge - Merge merge when remote has moved forwareded with order changes and local stays with base|occurrence=1settingsMerge.test|title…userDataSyncService.test|title=UserDataSyncService test sync when there are remote changes with profile|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/userDataSyncService.test|title=UserDataSyncService test sync when there are remote changes with profile|occurrence=1userDataSyncService.test…userDataSyncService.test|title=UserDataSyncService test sync when there are remote changes|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/userDataSyncService.test|title=UserDataSyncService test sync when there are remote changes|occurrence=1userDataSyncService.test…userDataSyncService.test|title=UserDataSyncService test sync when there is a remote profile that uses default profile|occurrence=1 · introduced test · mocha:v1|namespace=vscode@05c208e9e28d8c1c723fa08f85e2b7a96092e8e5|file=vs/platform/userDataSync/test/common/userDataSyncService.test|title=UserDataSyncService test sync when there is a remote profile that uses default profile|occurrence=1userDataSyncService.test…Focused concept · settingsMerge.ts ×1 · 2 introduced LOCsettingsMerge.ts ×1

Graph controls are ready.

Interactive rendering requires JavaScript and WebGL. Use the native relationship evidence on this page while the interactive map is unavailable.

Native relationship evidence

Every exact file and test below is linked only from the concept that introduces it.

Introduced tests

Every collected test enters the hierarchy at exactly one concept.

8 tests introduced at this concept.

Introduced code

Every collected source range enters the hierarchy at exactly one concept.

1 file ranked by introduced lines: 2 introduced LOC across 1 ranges. Expand a file to inspect source; the > gutter marks introduced lines.

src/vs/platform/userDataSync/common/settingsMerge.ts 2 introduced LOC · 1 range

Open complete file

120 /* remote has changed and local has not */
121 if (remoteForwarded && !localForwarded) {
122 > return { conflictsSettings: [], localContent: updateIgnoredSettings(originalRemoteContent, originalLocalContent, ignoredSettings, formattingOptions), remoteContent: null, hasConflicts: false }; settingsMerge.ts
123 > }
124
125 /* local is empty and not synced before */

Direct hierarchy

Parents

Children