Change "disabled" rendering and fix initial sort order

Signed-off-by: Thomas Mäder <[email protected]>

Author: tsmaeder

packages/vsx-registry/src/browser/vsx-extension.tsx

@@ -557,15 +557,17 @@ export class VSXExtensionComponent<Props extends VSXExtensionComponent.Props = V
             <div className='theia-vsx-extension-content'>
                 <div className='title'>
                     <div className='noWrapInfo'>
-                        <span className='name'>{displayName}</span> <span className='version'>{VSXExtension.formatVersion(version)}</span>
+                        <span className='name'>{displayName}</span>&nbsp;
+                        <span className='version'>{VSXExtension.formatVersion(version)}&nbsp;
+                        </span>{disabled && <span className='disabled'>({nls.localizeByDefault('disabled')})</span>}
                     </div>
                     <div className='stat'>
                         {!!downloadCount && <span className='download-count'><i className={codicon('cloud-download')} />{downloadCompactFormatter.format(downloadCount)}</span>}
                         {!!averageRating && <span className='average-rating'><i className={codicon('star-full')} />{averageRatingFormatter(averageRating)}</span>}
                     </div>
                 </div>
                 <div className='noWrapInfo theia-vsx-extension-description'>{description}</div>
-                {disabled && <div className='disabled'>{nls.localizeByDefault('disabled')}</div>}
+
                 <div className='theia-vsx-extension-action-bar'>
                     <div className='theia-vsx-extension-publisher-container'>
                         {verified === true ? (

packages/vsx-registry/src/browser/vsx-extensions-model.ts

@@ -400,6 +400,7 @@ export class VSXExtensionsModel {
                 if (!extension) { continue; }
                 refreshing.push(this.refresh(id, extension.version));
             }
+            await Promise.all(refreshing);
             const installed = new Set([...prevInstalled, ...currInstalled]);
             const installedSorted = Array.from(installed).sort((a, b) => this.compareExtensions(a, b));
             this._installed = new Set(installedSorted.values());
@@ -426,7 +427,6 @@ export class VSXExtensionsModel {
                     this.builtins.delete(PluginIdentifiers.componentsToUnversionedId(plugin.metadata.model));
                 }
             }
-            await Promise.all(refreshing);
         });
     }