Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-13 15:35:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

enable version check

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-10-26 12:17:13 +01:00
parent 88144f6d31
commit 475cff63bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/platform/userDataSync/common/extensionsMerge.ts
+3 -3
View File
@@ -7,6 +7,7 @@ import { ISyncExtension, ISyncExtensionWithVersion } from 'vs/platform/userDataS
import { IExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
import { deepClone, equals } from 'vs/base/common/objects';
import { IStringDictionary } from 'vs/base/common/collections';
import * as semver from 'vs/base/common/semver/semver';
export interface IMergeResult {
added: ISyncExtension[];
@@ -216,8 +217,7 @@ function mergeExtensionState(localExtension: ISyncExtensionWithVersion, remoteEx
if (!remoteExtension.version) {
return localState;
}
/*
* Enable this after making semver a common module
// If local state exists and local extension is latest then use local state
if (localState && semver.gt(localExtension.version, remoteExtension.version)) {
return localState;
@@ -226,7 +226,7 @@ function mergeExtensionState(localExtension: ISyncExtensionWithVersion, remoteEx
if (remoteState && semver.gt(remoteExtension.version, localExtension.version)) {
return remoteState;
}
*/
/* Remote and local are on same version */