@codingame/monaco-vscode-user-data-sync-service-override 3.2.2 → 4.0.0

package/_virtual/semver.js

@@ -0,0 +1,3 @@
+var semver = {exports: {}};
+
+export { semver as __module };

package/external/vscode-semver/semver.js

@@ -0,0 +1,982 @@
+import { __module as semver } from '../../_virtual/semver.js';
+
+(function (module, exports) {
+	exports = module.exports = SemVer;
+	 var debug;
+	 if (typeof process === 'object' &&
+	     process.env &&
+	     process.env.NODE_DEBUG &&
+	     /\bsemver\b/i.test(process.env.NODE_DEBUG))
+	   debug = function() {
+	     var args = Array.prototype.slice.call(arguments, 0);
+	     args.unshift('SEMVER');
+	     console.log.apply(console, args);
+	     };
+	 else
+	   debug = function() {};
+	exports.SEMVER_SPEC_VERSION = '2.0.0';
+	var MAX_LENGTH = 256;
+	var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
+	var MAX_SAFE_COMPONENT_LENGTH = 16;
+	var re = exports.re = [];
+	var src = exports.src = [];
+	var R = 0;
+	var NUMERICIDENTIFIER = R++;
+	src[NUMERICIDENTIFIER] = '0|[1-9]\\d*';
+	var NUMERICIDENTIFIERLOOSE = R++;
+	src[NUMERICIDENTIFIERLOOSE] = '[0-9]+';
+	var NONNUMERICIDENTIFIER = R++;
+	src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
+	var MAINVERSION = R++;
+	src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+	                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+	                   '(' + src[NUMERICIDENTIFIER] + ')';
+	var MAINVERSIONLOOSE = R++;
+	src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+	                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+	                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')';
+	var PRERELEASEIDENTIFIER = R++;
+	src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+	                            '|' + src[NONNUMERICIDENTIFIER] + ')';
+	var PRERELEASEIDENTIFIERLOOSE = R++;
+	src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+	                                 '|' + src[NONNUMERICIDENTIFIER] + ')';
+	var PRERELEASE = R++;
+	src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+	                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))';
+	var PRERELEASELOOSE = R++;
+	src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+	                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))';
+	var BUILDIDENTIFIER = R++;
+	src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
+	var BUILD = R++;
+	src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+	             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))';
+	var FULL = R++;
+	var FULLPLAIN = 'v?' + src[MAINVERSION] +
+	                src[PRERELEASE] + '?' +
+	                src[BUILD] + '?';
+	src[FULL] = '^' + FULLPLAIN + '$';
+	var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
+	                 src[PRERELEASELOOSE] + '?' +
+	                 src[BUILD] + '?';
+	var LOOSE = R++;
+	src[LOOSE] = '^' + LOOSEPLAIN + '$';
+	var GTLT = R++;
+	src[GTLT] = '((?:<|>)?=?)';
+	var XRANGEIDENTIFIERLOOSE = R++;
+	src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*';
+	var XRANGEIDENTIFIER = R++;
+	src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*';
+	var XRANGEPLAIN = R++;
+	src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+	                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+	                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+	                   '(?:' + src[PRERELEASE] + ')?' +
+	                   src[BUILD] + '?' +
+	                   ')?)?';
+	var XRANGEPLAINLOOSE = R++;
+	src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+	                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+	                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+	                        '(?:' + src[PRERELEASELOOSE] + ')?' +
+	                        src[BUILD] + '?' +
+	                        ')?)?';
+	var XRANGE = R++;
+	src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
+	var XRANGELOOSE = R++;
+	src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';
+	var COERCE = R++;
+	src[COERCE] = '(?:^|[^\\d])' +
+	              '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
+	              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+	              '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
+	              '(?:$|[^\\d])';
+	var LONETILDE = R++;
+	src[LONETILDE] = '(?:~>?)';
+	var TILDETRIM = R++;
+	src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+';
+	re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g');
+	var tildeTrimReplace = '$1~';
+	var TILDE = R++;
+	src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
+	var TILDELOOSE = R++;
+	src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$';
+	var LONECARET = R++;
+	src[LONECARET] = '(?:\\^)';
+	var CARETTRIM = R++;
+	src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+';
+	re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g');
+	var caretTrimReplace = '$1^';
+	var CARET = R++;
+	src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$';
+	var CARETLOOSE = R++;
+	src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$';
+	var COMPARATORLOOSE = R++;
+	src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$';
+	var COMPARATOR = R++;
+	src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$';
+	var COMPARATORTRIM = R++;
+	src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
+	                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')';
+	re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
+	var comparatorTrimReplace = '$1$2$3';
+	var HYPHENRANGE = R++;
+	src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
+	                   '\\s+-\\s+' +
+	                   '(' + src[XRANGEPLAIN] + ')' +
+	                   '\\s*$';
+	var HYPHENRANGELOOSE = R++;
+	src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+	                        '\\s+-\\s+' +
+	                        '(' + src[XRANGEPLAINLOOSE] + ')' +
+	                        '\\s*$';
+	var STAR = R++;
+	src[STAR] = '(<|>)?=?\\s*\\*';
+	for (var i = 0; i < R; i++) {
+	  debug(i, src[i]);
+	  if (!re[i])
+	    re[i] = new RegExp(src[i]);
+	}
+	exports.parse = parse;
+	function parse(version, loose) {
+	  if (version instanceof SemVer)
+	    return version;
+	  if (typeof version !== 'string')
+	    return null;
+	  if (version.length > MAX_LENGTH)
+	    return null;
+	  var r = loose ? re[LOOSE] : re[FULL];
+	  if (!r.test(version))
+	    return null;
+	  try {
+	    return new SemVer(version, loose);
+	  } catch (er) {
+	    return null;
+	  }
+	}
+	exports.valid = valid;
+	function valid(version, loose) {
+	  var v = parse(version, loose);
+	  return v ? v.version : null;
+	}
+	exports.clean = clean;
+	function clean(version, loose) {
+	  var s = parse(version.trim().replace(/^[=v]+/, ''), loose);
+	  return s ? s.version : null;
+	}
+	exports.SemVer = SemVer;
+	function SemVer(version, loose) {
+	  if (version instanceof SemVer) {
+	    if (version.loose === loose)
+	      return version;
+	    else
+	      version = version.version;
+	  } else if (typeof version !== 'string') {
+	    throw new TypeError('Invalid Version: ' + version);
+	  }
+	  if (version.length > MAX_LENGTH)
+	    throw new TypeError('version is longer than ' + MAX_LENGTH + ' characters')
+	  if (!(this instanceof SemVer))
+	    return new SemVer(version, loose);
+	  debug('SemVer', version, loose);
+	  this.loose = loose;
+	  var m = version.trim().match(loose ? re[LOOSE] : re[FULL]);
+	  if (!m)
+	    throw new TypeError('Invalid Version: ' + version);
+	  this.raw = version;
+	  this.major = +m[1];
+	  this.minor = +m[2];
+	  this.patch = +m[3];
+	  if (this.major > MAX_SAFE_INTEGER || this.major < 0)
+	    throw new TypeError('Invalid major version')
+	  if (this.minor > MAX_SAFE_INTEGER || this.minor < 0)
+	    throw new TypeError('Invalid minor version')
+	  if (this.patch > MAX_SAFE_INTEGER || this.patch < 0)
+	    throw new TypeError('Invalid patch version')
+	  if (!m[4])
+	    this.prerelease = [];
+	  else
+	    this.prerelease = m[4].split('.').map(function(id) {
+	      if (/^[0-9]+$/.test(id)) {
+	        var num = +id;
+	        if (num >= 0 && num < MAX_SAFE_INTEGER)
+	          return num;
+	      }
+	      return id;
+	    });
+	  this.build = m[5] ? m[5].split('.') : [];
+	  this.format();
+	}
+	SemVer.prototype.format = function() {
+	  this.version = this.major + '.' + this.minor + '.' + this.patch;
+	  if (this.prerelease.length)
+	    this.version += '-' + this.prerelease.join('.');
+	  return this.version;
+	};
+	SemVer.prototype.toString = function() {
+	  return this.version;
+	};
+	SemVer.prototype.compare = function(other) {
+	  debug('SemVer.compare', this.version, this.loose, other);
+	  if (!(other instanceof SemVer))
+	    other = new SemVer(other, this.loose);
+	  return this.compareMain(other) || this.comparePre(other);
+	};
+	SemVer.prototype.compareMain = function(other) {
+	  if (!(other instanceof SemVer))
+	    other = new SemVer(other, this.loose);
+	  return compareIdentifiers(this.major, other.major) ||
+	         compareIdentifiers(this.minor, other.minor) ||
+	         compareIdentifiers(this.patch, other.patch);
+	};
+	SemVer.prototype.comparePre = function(other) {
+	  if (!(other instanceof SemVer))
+	    other = new SemVer(other, this.loose);
+	  if (this.prerelease.length && !other.prerelease.length)
+	    return -1;
+	  else if (!this.prerelease.length && other.prerelease.length)
+	    return 1;
+	  else if (!this.prerelease.length && !other.prerelease.length)
+	    return 0;
+	  var i = 0;
+	  do {
+	    var a = this.prerelease[i];
+	    var b = other.prerelease[i];
+	    debug('prerelease compare', i, a, b);
+	    if (a === undefined && b === undefined)
+	      return 0;
+	    else if (b === undefined)
+	      return 1;
+	    else if (a === undefined)
+	      return -1;
+	    else if (a === b)
+	      continue;
+	    else
+	      return compareIdentifiers(a, b);
+	  } while (++i);
+	};
+	SemVer.prototype.inc = function(release, identifier) {
+	  switch (release) {
+	    case 'premajor':
+	      this.prerelease.length = 0;
+	      this.patch = 0;
+	      this.minor = 0;
+	      this.major++;
+	      this.inc('pre', identifier);
+	      break;
+	    case 'preminor':
+	      this.prerelease.length = 0;
+	      this.patch = 0;
+	      this.minor++;
+	      this.inc('pre', identifier);
+	      break;
+	    case 'prepatch':
+	      this.prerelease.length = 0;
+	      this.inc('patch', identifier);
+	      this.inc('pre', identifier);
+	      break;
+	    case 'prerelease':
+	      if (this.prerelease.length === 0)
+	        this.inc('patch', identifier);
+	      this.inc('pre', identifier);
+	      break;
+	    case 'major':
+	      if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0)
+	        this.major++;
+	      this.minor = 0;
+	      this.patch = 0;
+	      this.prerelease = [];
+	      break;
+	    case 'minor':
+	      if (this.patch !== 0 || this.prerelease.length === 0)
+	        this.minor++;
+	      this.patch = 0;
+	      this.prerelease = [];
+	      break;
+	    case 'patch':
+	      if (this.prerelease.length === 0)
+	        this.patch++;
+	      this.prerelease = [];
+	      break;
+	    case 'pre':
+	      if (this.prerelease.length === 0)
+	        this.prerelease = [0];
+	      else {
+	        var i = this.prerelease.length;
+	        while (--i >= 0) {
+	          if (typeof this.prerelease[i] === 'number') {
+	            this.prerelease[i]++;
+	            i = -2;
+	          }
+	        }
+	        if (i === -1)
+	          this.prerelease.push(0);
+	      }
+	      if (identifier) {
+	        if (this.prerelease[0] === identifier) {
+	          if (isNaN(this.prerelease[1]))
+	            this.prerelease = [identifier, 0];
+	        } else
+	          this.prerelease = [identifier, 0];
+	      }
+	      break;
+	    default:
+	      throw new Error('invalid increment argument: ' + release);
+	  }
+	  this.format();
+	  this.raw = this.version;
+	  return this;
+	};
+	exports.inc = inc;
+	function inc(version, release, loose, identifier) {
+	  if (typeof(loose) === 'string') {
+	    identifier = loose;
+	    loose = undefined;
+	  }
+	  try {
+	    return new SemVer(version, loose).inc(release, identifier).version;
+	  } catch (er) {
+	    return null;
+	  }
+	}
+	exports.diff = diff;
+	function diff(version1, version2) {
+	  if (eq(version1, version2)) {
+	    return null;
+	  } else {
+	    var v1 = parse(version1);
+	    var v2 = parse(version2);
+	    if (v1.prerelease.length || v2.prerelease.length) {
+	      for (var key in v1) {
+	        if (key === 'major' || key === 'minor' || key === 'patch') {
+	          if (v1[key] !== v2[key]) {
+	            return 'pre'+key;
+	          }
+	        }
+	      }
+	      return 'prerelease';
+	    }
+	    for (var key in v1) {
+	      if (key === 'major' || key === 'minor' || key === 'patch') {
+	        if (v1[key] !== v2[key]) {
+	          return key;
+	        }
+	      }
+	    }
+	  }
+	}
+	exports.compareIdentifiers = compareIdentifiers;
+	var numeric = /^[0-9]+$/;
+	function compareIdentifiers(a, b) {
+	  var anum = numeric.test(a);
+	  var bnum = numeric.test(b);
+	  if (anum && bnum) {
+	    a = +a;
+	    b = +b;
+	  }
+	  return (anum && !bnum) ? -1 :
+	         (bnum && !anum) ? 1 :
+	         a < b ? -1 :
+	         a > b ? 1 :
+	         0;
+	}
+	exports.rcompareIdentifiers = rcompareIdentifiers;
+	function rcompareIdentifiers(a, b) {
+	  return compareIdentifiers(b, a);
+	}
+	exports.major = major;
+	function major(a, loose) {
+	  return new SemVer(a, loose).major;
+	}
+	exports.minor = minor;
+	function minor(a, loose) {
+	  return new SemVer(a, loose).minor;
+	}
+	exports.patch = patch;
+	function patch(a, loose) {
+	  return new SemVer(a, loose).patch;
+	}
+	exports.compare = compare;
+	function compare(a, b, loose) {
+	  return new SemVer(a, loose).compare(new SemVer(b, loose));
+	}
+	exports.compareLoose = compareLoose;
+	function compareLoose(a, b) {
+	  return compare(a, b, true);
+	}
+	exports.rcompare = rcompare;
+	function rcompare(a, b, loose) {
+	  return compare(b, a, loose);
+	}
+	exports.sort = sort;
+	function sort(list, loose) {
+	  return list.sort(function(a, b) {
+	    return exports.compare(a, b, loose);
+	  });
+	}
+	exports.rsort = rsort;
+	function rsort(list, loose) {
+	  return list.sort(function(a, b) {
+	    return exports.rcompare(a, b, loose);
+	  });
+	}
+	exports.gt = gt;
+	function gt(a, b, loose) {
+	  return compare(a, b, loose) > 0;
+	}
+	exports.lt = lt;
+	function lt(a, b, loose) {
+	  return compare(a, b, loose) < 0;
+	}
+	exports.eq = eq;
+	function eq(a, b, loose) {
+	  return compare(a, b, loose) === 0;
+	}
+	exports.neq = neq;
+	function neq(a, b, loose) {
+	  return compare(a, b, loose) !== 0;
+	}
+	exports.gte = gte;
+	function gte(a, b, loose) {
+	  return compare(a, b, loose) >= 0;
+	}
+	exports.lte = lte;
+	function lte(a, b, loose) {
+	  return compare(a, b, loose) <= 0;
+	}
+	exports.cmp = cmp;
+	function cmp(a, op, b, loose) {
+	  var ret;
+	  switch (op) {
+	    case '===':
+	      if (typeof a === 'object') a = a.version;
+	      if (typeof b === 'object') b = b.version;
+	      ret = a === b;
+	      break;
+	    case '!==':
+	      if (typeof a === 'object') a = a.version;
+	      if (typeof b === 'object') b = b.version;
+	      ret = a !== b;
+	      break;
+	    case '': case '=': case '==': ret = eq(a, b, loose); break;
+	    case '!=': ret = neq(a, b, loose); break;
+	    case '>': ret = gt(a, b, loose); break;
+	    case '>=': ret = gte(a, b, loose); break;
+	    case '<': ret = lt(a, b, loose); break;
+	    case '<=': ret = lte(a, b, loose); break;
+	    default: throw new TypeError('Invalid operator: ' + op);
+	  }
+	  return ret;
+	}
+	exports.Comparator = Comparator;
+	function Comparator(comp, loose) {
+	  if (comp instanceof Comparator) {
+	    if (comp.loose === loose)
+	      return comp;
+	    else
+	      comp = comp.value;
+	  }
+	  if (!(this instanceof Comparator))
+	    return new Comparator(comp, loose);
+	  debug('comparator', comp, loose);
+	  this.loose = loose;
+	  this.parse(comp);
+	  if (this.semver === ANY)
+	    this.value = '';
+	  else
+	    this.value = this.operator + this.semver.version;
+	  debug('comp', this);
+	}
+	var ANY = {};
+	Comparator.prototype.parse = function(comp) {
+	  var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
+	  var m = comp.match(r);
+	  if (!m)
+	    throw new TypeError('Invalid comparator: ' + comp);
+	  this.operator = m[1];
+	  if (this.operator === '=')
+	    this.operator = '';
+	  if (!m[2])
+	    this.semver = ANY;
+	  else
+	    this.semver = new SemVer(m[2], this.loose);
+	};
+	Comparator.prototype.toString = function() {
+	  return this.value;
+	};
+	Comparator.prototype.test = function(version) {
+	  debug('Comparator.test', version, this.loose);
+	  if (this.semver === ANY)
+	    return true;
+	  if (typeof version === 'string')
+	    version = new SemVer(version, this.loose);
+	  return cmp(version, this.operator, this.semver, this.loose);
+	};
+	Comparator.prototype.intersects = function(comp, loose) {
+	  if (!(comp instanceof Comparator)) {
+	    throw new TypeError('a Comparator is required');
+	  }
+	  var rangeTmp;
+	  if (this.operator === '') {
+	    rangeTmp = new Range(comp.value, loose);
+	    return satisfies(this.value, rangeTmp, loose);
+	  } else if (comp.operator === '') {
+	    rangeTmp = new Range(this.value, loose);
+	    return satisfies(comp.semver, rangeTmp, loose);
+	  }
+	  var sameDirectionIncreasing =
+	    (this.operator === '>=' || this.operator === '>') &&
+	    (comp.operator === '>=' || comp.operator === '>');
+	  var sameDirectionDecreasing =
+	    (this.operator === '<=' || this.operator === '<') &&
+	    (comp.operator === '<=' || comp.operator === '<');
+	  var sameSemVer = this.semver.version === comp.semver.version;
+	  var differentDirectionsInclusive =
+	    (this.operator === '>=' || this.operator === '<=') &&
+	    (comp.operator === '>=' || comp.operator === '<=');
+	  var oppositeDirectionsLessThan =
+	    cmp(this.semver, '<', comp.semver, loose) &&
+	    ((this.operator === '>=' || this.operator === '>') &&
+	    (comp.operator === '<=' || comp.operator === '<'));
+	  var oppositeDirectionsGreaterThan =
+	    cmp(this.semver, '>', comp.semver, loose) &&
+	    ((this.operator === '<=' || this.operator === '<') &&
+	    (comp.operator === '>=' || comp.operator === '>'));
+	  return sameDirectionIncreasing || sameDirectionDecreasing ||
+	    (sameSemVer && differentDirectionsInclusive) ||
+	    oppositeDirectionsLessThan || oppositeDirectionsGreaterThan;
+	};
+	exports.Range = Range;
+	function Range(range, loose) {
+	  if (range instanceof Range) {
+	    if (range.loose === loose) {
+	      return range;
+	    } else {
+	      return new Range(range.raw, loose);
+	    }
+	  }
+	  if (range instanceof Comparator) {
+	    return new Range(range.value, loose);
+	  }
+	  if (!(this instanceof Range))
+	    return new Range(range, loose);
+	  this.loose = loose;
+	  this.raw = range;
+	  this.set = range.split(/\s*\|\|\s*/).map(function(range) {
+	    return this.parseRange(range.trim());
+	  }, this).filter(function(c) {
+	    return c.length;
+	  });
+	  if (!this.set.length) {
+	    throw new TypeError('Invalid SemVer Range: ' + range);
+	  }
+	  this.format();
+	}
+	Range.prototype.format = function() {
+	  this.range = this.set.map(function(comps) {
+	    return comps.join(' ').trim();
+	  }).join('||').trim();
+	  return this.range;
+	};
+	Range.prototype.toString = function() {
+	  return this.range;
+	};
+	Range.prototype.parseRange = function(range) {
+	  var loose = this.loose;
+	  range = range.trim();
+	  debug('range', range, loose);
+	  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE];
+	  range = range.replace(hr, hyphenReplace);
+	  debug('hyphen replace', range);
+	  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace);
+	  debug('comparator trim', range, re[COMPARATORTRIM]);
+	  range = range.replace(re[TILDETRIM], tildeTrimReplace);
+	  range = range.replace(re[CARETTRIM], caretTrimReplace);
+	  range = range.split(/\s+/).join(' ');
+	  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
+	  var set = range.split(' ').map(function(comp) {
+	    return parseComparator(comp, loose);
+	  }).join(' ').split(/\s+/);
+	  if (this.loose) {
+	    set = set.filter(function(comp) {
+	      return !!comp.match(compRe);
+	    });
+	  }
+	  set = set.map(function(comp) {
+	    return new Comparator(comp, loose);
+	  });
+	  return set;
+	};
+	Range.prototype.intersects = function(range, loose) {
+	  if (!(range instanceof Range)) {
+	    throw new TypeError('a Range is required');
+	  }
+	  return this.set.some(function(thisComparators) {
+	    return thisComparators.every(function(thisComparator) {
+	      return range.set.some(function(rangeComparators) {
+	        return rangeComparators.every(function(rangeComparator) {
+	          return thisComparator.intersects(rangeComparator, loose);
+	        });
+	      });
+	    });
+	  });
+	};
+	exports.toComparators = toComparators;
+	function toComparators(range, loose) {
+	  return new Range(range, loose).set.map(function(comp) {
+	    return comp.map(function(c) {
+	      return c.value;
+	    }).join(' ').trim().split(' ');
+	  });
+	}
+	function parseComparator(comp, loose) {
+	  debug('comp', comp);
+	  comp = replaceCarets(comp, loose);
+	  debug('caret', comp);
+	  comp = replaceTildes(comp, loose);
+	  debug('tildes', comp);
+	  comp = replaceXRanges(comp, loose);
+	  debug('xrange', comp);
+	  comp = replaceStars(comp, loose);
+	  debug('stars', comp);
+	  return comp;
+	}
+	function isX(id) {
+	  return !id || id.toLowerCase() === 'x' || id === '*';
+	}
+	function replaceTildes(comp, loose) {
+	  return comp.trim().split(/\s+/).map(function(comp) {
+	    return replaceTilde(comp, loose);
+	  }).join(' ');
+	}
+	function replaceTilde(comp, loose) {
+	  var r = loose ? re[TILDELOOSE] : re[TILDE];
+	  return comp.replace(r, function(_, M, m, p, pr) {
+	    debug('tilde', comp, _, M, m, p, pr);
+	    var ret;
+	    if (isX(M))
+	      ret = '';
+	    else if (isX(m))
+	      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+	    else if (isX(p))
+	      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+	    else if (pr) {
+	      debug('replaceTilde pr', pr);
+	      if (pr.charAt(0) !== '-')
+	        pr = '-' + pr;
+	      ret = '>=' + M + '.' + m + '.' + p + pr +
+	            ' <' + M + '.' + (+m + 1) + '.0';
+	    } else
+	      ret = '>=' + M + '.' + m + '.' + p +
+	            ' <' + M + '.' + (+m + 1) + '.0';
+	    debug('tilde return', ret);
+	    return ret;
+	  });
+	}
+	function replaceCarets(comp, loose) {
+	  return comp.trim().split(/\s+/).map(function(comp) {
+	    return replaceCaret(comp, loose);
+	  }).join(' ');
+	}
+	function replaceCaret(comp, loose) {
+	  debug('caret', comp, loose);
+	  var r = loose ? re[CARETLOOSE] : re[CARET];
+	  return comp.replace(r, function(_, M, m, p, pr) {
+	    debug('caret', comp, _, M, m, p, pr);
+	    var ret;
+	    if (isX(M))
+	      ret = '';
+	    else if (isX(m))
+	      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+	    else if (isX(p)) {
+	      if (M === '0')
+	        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+	      else
+	        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0';
+	    } else if (pr) {
+	      debug('replaceCaret pr', pr);
+	      if (pr.charAt(0) !== '-')
+	        pr = '-' + pr;
+	      if (M === '0') {
+	        if (m === '0')
+	          ret = '>=' + M + '.' + m + '.' + p + pr +
+	                ' <' + M + '.' + m + '.' + (+p + 1);
+	        else
+	          ret = '>=' + M + '.' + m + '.' + p + pr +
+	                ' <' + M + '.' + (+m + 1) + '.0';
+	      } else
+	        ret = '>=' + M + '.' + m + '.' + p + pr +
+	              ' <' + (+M + 1) + '.0.0';
+	    } else {
+	      debug('no pr');
+	      if (M === '0') {
+	        if (m === '0')
+	          ret = '>=' + M + '.' + m + '.' + p +
+	                ' <' + M + '.' + m + '.' + (+p + 1);
+	        else
+	          ret = '>=' + M + '.' + m + '.' + p +
+	                ' <' + M + '.' + (+m + 1) + '.0';
+	      } else
+	        ret = '>=' + M + '.' + m + '.' + p +
+	              ' <' + (+M + 1) + '.0.0';
+	    }
+	    debug('caret return', ret);
+	    return ret;
+	  });
+	}
+	function replaceXRanges(comp, loose) {
+	  debug('replaceXRanges', comp, loose);
+	  return comp.split(/\s+/).map(function(comp) {
+	    return replaceXRange(comp, loose);
+	  }).join(' ');
+	}
+	function replaceXRange(comp, loose) {
+	  comp = comp.trim();
+	  var r = loose ? re[XRANGELOOSE] : re[XRANGE];
+	  return comp.replace(r, function(ret, gtlt, M, m, p, pr) {
+	    debug('xRange', comp, ret, gtlt, M, m, p, pr);
+	    var xM = isX(M);
+	    var xm = xM || isX(m);
+	    var xp = xm || isX(p);
+	    var anyX = xp;
+	    if (gtlt === '=' && anyX)
+	      gtlt = '';
+	    if (xM) {
+	      if (gtlt === '>' || gtlt === '<') {
+	        ret = '<0.0.0';
+	      } else {
+	        ret = '*';
+	      }
+	    } else if (gtlt && anyX) {
+	      if (xm)
+	        m = 0;
+	      if (xp)
+	        p = 0;
+	      if (gtlt === '>') {
+	        gtlt = '>=';
+	        if (xm) {
+	          M = +M + 1;
+	          m = 0;
+	          p = 0;
+	        } else if (xp) {
+	          m = +m + 1;
+	          p = 0;
+	        }
+	      } else if (gtlt === '<=') {
+	        gtlt = '<';
+	        if (xm)
+	          M = +M + 1;
+	        else
+	          m = +m + 1;
+	      }
+	      ret = gtlt + M + '.' + m + '.' + p;
+	    } else if (xm) {
+	      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+	    } else if (xp) {
+	      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+	    }
+	    debug('xRange return', ret);
+	    return ret;
+	  });
+	}
+	function replaceStars(comp, loose) {
+	  debug('replaceStars', comp, loose);
+	  return comp.trim().replace(re[STAR], '');
+	}
+	function hyphenReplace($0,
+	                       from, fM, fm, fp, fpr, fb,
+	                       to, tM, tm, tp, tpr, tb) {
+	  if (isX(fM))
+	    from = '';
+	  else if (isX(fm))
+	    from = '>=' + fM + '.0.0';
+	  else if (isX(fp))
+	    from = '>=' + fM + '.' + fm + '.0';
+	  else
+	    from = '>=' + from;
+	  if (isX(tM))
+	    to = '';
+	  else if (isX(tm))
+	    to = '<' + (+tM + 1) + '.0.0';
+	  else if (isX(tp))
+	    to = '<' + tM + '.' + (+tm + 1) + '.0';
+	  else if (tpr)
+	    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr;
+	  else
+	    to = '<=' + to;
+	  return (from + ' ' + to).trim();
+	}
+	Range.prototype.test = function(version) {
+	  if (!version)
+	    return false;
+	  if (typeof version === 'string')
+	    version = new SemVer(version, this.loose);
+	  for (var i = 0; i < this.set.length; i++) {
+	    if (testSet(this.set[i], version))
+	      return true;
+	  }
+	  return false;
+	};
+	function testSet(set, version) {
+	  for (var i = 0; i < set.length; i++) {
+	    if (!set[i].test(version))
+	      return false;
+	  }
+	  if (version.prerelease.length) {
+	    for (var i = 0; i < set.length; i++) {
+	      debug(set[i].semver);
+	      if (set[i].semver === ANY)
+	        continue;
+	      if (set[i].semver.prerelease.length > 0) {
+	        var allowed = set[i].semver;
+	        if (allowed.major === version.major &&
+	            allowed.minor === version.minor &&
+	            allowed.patch === version.patch)
+	          return true;
+	      }
+	    }
+	    return false;
+	  }
+	  return true;
+	}
+	exports.satisfies = satisfies;
+	function satisfies(version, range, loose) {
+	  try {
+	    range = new Range(range, loose);
+	  } catch (er) {
+	    return false;
+	  }
+	  return range.test(version);
+	}
+	exports.maxSatisfying = maxSatisfying;
+	function maxSatisfying(versions, range, loose) {
+	  var max = null;
+	  var maxSV = null;
+	  try {
+	    var rangeObj = new Range(range, loose);
+	  } catch (er) {
+	    return null;
+	  }
+	  versions.forEach(function (v) {
+	    if (rangeObj.test(v)) {
+	      if (!max || maxSV.compare(v) === -1) {
+	        max = v;
+	        maxSV = new SemVer(max, loose);
+	      }
+	    }
+	  });
+	  return max;
+	}
+	exports.minSatisfying = minSatisfying;
+	function minSatisfying(versions, range, loose) {
+	  var min = null;
+	  var minSV = null;
+	  try {
+	    var rangeObj = new Range(range, loose);
+	  } catch (er) {
+	    return null;
+	  }
+	  versions.forEach(function (v) {
+	    if (rangeObj.test(v)) {
+	      if (!min || minSV.compare(v) === 1) {
+	        min = v;
+	        minSV = new SemVer(min, loose);
+	      }
+	    }
+	  });
+	  return min;
+	}
+	exports.validRange = validRange;
+	function validRange(range, loose) {
+	  try {
+	    return new Range(range, loose).range || '*';
+	  } catch (er) {
+	    return null;
+	  }
+	}
+	exports.ltr = ltr;
+	function ltr(version, range, loose) {
+	  return outside(version, range, '<', loose);
+	}
+	exports.gtr = gtr;
+	function gtr(version, range, loose) {
+	  return outside(version, range, '>', loose);
+	}
+	exports.outside = outside;
+	function outside(version, range, hilo, loose) {
+	  version = new SemVer(version, loose);
+	  range = new Range(range, loose);
+	  var gtfn, ltefn, ltfn, comp, ecomp;
+	  switch (hilo) {
+	    case '>':
+	      gtfn = gt;
+	      ltefn = lte;
+	      ltfn = lt;
+	      comp = '>';
+	      ecomp = '>=';
+	      break;
+	    case '<':
+	      gtfn = lt;
+	      ltefn = gte;
+	      ltfn = gt;
+	      comp = '<';
+	      ecomp = '<=';
+	      break;
+	    default:
+	      throw new TypeError('Must provide a hilo val of "<" or ">"');
+	  }
+	  if (satisfies(version, range, loose)) {
+	    return false;
+	  }
+	  for (var i = 0; i < range.set.length; ++i) {
+	    var comparators = range.set[i];
+	    var high = null;
+	    var low = null;
+	    comparators.forEach(function(comparator) {
+	      if (comparator.semver === ANY) {
+	        comparator = new Comparator('>=0.0.0');
+	      }
+	      high = high || comparator;
+	      low = low || comparator;
+	      if (gtfn(comparator.semver, high.semver, loose)) {
+	        high = comparator;
+	      } else if (ltfn(comparator.semver, low.semver, loose)) {
+	        low = comparator;
+	      }
+	    });
+	    if (high.operator === comp || high.operator === ecomp) {
+	      return false;
+	    }
+	    if ((!low.operator || low.operator === comp) &&
+	        ltefn(version, low.semver)) {
+	      return false;
+	    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
+	      return false;
+	    }
+	  }
+	  return true;
+	}
+	exports.prerelease = prerelease;
+	function prerelease(version, loose) {
+	  var parsed = parse(version, loose);
+	  return (parsed && parsed.prerelease.length) ? parsed.prerelease : null;
+	}
+	exports.intersects = intersects;
+	function intersects(r1, r2, loose) {
+	  r1 = new Range(r1, loose);
+	  r2 = new Range(r2, loose);
+	  return r1.intersects(r2)
+	}
+	exports.coerce = coerce;
+	function coerce(version) {
+	  if (version instanceof SemVer)
+	    return version;
+	  if (typeof version !== 'string')
+	    return null;
+	  var match = version.match(re[COERCE]);
+	  if (match == null)
+	    return null;
+	  return parse((match[1] || '0') + '.' + (match[2] || '0') + '.' + (match[3] || '0'));
+	}
+} (semver, semver.exports));

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/override/vs/platform/userDataSync/common/extensionsSync.js

@@ -1,3 +1,5 @@
+export { LocalExtensionsProvider, parseExtensions, stringify } from '../../../../../vscode/src/vs/platform/userDataSync/common/extensionsSync.js';
+
 class ExtensionsSynchroniser {}
 class AbstractExtensionsInitializer {}
 

package/override/vs/platform/userDataSync/common/globalStateSync.js

@@ -1,3 +1,5 @@
+export { LocalGlobalStateProvider, stringify } from '../../../../../vscode/src/vs/platform/userDataSync/common/globalStateSync.js';
+
 class GlobalStateSynchroniser {}
 class UserDataSyncStoreTypeSynchronizer {}
 class GlobalStateInitializer {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-user-data-sync-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.js

@@ -48,9 +48,9 @@ class IconSelectBox extends Disposable {
         })));
         append(iconSelectBoxContainer, this.scrollableElement.getDomNode());
         if (this.options.showIconInfo) {
-            this.iconIdElement = ( new HighlightedLabel(
+            this.iconIdElement = this._register(( new HighlightedLabel(
                 append(append(iconSelectBoxContainer, $('.icon-select-id-container')), $('.icon-select-id-label'))
-            ));
+            )));
         }
         const iconsDisposables = disposables.add(( new MutableDisposable()));
         iconsDisposables.value = this.renderIcons(this.options.icons, [], iconsContainer);

package/vscode/src/vs/platform/userDataProfile/common/userDataProfileStorageService.js

@@ -1,4 +1,9 @@
+import 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/base/parts/storage/common/storage';
 import { createDecorator } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/storage/common/storage';
+import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 
 const IUserDataProfileStorageService = ( createDecorator('IUserDataProfileStorageService'));
 

package/vscode/src/vs/platform/userDataSync/common/extensionsSync.js

@@ -2,18 +2,25 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { Promises } from 'vscode/vscode/vs/base/common/async';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
+import 'vscode/vscode/vs/base/common/event';
 import { toFormattedString } from 'vscode/vscode/vs/base/common/jsonFormatter';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { compare } from 'vscode/vscode/vs/base/common/strings';
+import 'vscode/vscode/vs/base/common/path';
+import 'vscode/vscode/vs/base/common/platform';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { GlobalExtensionEnablementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionEnablementService';
 import { EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SYNC_CONTEXT, ExtensionManagementError, ExtensionManagementErrorCode, IExtensionManagementService, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { areSameExtensions } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionStorageService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionStorage';
 import { isApplicationScopedExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import 'vscode/vscode/vs/platform/files/common/files';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
+import 'vscode/vscode/vs/platform/log/common/log';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 import { getSyncResourceLogLabel } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
+import '../../../../../../external/vscode-semver/semver.js';
 import { IIgnoredExtensionsManagementService } from 'vscode/vscode/vs/platform/userDataSync/common/ignoredExtensions';
 import { IUserDataSyncLogService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataProfileStorageService } from '../../userDataProfile/common/userDataProfileStorageService.js';

package/vscode/src/vs/platform/userDataSync/common/globalStateSync.js

@@ -1,13 +1,20 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { getErrorMessage } from 'vscode/vscode/vs/base/common/errors';
+import 'vscode/vscode/vs/base/common/event';
 import { parse } from 'vscode/vscode/vs/base/common/json';
 import { toFormattedString } from 'vscode/vscode/vs/base/common/jsonFormatter';
+import 'vscode/vscode/vs/base/common/platform';
+import 'vscode/vscode/vs/base/common/path';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import 'vscode/vscode/vs/platform/log/common/log';
+import 'vscode/vscode/vs/platform/storage/common/storage';
 import { getSyncResourceLogLabel } from 'vscode/vscode/vs/platform/userDataSync/common/abstractSynchronizer';
 import { edit } from 'vscode/vscode/vs/platform/userDataSync/common/content';
 import { IUserDataSyncLogService } from 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
+import 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 import { IUserDataProfileStorageService } from '../../userDataProfile/common/userDataProfileStorageService.js';
 
 const argvStoragePrefx = 'globalState.argv.';

package/vscode/src/vs/platform/userDataSync/common/userDataProfilesManifestSync.js

@@ -138,6 +138,11 @@ let UserDataProfilesManifestSynchroniser = class UserDataProfilesManifestSynchro
         }
         if (localChange !== 0 ) {
             await this.backupLocal(stringifyLocalProfiles(this.getLocalUserDataProfiles(), false));
+            await Promise.all(( local.removed.map(async (profile) => {
+                this.logService.trace(`${this.syncResourceLogLabel}: Removing '${profile.name}' profile...`);
+                await this.userDataProfilesService.removeProfile(profile);
+                this.logService.info(`${this.syncResourceLogLabel}: Removed profile '${profile.name}'.`);
+            })));
             const promises = [];
             for (const profile of local.added) {
                 promises.push((async () => {
@@ -146,13 +151,6 @@ let UserDataProfilesManifestSynchroniser = class UserDataProfilesManifestSynchro
                     this.logService.info(`${this.syncResourceLogLabel}: Created profile '${profile.name}'.`);
                 })());
             }
-            for (const profile of local.removed) {
-                promises.push((async () => {
-                    this.logService.trace(`${this.syncResourceLogLabel}: Removing '${profile.name}' profile...`);
-                    await this.userDataProfilesService.removeProfile(profile);
-                    this.logService.info(`${this.syncResourceLogLabel}: Removed profile '${profile.name}'.`);
-                })());
-            }
             for (const profile of local.updated) {
                 const localProfile = this.userDataProfilesService.profiles.find(p => p.id === profile.id);
                 if (localProfile) {

package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSync.js

@@ -1135,7 +1135,7 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
                     items.push({ id: syncNowCommand.id, label: `${SYNC_TITLE.value}: ${syncNowCommand.title.original}`, description: syncNowCommand.description(that.userDataSyncService) });
                     if (that.userDataSyncEnablementService.canToggleEnablement()) {
                         const account = that.userDataSyncWorkbenchService.current;
-                        items.push({ id: turnOffSyncCommand.id, label: `${SYNC_TITLE.value}: ${turnOffSyncCommand.title.original}`, description: account ? `${account.accountName} (${that.authenticationService.getLabel(account.authenticationProviderId)})` : undefined });
+                        items.push({ id: turnOffSyncCommand.id, label: `${SYNC_TITLE.value}: ${turnOffSyncCommand.title.original}`, description: account ? `${account.accountName} (${that.authenticationService.getProvider(account.authenticationProviderId).label})` : undefined });
                     }
                     quickPick.items = items;
                     disposables.add(quickPick.onDidAccept(() => {

package/vscode/src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.js

@@ -92,7 +92,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
                 collapsed: false,
                 order: 300,
             }], container);
-        registerAction2(class extends Action2 {
+        this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: `workbench.actions.sync.editMachineName`,
@@ -115,8 +115,8 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
                     await treeView.refresh();
                 }
             }
-        });
-        registerAction2(class extends Action2 {
+        }));
+        this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: `workbench.actions.sync.turnOffSyncOnMachine`,
@@ -136,7 +136,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
                     await treeView.refresh();
                 }
             }
-        });
+        }));
     }
     registerActivityView(container, remote) {
         const id = `workbench.views.sync.${remote ? 'remote' : 'local'}Activity`;
@@ -232,7 +232,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
         }));
     }
     registerDataViewActions(viewId) {
-        registerAction2(class extends Action2 {
+        this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: `workbench.actions.sync.${viewId}.resolveResource`,
@@ -252,8 +252,8 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
                 const editorService = accessor.get(IEditorService);
                 await editorService.openEditor({ resource: ( URI.parse(resource)), options: { pinned: true } });
             }
-        });
-        registerAction2(class extends Action2 {
+        }));
+        this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: `workbench.actions.sync.${viewId}.compareWithLocal`,
@@ -291,8 +291,8 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
                     ))
                 )), undefined);
             }
-        });
-        registerAction2(class extends Action2 {
+        }));
+        this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: `workbench.actions.sync.${viewId}.replaceCurrent`,
@@ -327,7 +327,7 @@ let UserDataSyncDataViews = class UserDataSyncDataViews extends Disposable {
                     return userDataSyncService.replace({ created: syncResourceHandle.created, uri: URI.revive(syncResourceHandle.uri) });
                 }
             }
-        });
+        }));
     }
     registerTroubleShootView(container) {
         const id = `workbench.views.sync.troubleshoot`;

package/vscode/src/vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/userDataProfileView.css.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -17,7 +18,6 @@ import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/
 import { isUserDataProfile, toUserDataProfile, IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile';
 import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { TreeView, TreeViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/treeView';
@@ -47,7 +47,7 @@ import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { escapeRegExpCharacters } from 'vscode/vscode/vs/base/common/strings';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { IURLService } from 'vscode/vscode/vs/platform/url/common/url';
 import { asText, IRequestService } from 'vscode/vscode/vs/platform/request/common/request';
@@ -308,7 +308,7 @@ let UserDataProfileImportExportService = class UserDataProfileImportExportServic
                     "Profile with name {0} already exists.",
                     quickPick.value
                 ));
-                quickPick.severity = Severity.Warning;
+                quickPick.severity = Severity$1.Warning;
                 return;
             }
             if (resources.every(resource => !resource.picked)) {
@@ -317,10 +317,10 @@ let UserDataProfileImportExportService = class UserDataProfileImportExportServic
                     'invalid configurations',
                     "The profile should contain at least one configuration."
                 ));
-                quickPick.severity = Severity.Warning;
+                quickPick.severity = Severity$1.Warning;
                 return;
             }
-            quickPick.severity = Severity.Ignore;
+            quickPick.severity = Severity$1.Ignore;
             quickPick.validationMessage = undefined;
         };
         disposables.add(quickPick.onDidChangeSelection(items => {
@@ -362,14 +362,14 @@ let UserDataProfileImportExportService = class UserDataProfileImportExportServic
                     'name required',
                     "Profile name is required and must be a non-empty value."
                 ));
-                quickPick.severity = Severity.Error;
+                quickPick.severity = Severity$1.Error;
             }
             if (quickPick.validationMessage) {
                 return;
             }
             result = { name, items: quickPick.selectedItems, icon: icon.id === DEFAULT_ICON.id ? null : icon.id };
             quickPick.hide();
-            quickPick.severity = Severity.Ignore;
+            quickPick.severity = Severity$1.Ignore;
             quickPick.validationMessage = undefined;
         }));
         const domNode = $('.profile-edit-widget');
@@ -767,7 +767,7 @@ let UserDataProfileImportExportService = class UserDataProfileImportExportServic
                         });
                     }
                     await this.dialogService.prompt({
-                        type: Severity.Info,
+                        type: Severity$1.Info,
                         message,
                         buttons,
                         cancelButton: ( localizeWithPath(
@@ -1083,7 +1083,7 @@ let UserDataProfileImportExportService = class UserDataProfileImportExportServic
                 ImportProfileChoice[ImportProfileChoice["Cancel"] = 2] = "Cancel";
             })(ImportProfileChoice || (ImportProfileChoice = {})));
             const { result } = await this.dialogService.prompt({
-                type: Severity.Info,
+                type: Severity$1.Info,
                 message: ( localizeWithPath(
                     'vs/workbench/services/userDataProfile/browser/userDataProfileImportExportService',
                     'profile already exists',

package/vscode/src/vs/workbench/services/userDataSync/browser/userDataSyncEnablementService.js

@@ -1,3 +1,4 @@
+import 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { UserDataSyncEnablementService as UserDataSyncEnablementService$1 } from '../../../../platform/userDataSync/common/userDataSyncEnablementService.js';
 
 class UserDataSyncEnablementService extends UserDataSyncEnablementService$1 {

package/vscode/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.js

@@ -634,7 +634,7 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
             )) });
             for (const authenticationProvider of authenticationProviders) {
                 const accounts = (allAccounts.get(authenticationProvider.id) || []).sort(({ sessionId }) => sessionId === this.currentSessionId ? -1 : 1);
-                const providerName = this.authenticationService.getLabel(authenticationProvider.id);
+                const providerName = this.authenticationService.getProvider(authenticationProvider.id).label;
                 for (const account of accounts) {
                     quickPickItems.push({
                         label: `${account.accountName} (${providerName})`,
@@ -655,8 +655,9 @@ let UserDataSyncWorkbenchService = class UserDataSyncWorkbenchService extends Di
             )) });
         }
         for (const authenticationProvider of authenticationProviders) {
-            if (!( allAccounts.has(authenticationProvider.id)) || this.authenticationService.supportsMultipleAccounts(authenticationProvider.id)) {
-                const providerName = this.authenticationService.getLabel(authenticationProvider.id);
+            const provider = this.authenticationService.getProvider(authenticationProvider.id);
+            if (!( allAccounts.has(authenticationProvider.id)) || provider.supportsMultipleAccounts) {
+                const providerName = provider.label;
                 quickPickItems.push({ label: ( localizeWithPath(
                     'vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService',
                     'sign in using account',

package/vscode/src/vs/workbench/services/userDataSync/browser/webUserDataSyncEnablementService.js

@@ -1,3 +1,4 @@
+import 'vscode/vscode/vs/platform/userDataSync/common/userDataSync';
 import { UserDataSyncEnablementService } from './userDataSyncEnablementService.js';
 
 class WebUserDataSyncEnablementService extends UserDataSyncEnablementService {