reveal node with URI

Author: Alberto Iannaccone

arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts

@@ -102,8 +102,8 @@ export class SketchbookWidgetContribution
   override registerCommands(registry: CommandRegistry): void {
     super.registerCommands(registry);
     registry.registerCommand(SketchbookCommands.REVEAL_SKETCH_NODE, {
-      execute: (treeWidgetId: string, nodeId: string) =>
-        this.revealSketchNode(treeWidgetId, nodeId),
+      execute: (treeWidgetId: string, nodeUri: string) =>
+        this.revealSketchNode(treeWidgetId, nodeUri),
     });
     registry.registerCommand(SketchbookCommands.OPEN_NEW_WINDOW, {
       execute: (arg) => this.openNewWindow(arg.node),
@@ -217,13 +217,13 @@ export class SketchbookWidgetContribution
         console.warn(`Could not retrieve active sketchbook tree ID.`);
         return;
       }
-      const nodeId = node.id;
+      const nodeUri = node.uri.toString();
       const options: WorkspaceInput = {};
       Object.assign(options, {
         tasks: [
           {
             command: SketchbookCommands.REVEAL_SKETCH_NODE.id,
-            args: [treeWidgetId, nodeId],
+            args: [treeWidgetId, nodeUri],
           },
         ],
       });
@@ -257,13 +257,13 @@ export class SketchbookWidgetContribution
 
   private async revealSketchNode(
     treeWidgetId: string,
-    nodeId: string
+    nodeUIri: string
   ): Promise<void> {
     return this.widget
       .then((widget) => this.shell.activateWidget(widget.id))
       .then((widget) => {
         if (widget instanceof SketchbookWidget) {
-          return widget.revealSketchNode(treeWidgetId, nodeId);
+          return widget.revealSketchNode(treeWidgetId, nodeUIri);
         }
       });
   }

arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget.tsx

@@ -11,8 +11,9 @@ import { Disposable } from '@theia/core/lib/common/disposable';
 import { BaseWidget } from '@theia/core/lib/browser/widgets/widget';
 import { SketchbookTreeWidget } from './sketchbook-tree-widget';
 import { nls } from '@theia/core/lib/common';
-import { SelectableTreeNode, TreeWidget } from '@theia/core/lib/browser';
+import { SelectableTreeNode } from '@theia/core/lib/browser';
 import { CloudSketchbookCompositeWidget } from '../cloud-sketchbook/cloud-sketchbook-composite-widget';
+import { URI } from '../../contributions/contribution';
 
 @injectable()
 export class SketchbookWidget extends BaseWidget {
@@ -65,7 +66,7 @@ export class SketchbookWidget extends BaseWidget {
     return selectedTreeWidgets.shift();
   }
 
-  async revealSketchNode(treeWidgetId: string, nodeId: string): Promise<void> {
+  async revealSketchNode(treeWidgetId: string, nodeUri: string): Promise<void> {
     const widget = toArray(this.sketchbookTreesContainer.widgets())
       .filter(({ id }) => id === treeWidgetId)
       .shift();
@@ -76,8 +77,8 @@ export class SketchbookWidget extends BaseWidget {
     // TODO: remove this when the remote/local sketchbooks and their widgets are cleaned up.
     const findTreeWidget = (
       widget: Widget | undefined
-    ): TreeWidget | undefined => {
-      if (widget instanceof TreeWidget) {
+    ): SketchbookTreeWidget | undefined => {
+      if (widget instanceof SketchbookTreeWidget) {
         return widget;
       }
       if (widget instanceof CloudSketchbookCompositeWidget) {
@@ -95,15 +96,17 @@ export class SketchbookWidget extends BaseWidget {
       return;
     }
     this.sketchbookTreesContainer.activateWidget(widget);
-    const treeNode = treeWidget.model.getNode(nodeId);
+
+    const treeNode = await treeWidget.model.revealFile(new URI(nodeUri));
     if (!treeNode) {
-      console.warn(`Could not find tree node with ID: ${nodeId}`);
+      console.warn(`Could not find tree node with URI: ${nodeUri}`);
       return;
     }
     if (!SelectableTreeNode.is(treeNode)) {
       console.warn(`Tree node ${treeNode.id} is not selectable.`);
       return;
     }
+
     treeWidget.model.selectNode(treeNode);
   }