@eclipse-docks/core 0.7.95 → 0.7.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-docks/core",
-  "version": "0.7.95",
+  "version": "0.7.96",
   "description": "Eclipse Docks platform core: registries, services, parts, widgets, and API",
   "type": "module",
   "license": "EPL-2.0",

package/src/contributions/default-ui-contributions.ts

@@ -3,6 +3,7 @@ import { contributionRegistry, type HTMLContribution } from "../core/contributio
 import {
     PANEL_BOTTOM,
     SIDEBAR_MAIN,
+    SIDEBAR_MAIN_TOOLBAR,
     TOOLBAR_BOTTOM_END,
     TOOLBAR_MAIN_RIGHT
 } from "../core/constants";
@@ -55,3 +56,8 @@ contributionRegistry.registerContribution(TOOLBAR_MAIN_RIGHT, {
     component: () => html`<docks-layout-switcher></docks-layout-switcher>`
 } as HTMLContribution);
 
+contributionRegistry.registerContribution(SIDEBAR_MAIN_TOOLBAR, {
+    command: "open_extensions",
+    icon: "docks extensions",
+    label: "Extensions",
+});

package/src/core/extensionregistry.ts

@@ -258,7 +258,18 @@ class ExtensionRegistry {
     /** Like enable() but returns a Promise that resolves when the extension is loaded. Use when the caller must wait for commands/contributions to be registered (e.g. before rendering the app). */
     public async enableAsync(extensionId: string, informUser: boolean = false): Promise<void> {
         if (this.isEnabled(extensionId)) {
-            return
+            if (!this.isLoaded(extensionId)) {
+                logger.debug(
+                    `Extension ${extensionId} is enabled in settings but not loaded; loading now`,
+                );
+                try {
+                    await this.load(extensionId);
+                } catch (e) {
+                    logger.error(`Could not load extension: ${extensionId}: ${e}`);
+                    throw e;
+                }
+            }
+            return;
         }
         logger.debug(`Loading extension: ${extensionId}`)
         try {

package/src/parts/toolbar.ts

@@ -135,7 +135,7 @@ export class DocksToolbar extends DocksElement {
 
     protected doBeforeUI() {
         this.refreshContributions();
-        
+
         subscribe(TOPIC_CONTRIBUTEIONS_CHANGED, (event: ContributionChangeEvent) => {
             const id = this.getAttribute("id");
             if (!id) return;