@theia/vsx-registry 1.28.0-next.9 → 1.29.0-next.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-contribution.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAEvE,OAAO,EAAE,+BAA+B,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACpH,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAO,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAuB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAiB,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE7G,OAAO,EAA4B,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAK7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,qBACa,yBAA0B,SAAQ,wBAAwB,CAAC,0BAA0B,CAC9F,YAAW,iBAAiB,EAAE,+BAA+B;IAEjC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACnD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACvD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,kBAAkB,CAAC;IACvD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;;IAgB5E,SAAS,CAAC,IAAI,IAAI,IAAI;IAOhB,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAuCjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAkBtD,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAsC3C;;OAEG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBhD;;;;OAIG;cACa,qBAAqB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;cAgC7D,IAAI,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI;IAIxD;;;;;;OAMG;cACa,aAAa,CAAC,SAAS,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAkB9E,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;cAmBrC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;cAKtC,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;cAKxC,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7D"}
1
+ {"version":3,"file":"vsx-extensions-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-contribution.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAEvE,OAAO,EAAE,+BAA+B,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACpH,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAO,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAuB,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAiB,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE7G,OAAO,EAA4B,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAK7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,qBACa,yBAA0B,SAAQ,wBAAwB,CAAC,0BAA0B,CAC9F,YAAW,iBAAiB,EAAE,+BAA+B;IAEjC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC;IAChD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACnD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACvD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,kBAAkB,CAAC;IACvD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;;IAgB5E,SAAS,CAAC,IAAI,IAAI,IAAI;IAOhB,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAuCjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAkBtD,cAAc,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAsC3C;;OAEG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBhD;;;;OAIG;cACa,qBAAqB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;cAmC7D,IAAI,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI;IAIxD;;;;;;OAMG;cACa,aAAa,CAAC,SAAS,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAkB9E,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;cAmBrC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;cAKtC,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;cAKxC,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC;CAI7D"}
@@ -184,23 +184,26 @@ let VSXExtensionsContribution = class VSXExtensionsContribution extends view_con
184
184
  const extensions = await client.getAllVersions(extensionId);
185
185
  const latestCompatible = await client.getLatestCompatibleExtensionVersion(extensionId);
186
186
  let compatibleExtensions = [];
187
+ let activeItem = undefined;
187
188
  if (latestCompatible) {
188
189
  compatibleExtensions = extensions.slice(extensions.findIndex(ext => ext.version === latestCompatible.version));
189
190
  }
190
- const items = [];
191
- compatibleExtensions.forEach(ext => {
191
+ const items = compatibleExtensions.map(ext => {
192
192
  var _a;
193
- let publishedDate = (_a = luxon_1.DateTime.fromISO(ext.timestamp).toRelative({ locale: common_1.nls.locale })) !== null && _a !== void 0 ? _a : '';
193
+ const item = {
194
+ label: ext.version,
195
+ description: (_a = luxon_1.DateTime.fromISO(ext.timestamp).toRelative({ locale: common_1.nls.locale })) !== null && _a !== void 0 ? _a : ''
196
+ };
194
197
  if (currentVersion === ext.version) {
195
- publishedDate += ` (${common_1.nls.localizeByDefault('Current')})`;
198
+ item.description += ` (${common_1.nls.localizeByDefault('Current')})`;
199
+ activeItem = item;
196
200
  }
197
- items.push({
198
- label: ext.version,
199
- description: publishedDate
200
- });
201
+ return item;
201
202
  });
202
203
  const selectedItem = await this.quickInput.showQuickPick(items, {
203
- placeholder: common_1.nls.localizeByDefault('Select Version to Install'), runIfSingle: false
204
+ placeholder: common_1.nls.localizeByDefault('Select Version to Install'),
205
+ runIfSingle: false,
206
+ activeItem
204
207
  });
205
208
  if (selectedItem) {
206
209
  const selectedExtension = this.model.getExtension(extensionId);
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-contribution.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-contribution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extensions-contribution.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-contribution.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,7 @@ export declare class VSXExtensionsSource extends TreeSource {
13
13
  protected readonly model: VSXExtensionsModel;
14
14
  protected init(): Promise<void>;
15
15
  protected scheduleFireDidChange: import("lodash").DebouncedFunc<() => void>;
16
+ getModel(): VSXExtensionsModel;
16
17
  getElements(): IterableIterator<TreeElement>;
17
18
  protected doGetElements(): IterableIterator<string>;
18
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-source.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-source.ts"],"names":[],"mappings":";AAiBA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,qBACa,0BAA0B;IACnC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,QAAQ,SAAa;IAC5B,MAAM,CAAC,aAAa,SAAkB;IACtC,MAAM,CAAC,WAAW,SAAiB;IACnC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACvB;AAED,qBACa,mBAAoB,SAAQ,UAAU;IAG/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC;cAG7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrC,SAAS,CAAC,qBAAqB,6CAAiF;IAE/G,WAAW,IAAI,gBAAgB,CAAC,WAAW,CAAC;IAqB7C,SAAS,CAAC,aAAa,IAAI,gBAAgB,CAAC,MAAM,CAAC;CAUtD"}
1
+ {"version":3,"file":"vsx-extensions-source.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-source.ts"],"names":[],"mappings":";AAiBA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,qBACa,0BAA0B;IACnC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,QAAQ,SAAa;IAC5B,MAAM,CAAC,aAAa,SAAkB;IACtC,MAAM,CAAC,WAAW,SAAiB;IACnC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACvB;AAED,qBACa,mBAAoB,SAAQ,UAAU;IAG/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC;cAG7B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAKrC,SAAS,CAAC,qBAAqB,6CAAiF;IAEhH,QAAQ,IAAI,kBAAkB;IAI7B,WAAW,IAAI,gBAAgB,CAAC,WAAW,CAAC;IAqB7C,SAAS,CAAC,aAAa,IAAI,gBAAgB,CAAC,MAAM,CAAC;CAUtD"}
@@ -48,6 +48,9 @@ let VSXExtensionsSource = class VSXExtensionsSource extends source_tree_1.TreeSo
48
48
  this.fireDidChange();
49
49
  this.toDispose.push(this.model.onDidChange(() => this.scheduleFireDidChange()));
50
50
  }
51
+ getModel() {
52
+ return this.model;
53
+ }
51
54
  *getElements() {
52
55
  for (const id of this.doGetElements()) {
53
56
  const extension = this.model.getExtension(id);
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-source.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAiF;AACjF,qEAA8E;AAC9E,iEAA4D;AAC5D,+DAAgE;AAGhE,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;CAMtC,CAAA;AALU,oCAAS,GAAG,WAAW,CAAC;AACxB,mCAAQ,GAAG,SAAS,CAAC;AACrB,wCAAa,GAAG,cAAc,CAAC;AAC/B,sCAAW,GAAG,aAAa,CAAC;AAJ1B,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAMtC;AANY,gEAA0B;AASvC,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,wBAAU;IAAnD;;QAcc,0BAAqB,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAiCpH,CAAC;IAtCa,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;IACpF,CAAC;IAID,CAAC,WAAW;QACR,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAC9C,IAAI,CAAC,SAAS,EAAE;gBACZ,SAAS;aACZ;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,0BAA0B,CAAC,WAAW,EAAE;gBAC5D,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;oBAC5B,SAAS;iBACZ;aACJ;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,0BAA0B,CAAC,QAAQ,EAAE;gBACzD,IAAI,SAAS,CAAC,OAAO,EAAE;oBACnB,MAAM,SAAS,CAAC;iBACnB;aACJ;iBAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBAC3B,MAAM,SAAS,CAAC;aACnB;SACJ;IACL,CAAC;IAES,aAAa;QACnB,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,0BAA0B,CAAC,aAAa,EAAE;YAC9D,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;SAClC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,0BAA0B,CAAC,WAAW,EAAE;YAC5D,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAChC,CAAC;CAEJ,CAAA;AA5CG;IADC,IAAA,kBAAM,EAAC,0BAA0B,CAAC;8BACP,0BAA0B;oDAAC;AAGvD;IADC,IAAA,kBAAM,EAAC,yCAAkB,CAAC;8BACD,yCAAkB;kDAAC;AAG7C;IADC,IAAA,yBAAa,GAAE;;;;+CAIf;AAZQ,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CA+C/B;AA/CY,kDAAmB"}
1
+ {"version":3,"file":"vsx-extensions-source.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-source.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAiF;AACjF,qEAA8E;AAC9E,iEAA4D;AAC5D,+DAAgE;AAGhE,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;CAMtC,CAAA;AALU,oCAAS,GAAG,WAAW,CAAC;AACxB,mCAAQ,GAAG,SAAS,CAAC;AACrB,wCAAa,GAAG,cAAc,CAAC;AAC/B,sCAAW,GAAG,aAAa,CAAC;AAJ1B,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAMtC;AANY,gEAA0B;AASvC,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,wBAAU;IAAnD;;QAcc,0BAAqB,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAqCpH,CAAC;IA1Ca,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;IACpF,CAAC;IAID,QAAQ;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,CAAC,WAAW;QACR,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;YACnC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAC9C,IAAI,CAAC,SAAS,EAAE;gBACZ,SAAS;aACZ;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,0BAA0B,CAAC,WAAW,EAAE;gBAC5D,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;oBAC5B,SAAS;iBACZ;aACJ;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,0BAA0B,CAAC,QAAQ,EAAE;gBACzD,IAAI,SAAS,CAAC,OAAO,EAAE;oBACnB,MAAM,SAAS,CAAC;iBACnB;aACJ;iBAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBAC3B,MAAM,SAAS,CAAC;aACnB;SACJ;IACL,CAAC;IAES,aAAa;QACnB,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,0BAA0B,CAAC,aAAa,EAAE;YAC9D,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;SAClC;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,0BAA0B,CAAC,WAAW,EAAE;YAC5D,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;SACjC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAChC,CAAC;CAEJ,CAAA;AAhDG;IADC,IAAA,kBAAM,EAAC,0BAA0B,CAAC;8BACP,0BAA0B;oDAAC;AAGvD;IADC,IAAA,kBAAM,EAAC,yCAAkB,CAAC;8BACD,yCAAkB;kDAAC;AAG7C;IADC,IAAA,yBAAa,GAAE;;;;+CAIf;AAZQ,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAmD/B;AAnDY,kDAAmB"}
@@ -1,9 +1,11 @@
1
+ /// <reference types="react" />
1
2
  import { interfaces } from '@theia/core/shared/inversify';
2
- import { TreeNode } from '@theia/core/lib/browser';
3
+ import { TreeModel, TreeNode } from '@theia/core/lib/browser';
3
4
  import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
4
5
  import { VSXExtensionsSource, VSXExtensionsSourceOptions } from './vsx-extensions-source';
5
6
  import { BadgeWidget } from '@theia/core/lib/browser/view-container';
6
7
  import { Emitter } from '@theia/core/lib/common';
8
+ import * as React from '@theia/core/shared/react';
7
9
  export declare class VSXExtensionsWidgetOptions extends VSXExtensionsSourceOptions {
8
10
  title?: string;
9
11
  }
@@ -22,5 +24,6 @@ export declare class VSXExtensionsWidget extends SourceTreeWidget implements Bad
22
24
  protected resolveCount(): Promise<number | undefined>;
23
25
  protected tapNode(node?: TreeNode): void;
24
26
  protected handleDblClickEvent(): void;
27
+ protected renderTree(model: TreeModel): React.ReactNode;
25
28
  }
26
29
  //# sourceMappingURL=vsx-extensions-widget.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-widget.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAc,UAAU,EAAyB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAE1F,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,qBACa,0BAA2B,SAAQ,0BAA0B;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,yBAAyB,aAAc,MAAM,KAAG,MAAiD,CAAC;AAE/G,qBACa,mBAAoB,SAAQ,gBAAiB,YAAW,WAAW;IAE5E,MAAM,CAAC,EAAE,SAAoB;IAE7B,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,0BAA0B,GAAG,mBAAmB;IAc3G,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;cAGtC,IAAI,IAAI,IAAI;IAkB/B,OAAO,CAAC,MAAM,CAAiC;IAC/C,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAGlC;IAEM,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAuB;IAE7D,SAAS,CAAC,YAAY,IAAI,MAAM;cAehB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAQxC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI;cAK9B,mBAAmB,IAAI,IAAI;CAGjD"}
1
+ {"version":3,"file":"vsx-extensions-widget.d.ts","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.tsx"],"names":[],"mappings":";AAgBA,OAAO,EAAc,UAAU,EAAyB,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAE1F,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAElD,qBACa,0BAA2B,SAAQ,0BAA0B;IACtE,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,yBAAyB,aAAc,MAAM,KAAG,MAAiD,CAAC;AAE/G,qBACa,mBAAoB,SAAQ,gBAAiB,YAAW,WAAW;IAE5E,MAAM,CAAC,EAAE,SAAoB;IAE7B,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,0BAA0B,GAAG,mBAAmB;IAc3G,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;IAGvD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;cAGtC,IAAI,IAAI,IAAI;IAkB/B,OAAO,CAAC,MAAM,CAAiC;IAC/C,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAGlC;IAEM,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAuB;IAE7D,SAAS,CAAC,YAAY,IAAI,MAAM;cAehB,YAAY,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAQxC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI;cAK9B,mBAAmB,IAAI,IAAI;cAI3B,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,KAAK,CAAC,SAAS;CAanE"}
@@ -31,6 +31,8 @@ const source_tree_1 = require("@theia/core/lib/browser/source-tree");
31
31
  const vsx_extensions_source_1 = require("./vsx-extensions-source");
32
32
  const nls_1 = require("@theia/core/lib/common/nls");
33
33
  const common_1 = require("@theia/core/lib/common");
34
+ const alert_message_1 = require("@theia/core/lib/browser/widgets/alert-message");
35
+ const React = require("@theia/core/shared/react");
34
36
  let VSXExtensionsWidgetOptions = class VSXExtensionsWidgetOptions extends vsx_extensions_source_1.VSXExtensionsSourceOptions {
35
37
  };
36
38
  VSXExtensionsWidgetOptions = __decorate([
@@ -107,6 +109,16 @@ let VSXExtensionsWidget = VSXExtensionsWidget_1 = class VSXExtensionsWidget exte
107
109
  handleDblClickEvent() {
108
110
  // Don't open the editor view on a double click.
109
111
  }
112
+ renderTree(model) {
113
+ if (this.options.id === vsx_extensions_source_1.VSXExtensionsSourceOptions.SEARCH_RESULT) {
114
+ const searchError = this.extensionsSource.getModel().searchError;
115
+ if (!!searchError) {
116
+ const message = nls_1.nls.localize('theia/vsx-registry/errorFetching', 'Error fetching extensions.');
117
+ return React.createElement(alert_message_1.AlertMessage, { type: 'ERROR', header: `${message} ${searchError}` });
118
+ }
119
+ }
120
+ return super.renderTree(model);
121
+ }
110
122
  };
111
123
  VSXExtensionsWidget.ID = 'vsx-extensions';
112
124
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extensions-widget.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extensions-widget.js","sourceRoot":"","sources":["../../src/browser/vsx-extensions-widget.tsx"],"names":[],"mappings":"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"}
@@ -2,12 +2,14 @@ import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverCo
2
2
  import { OVSXClientProvider } from '../common/ovsx-client-provider';
3
3
  import { VSXExtensionRaw } from '@theia/ovsx-client';
4
4
  import { RequestService } from '@theia/core/shared/@theia/request';
5
+ import { PluginVSCodeEnvironment } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-environment';
6
+ import { PluginUninstallationManager } from '@theia/plugin-ext/lib/main/node/plugin-uninstallation-manager';
5
7
  export declare class VSXExtensionResolver implements PluginDeployerResolver {
6
8
  protected clientProvider: OVSXClientProvider;
7
9
  protected pluginDeployerHandler: PluginDeployerHandler;
8
10
  protected requestService: RequestService;
9
- protected readonly downloadPath: string;
10
- constructor();
11
+ protected readonly environment: PluginVSCodeEnvironment;
12
+ protected readonly uninstallationManager: PluginUninstallationManager;
11
13
  accept(pluginId: string): boolean;
12
14
  resolve(context: PluginDeployerResolverContext, options?: PluginDeployOptions): Promise<void>;
13
15
  protected hasSameOrNewerVersion(id: string, extension: VSXExtensionRaw): string | undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAEjK,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,qBACa,oBAAqB,YAAW,sBAAsB;IAG/D,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAG7C,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGvD,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAEzC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;;IAQxC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI3B,OAAO,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0CnG,SAAS,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS;cAY3E,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAYxF"}
1
+ {"version":3,"file":"vsx-extension-resolver.d.ts","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,mBAAmB,EAAqB,MAAM,8CAA8C,CAAC;AAEpL,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,2BAA2B,EAAE,MAAM,+DAA+D,CAAC;AAE5G,qBACa,oBAAqB,YAAW,sBAAsB;IAEnC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAC1C,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAC9D,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,uBAAuB,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;IAE3G,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI3B,OAAO,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0CnG,SAAS,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS;cAa3E,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAYxF"}
@@ -25,23 +25,18 @@ var __metadata = (this && this.__metadata) || function (k, v) {
25
25
  };
26
26
  Object.defineProperty(exports, "__esModule", { value: true });
27
27
  exports.VSXExtensionResolver = void 0;
28
- const os = require("os");
29
28
  const path = require("path");
30
29
  const semver = require("semver");
31
30
  const fs = require("@theia/core/shared/fs-extra");
32
- const uuid_1 = require("uuid");
33
31
  const inversify_1 = require("@theia/core/shared/inversify");
34
32
  const uri_1 = require("@theia/core/lib/common/uri");
35
33
  const plugin_protocol_1 = require("@theia/plugin-ext/lib/common/plugin-protocol");
36
34
  const plugin_vscode_uri_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri");
37
35
  const ovsx_client_provider_1 = require("../common/ovsx-client-provider");
38
36
  const request_1 = require("@theia/core/shared/@theia/request");
37
+ const plugin_vscode_environment_1 = require("@theia/plugin-ext-vscode/lib/common/plugin-vscode-environment");
38
+ const plugin_uninstallation_manager_1 = require("@theia/plugin-ext/lib/main/node/plugin-uninstallation-manager");
39
39
  let VSXExtensionResolver = class VSXExtensionResolver {
40
- constructor() {
41
- this.downloadPath = path.resolve(os.tmpdir(), (0, uuid_1.v4)());
42
- fs.ensureDirSync(this.downloadPath);
43
- fs.emptyDirSync(this.downloadPath);
44
- }
45
40
  accept(pluginId) {
46
41
  return !!plugin_vscode_uri_1.VSCodeExtensionUri.toId(new uri_1.default(pluginId));
47
42
  }
@@ -76,8 +71,9 @@ let VSXExtensionResolver = class VSXExtensionResolver {
76
71
  return;
77
72
  }
78
73
  }
79
- const extensionPath = path.resolve(this.downloadPath, path.basename(downloadUrl));
80
- console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`, 'to path', this.downloadPath);
74
+ const downloadPath = (await this.environment.getExtensionsDirUri()).path.fsPath();
75
+ const extensionPath = path.resolve(downloadPath, path.basename(downloadUrl));
76
+ console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`, 'to path', downloadPath);
81
77
  if (!await this.download(downloadUrl, extensionPath)) {
82
78
  console.log(`[${resolvedId}]: not found`);
83
79
  return;
@@ -86,7 +82,8 @@ let VSXExtensionResolver = class VSXExtensionResolver {
86
82
  context.addPlugin(resolvedId, extensionPath);
87
83
  }
88
84
  hasSameOrNewerVersion(id, extension) {
89
- const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id);
85
+ const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id)
86
+ .filter(plugin => !this.uninstallationManager.isUninstalled(plugin_protocol_1.PluginIdentifiers.componentsToVersionedId(plugin.metadata.model)));
90
87
  const sufficientVersion = existingPlugins.find(existingPlugin => {
91
88
  const existingVersion = semver.clean(existingPlugin.metadata.model.version);
92
89
  const desiredVersion = semver.clean(extension.version);
@@ -125,9 +122,16 @@ __decorate([
125
122
  (0, inversify_1.inject)(request_1.RequestService),
126
123
  __metadata("design:type", Object)
127
124
  ], VSXExtensionResolver.prototype, "requestService", void 0);
125
+ __decorate([
126
+ (0, inversify_1.inject)(plugin_vscode_environment_1.PluginVSCodeEnvironment),
127
+ __metadata("design:type", plugin_vscode_environment_1.PluginVSCodeEnvironment)
128
+ ], VSXExtensionResolver.prototype, "environment", void 0);
129
+ __decorate([
130
+ (0, inversify_1.inject)(plugin_uninstallation_manager_1.PluginUninstallationManager),
131
+ __metadata("design:type", plugin_uninstallation_manager_1.PluginUninstallationManager)
132
+ ], VSXExtensionResolver.prototype, "uninstallationManager", void 0);
128
133
  VSXExtensionResolver = __decorate([
129
- (0, inversify_1.injectable)(),
130
- __metadata("design:paramtypes", [])
134
+ (0, inversify_1.injectable)()
131
135
  ], VSXExtensionResolver);
132
136
  exports.VSXExtensionResolver = VSXExtensionResolver;
133
137
  //# sourceMappingURL=vsx-extension-resolver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"vsx-extension-resolver.js","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vsx-extension-resolver.js","sourceRoot":"","sources":["../../src/node/vsx-extension-resolver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "name": "@theia/vsx-registry",
3
- "version": "1.28.0-next.9+c0ee4dcf6bb",
3
+ "version": "1.29.0-next.2+d9715208c9f",
4
4
  "description": "Theia - VSX Registry",
5
5
  "dependencies": {
6
- "@theia/core": "1.28.0-next.9+c0ee4dcf6bb",
7
- "@theia/filesystem": "1.28.0-next.9+c0ee4dcf6bb",
8
- "@theia/ovsx-client": "1.28.0-next.9+c0ee4dcf6bb",
9
- "@theia/plugin-ext": "1.28.0-next.9+c0ee4dcf6bb",
10
- "@theia/plugin-ext-vscode": "1.28.0-next.9+c0ee4dcf6bb",
11
- "@theia/preferences": "1.28.0-next.9+c0ee4dcf6bb",
12
- "@theia/workspace": "1.28.0-next.9+c0ee4dcf6bb",
6
+ "@theia/core": "1.29.0-next.2+d9715208c9f",
7
+ "@theia/filesystem": "1.29.0-next.2+d9715208c9f",
8
+ "@theia/ovsx-client": "1.29.0-next.2+d9715208c9f",
9
+ "@theia/plugin-ext": "1.29.0-next.2+d9715208c9f",
10
+ "@theia/plugin-ext-vscode": "1.29.0-next.2+d9715208c9f",
11
+ "@theia/preferences": "1.29.0-next.2+d9715208c9f",
12
+ "@theia/workspace": "1.29.0-next.2+d9715208c9f",
13
13
  "luxon": "^2.4.0",
14
14
  "p-debounce": "^2.1.0",
15
15
  "semver": "^5.4.1",
@@ -49,11 +49,11 @@
49
49
  "watch": "theiaext watch"
50
50
  },
51
51
  "devDependencies": {
52
- "@theia/ext-scripts": "1.27.0",
52
+ "@theia/ext-scripts": "1.28.0",
53
53
  "@types/luxon": "^2.3.2"
54
54
  },
55
55
  "nyc": {
56
56
  "extends": "../../configs/nyc.json"
57
57
  },
58
- "gitHead": "c0ee4dcf6bb10be905cc5a58d04b10faa3800d67"
58
+ "gitHead": "d9715208c9fba269d79ff37e5d677864d40cd4cd"
59
59
  }
@@ -210,22 +210,25 @@ export class VSXExtensionsContribution extends AbstractViewContribution<VSXExten
210
210
  const extensions = await client.getAllVersions(extensionId);
211
211
  const latestCompatible = await client.getLatestCompatibleExtensionVersion(extensionId);
212
212
  let compatibleExtensions: VSXExtensionRaw[] = [];
213
+ let activeItem = undefined;
213
214
  if (latestCompatible) {
214
215
  compatibleExtensions = extensions.slice(extensions.findIndex(ext => ext.version === latestCompatible.version));
215
216
  }
216
- const items: QuickPickItem[] = [];
217
- compatibleExtensions.forEach(ext => {
218
- let publishedDate = DateTime.fromISO(ext.timestamp).toRelative({ locale: nls.locale }) ?? '';
217
+ const items: QuickPickItem[] = compatibleExtensions.map(ext => {
218
+ const item = {
219
+ label: ext.version,
220
+ description: DateTime.fromISO(ext.timestamp).toRelative({ locale: nls.locale }) ?? ''
221
+ };
219
222
  if (currentVersion === ext.version) {
220
- publishedDate += ` (${nls.localizeByDefault('Current')})`;
223
+ item.description += ` (${nls.localizeByDefault('Current')})`;
224
+ activeItem = item;
221
225
  }
222
- items.push({
223
- label: ext.version,
224
- description: publishedDate
225
- });
226
+ return item;
226
227
  });
227
228
  const selectedItem = await this.quickInput.showQuickPick(items, {
228
- placeholder: nls.localizeByDefault('Select Version to Install'), runIfSingle: false
229
+ placeholder: nls.localizeByDefault('Select Version to Install'),
230
+ runIfSingle: false,
231
+ activeItem
229
232
  });
230
233
  if (selectedItem) {
231
234
  const selectedExtension = this.model.getExtension(extensionId);
@@ -45,6 +45,10 @@ export class VSXExtensionsSource extends TreeSource {
45
45
 
46
46
  protected scheduleFireDidChange = debounce(() => this.fireDidChange(), 100, { leading: false, trailing: true });
47
47
 
48
+ getModel(): VSXExtensionsModel {
49
+ return this.model;
50
+ }
51
+
48
52
  *getElements(): IterableIterator<TreeElement> {
49
53
  for (const id of this.doGetElements()) {
50
54
  const extension = this.model.getExtension(id);
@@ -15,12 +15,14 @@
15
15
  // *****************************************************************************
16
16
 
17
17
  import { injectable, interfaces, postConstruct, inject } from '@theia/core/shared/inversify';
18
- import { TreeNode } from '@theia/core/lib/browser';
18
+ import { TreeModel, TreeNode } from '@theia/core/lib/browser';
19
19
  import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
20
20
  import { VSXExtensionsSource, VSXExtensionsSourceOptions } from './vsx-extensions-source';
21
21
  import { nls } from '@theia/core/lib/common/nls';
22
22
  import { BadgeWidget } from '@theia/core/lib/browser/view-container';
23
23
  import { Emitter } from '@theia/core/lib/common';
24
+ import { AlertMessage } from '@theia/core/lib/browser/widgets/alert-message';
25
+ import * as React from '@theia/core/shared/react';
24
26
 
25
27
  @injectable()
26
28
  export class VSXExtensionsWidgetOptions extends VSXExtensionsSourceOptions {
@@ -115,4 +117,18 @@ export class VSXExtensionsWidget extends SourceTreeWidget implements BadgeWidget
115
117
  protected override handleDblClickEvent(): void {
116
118
  // Don't open the editor view on a double click.
117
119
  }
120
+
121
+ protected override renderTree(model: TreeModel): React.ReactNode {
122
+ if (this.options.id === VSXExtensionsSourceOptions.SEARCH_RESULT) {
123
+ const searchError = this.extensionsSource.getModel().searchError;
124
+ if (!!searchError) {
125
+ const message = nls.localize('theia/vsx-registry/errorFetching', 'Error fetching extensions.');
126
+ return <AlertMessage
127
+ type='ERROR'
128
+ header={`${message} ${searchError}`}
129
+ />;
130
+ }
131
+ }
132
+ return super.renderTree(model);
133
+ }
118
134
  }
@@ -14,38 +14,27 @@
14
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  // *****************************************************************************
16
16
 
17
- import * as os from 'os';
18
17
  import * as path from 'path';
19
18
  import * as semver from 'semver';
20
19
  import * as fs from '@theia/core/shared/fs-extra';
21
- import { v4 as uuidv4 } from 'uuid';
22
20
  import { injectable, inject } from '@theia/core/shared/inversify';
23
21
  import URI from '@theia/core/lib/common/uri';
24
- import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverContext, PluginDeployOptions } from '@theia/plugin-ext/lib/common/plugin-protocol';
22
+ import { PluginDeployerHandler, PluginDeployerResolver, PluginDeployerResolverContext, PluginDeployOptions, PluginIdentifiers } from '@theia/plugin-ext/lib/common/plugin-protocol';
25
23
  import { VSCodeExtensionUri } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-uri';
26
24
  import { OVSXClientProvider } from '../common/ovsx-client-provider';
27
25
  import { VSXExtensionRaw } from '@theia/ovsx-client';
28
26
  import { RequestService } from '@theia/core/shared/@theia/request';
27
+ import { PluginVSCodeEnvironment } from '@theia/plugin-ext-vscode/lib/common/plugin-vscode-environment';
28
+ import { PluginUninstallationManager } from '@theia/plugin-ext/lib/main/node/plugin-uninstallation-manager';
29
29
 
30
30
  @injectable()
31
31
  export class VSXExtensionResolver implements PluginDeployerResolver {
32
32
 
33
- @inject(OVSXClientProvider)
34
- protected clientProvider: OVSXClientProvider;
35
-
36
- @inject(PluginDeployerHandler)
37
- protected pluginDeployerHandler: PluginDeployerHandler;
38
-
39
- @inject(RequestService)
40
- protected requestService: RequestService;
41
-
42
- protected readonly downloadPath: string;
43
-
44
- constructor() {
45
- this.downloadPath = path.resolve(os.tmpdir(), uuidv4());
46
- fs.ensureDirSync(this.downloadPath);
47
- fs.emptyDirSync(this.downloadPath);
48
- }
33
+ @inject(OVSXClientProvider) protected clientProvider: OVSXClientProvider;
34
+ @inject(PluginDeployerHandler) protected pluginDeployerHandler: PluginDeployerHandler;
35
+ @inject(RequestService) protected requestService: RequestService;
36
+ @inject(PluginVSCodeEnvironment) protected readonly environment: PluginVSCodeEnvironment;
37
+ @inject(PluginUninstallationManager) protected readonly uninstallationManager: PluginUninstallationManager;
49
38
 
50
39
  accept(pluginId: string): boolean {
51
40
  return !!VSCodeExtensionUri.toId(new URI(pluginId));
@@ -82,9 +71,9 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
82
71
  return;
83
72
  }
84
73
  }
85
-
86
- const extensionPath = path.resolve(this.downloadPath, path.basename(downloadUrl));
87
- console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`, 'to path', this.downloadPath);
74
+ const downloadPath = (await this.environment.getExtensionsDirUri()).path.fsPath();
75
+ const extensionPath = path.resolve(downloadPath, path.basename(downloadUrl));
76
+ console.log(`[${resolvedId}]: trying to download from "${downloadUrl}"...`, 'to path', downloadPath);
88
77
  if (!await this.download(downloadUrl, extensionPath)) {
89
78
  console.log(`[${resolvedId}]: not found`);
90
79
  return;
@@ -94,7 +83,8 @@ export class VSXExtensionResolver implements PluginDeployerResolver {
94
83
  }
95
84
 
96
85
  protected hasSameOrNewerVersion(id: string, extension: VSXExtensionRaw): string | undefined {
97
- const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id);
86
+ const existingPlugins = this.pluginDeployerHandler.getDeployedPluginsById(id)
87
+ .filter(plugin => !this.uninstallationManager.isUninstalled(PluginIdentifiers.componentsToVersionedId(plugin.metadata.model)));
98
88
  const sufficientVersion = existingPlugins.find(existingPlugin => {
99
89
  const existingVersion = semver.clean(existingPlugin.metadata.model.version);
100
90
  const desiredVersion = semver.clean(extension.version);