From f22bc26355a898b2e11eca469ea8068fd5574e04 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Thu, 14 Nov 2024 01:47:33 -0800 Subject: [PATCH] getting there... --- .../react/src/sidebar-tsx/SidebarThreadSelector.tsx | 2 +- .../contrib/void/browser/registerMetrics.ts | 6 +++--- .../contrib/void/browser/registerSidebar.ts | 12 +++++------- .../contrib/void/browser/void.contribution.ts | 10 +++++----- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx index e66d2798..03039534 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx @@ -1,4 +1,4 @@ -import React from "react"; +// import React from "react"; import { useSidebarState, useThreadsState } from '../util/contextForServices.js'; diff --git a/src/vs/workbench/contrib/void/browser/registerMetrics.ts b/src/vs/workbench/contrib/void/browser/registerMetrics.ts index f50a8e30..228d19bd 100644 --- a/src/vs/workbench/contrib/void/browser/registerMetrics.ts +++ b/src/vs/workbench/contrib/void/browser/registerMetrics.ts @@ -1,7 +1,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js'; -import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions'; -import { createDecorator } from '../../../../platform/instantiation/common/instantiation'; -import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry'; +import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js'; +import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js'; +import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; import { posthog } from './react/out/util/posthog.js' diff --git a/src/vs/workbench/contrib/void/browser/registerSidebar.ts b/src/vs/workbench/contrib/void/browser/registerSidebar.ts index b7ed6fe2..993621c2 100644 --- a/src/vs/workbench/contrib/void/browser/registerSidebar.ts +++ b/src/vs/workbench/contrib/void/browser/registerSidebar.ts @@ -45,8 +45,6 @@ import { IVoidConfigStateService } from './registerConfig.js'; import { IFileService } from '../../../../platform/files/common/files.js'; // import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js'; -// const mountFn = (...params: any) => { } - // compare against search.contribution.ts and https://app.greptile.com/chat/w1nsmt3lauwzculipycpn?repo=github%3Amain%3Amicrosoft%2Fvscode // and debug.contribution.ts, scm.contribution.ts (source control) @@ -93,18 +91,18 @@ class VoidSidebarViewPane extends ViewPane { protected override renderBody(parent: HTMLElement): void { super.renderBody(parent); - //
- const { root } = dom.h('div@root') dom.append(parent, root); // gets set immediately this.instantiationService.invokeFunction(accessor => { - mountFn(root, { + const services: ReactServicesType = { configStateService: accessor.get(IVoidConfigStateService), sidebarStateService: accessor.get(IVoidSidebarStateService), - threadHistoryService: accessor.get(IThreadHistoryService), - }); + threadsStateService: accessor.get(IThreadHistoryService), + fileService: accessor.get(IFileService), + } + mountFn(root, services); }); } diff --git a/src/vs/workbench/contrib/void/browser/void.contribution.ts b/src/vs/workbench/contrib/void/browser/void.contribution.ts index cbc2c859..cc7fe363 100644 --- a/src/vs/workbench/contrib/void/browser/void.contribution.ts +++ b/src/vs/workbench/contrib/void/browser/void.contribution.ts @@ -1,14 +1,14 @@ -// // register Settings +// register Settings import './registerConfig.js' -// // register Sidebar chat +// register Sidebar chat import './registerSidebar.js' -// // register Posthog metrics +// register Posthog metrics import './registerMetrics.js' -// // register Thread History +// register Thread History import './registerThreads.js' -// // register inline diffs +// register inline diffs import './registerInlineDiffs.js'