Elgato_dark/void
1
0
Fork 0
mirror of https://github.com/voideditor/void synced 2026-05-24 09:58:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(orcide): resolve stale void references and type error from PR #18 merge

Browse source 
Update imports and identifiers that PR #18 introduced using old void
naming, which conflict with the orcide rename from PR #19:
- app.ts: voidUpdateService → orcideUpdateService, voidUpdateMainService
  → orcideUpdateMainService, voidSCMMainService → orcideSCMMainService,
  voidSCMTypes → orcideSCMTypes, class names VoidMainUpdateService →
  OrcideMainUpdateService, VoidSCMService → OrcideSCMService
- editorGroupWatermark.ts: VOID_CTRL_K/L_ACTION_ID → ORCIDE_CTRL_K/L_ACTION_ID
- fileActions.contribution.ts: void/browser/voidSettingsPane →
  orcide/browser/orcideSettingsPane, VOID_OPEN_SETTINGS_ACTION_ID →
  ORCIDE_OPEN_SETTINGS_ACTION_ID
- orcideSelectionHelperWidget.ts: fix IDisposable|null type error by
  using local variable instead of nullable field

https://claude.ai/code/session_01UgRm1eNr4jVDQ4tVK2LXoR
This commit is contained in:
Claude 2026-02-21 16:58:19 +00:00
parent ea0f0b7fef
commit 467bb5b2a7
No known key found for this signature in database
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vs/code/electron-main/app.ts
View file

@ -126,12 +126,12 @@ import ErrorTelemetry from '../../platform/telemetry/electron-main/errorTelemetr
// in theory this is not allowed
// ignore the eslint errors below
import { IMetricsService } from '../../workbench/contrib/orcide/common/metricsService.js';
import { IOrcideUpdateService } from '../../workbench/contrib/orcide/common/voidUpdateService.js';
import { IOrcideUpdateService } from '../../workbench/contrib/orcide/common/orcideUpdateService.js';
import { MetricsMainService } from '../../workbench/contrib/orcide/electron-main/metricsMainService.js';
import { VoidMainUpdateService } from '../../workbench/contrib/orcide/electron-main/voidUpdateMainService.js';
import { OrcideMainUpdateService } from '../../workbench/contrib/orcide/electron-main/orcideUpdateMainService.js';
import { LLMMessageChannel } from '../../workbench/contrib/orcide/electron-main/sendLLMMessageChannel.js';
import { VoidSCMService } from '../../workbench/contrib/orcide/electron-main/voidSCMMainService.js';
import { IOrcideSCMService } from '../../workbench/contrib/orcide/common/voidSCMTypes.js';
import { OrcideSCMService } from '../../workbench/contrib/orcide/electron-main/orcideSCMMainService.js';
import { IOrcideSCMService } from '../../workbench/contrib/orcide/common/orcideSCMTypes.js';
import { MCPChannel } from '../../workbench/contrib/orcide/electron-main/mcpChannel.js';
/**
* The main VS Code application. There will only ever be one instance,
@ -1103,8 +1103,8 @@ export class CodeApplication extends Disposable {
// Void main process services (required for services with a channel for comm between browser and electron-main (node))
services.set(IMetricsService, new SyncDescriptor(MetricsMainService, undefined, false));
services.set(IOrcideUpdateService, new SyncDescriptor(VoidMainUpdateService, undefined, false));
services.set(IOrcideSCMService, new SyncDescriptor(VoidSCMService, undefined, false));
services.set(IOrcideUpdateService, new SyncDescriptor(OrcideMainUpdateService, undefined, false));
services.set(IOrcideSCMService, new SyncDescriptor(OrcideSCMService, undefined, false));
// Default Extensions Profile Init
services.set(IExtensionsProfileScannerService, new SyncDescriptor(ExtensionsProfileScannerService, undefined, true));

6
src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts
View file

@ -25,7 +25,7 @@ import { splitRecentLabel } from '../../../../base/common/labels.js';
import { IViewsService } from '../../../services/views/common/viewsService.js';
/* eslint-disable */ // Void
import { VOID_CTRL_K_ACTION_ID, VOID_CTRL_L_ACTION_ID } from '../../../contrib/orcide/browser/actionIDs.js';
import { ORCIDE_CTRL_K_ACTION_ID, ORCIDE_CTRL_L_ACTION_ID } from '../../../contrib/orcide/browser/actionIDs.js';
import { VIEWLET_ID as REMOTE_EXPLORER_VIEWLET_ID } from '../../../contrib/remote/browser/remoteExplorer.js';
/* eslint-enable */
@ -284,7 +284,7 @@ export class EditorGroupWatermark extends Disposable {
else {
// show them Void keybindings
const keys = this.keybindingService.lookupKeybinding(VOID_CTRL_L_ACTION_ID);
const keys = this.keybindingService.lookupKeybinding(ORCIDE_CTRL_L_ACTION_ID);
const dl = append(voidIconBox, $('dl'));
const dt = append(dl, $('dt'));
dt.textContent = 'Chat'
@ -295,7 +295,7 @@ export class EditorGroupWatermark extends Disposable {
this.currentDisposables.add(label);
const keys2 = this.keybindingService.lookupKeybinding(VOID_CTRL_K_ACTION_ID);
const keys2 = this.keybindingService.lookupKeybinding(ORCIDE_CTRL_K_ACTION_ID);
const dl2 = append(voidIconBox, $('dl'));
const dt2 = append(dl2, $('dt'));
dt2.textContent = 'Quick Edit'

4
src/vs/workbench/contrib/files/browser/fileActions.contribution.ts
View file

@ -27,7 +27,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
import { IExplorerService } from './files.js';
import { Codicon } from '../../../../base/common/codicons.js';
import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
import { VOID_OPEN_SETTINGS_ACTION_ID } from '../../void/browser/voidSettingsPane.js';
import { ORCIDE_OPEN_SETTINGS_ACTION_ID } from '../../orcide/browser/orcideSettingsPane.js';
// Contribute Global Actions
@ -681,7 +681,7 @@ for (const menuId of [MenuId.EmptyEditorGroupContext, MenuId.EditorTabsBarContex
MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
group: '0_void',
command: {
id: VOID_OPEN_SETTINGS_ACTION_ID,
id: ORCIDE_OPEN_SETTINGS_ACTION_ID,
title: nls.localize({ key: 'openVoid', comment: ['&& denotes a mnemonic'] }, "&&Open Void Settings"),
},
order: 1

2
src/vs/workbench/contrib/orcide/browser/orcideSelectionHelperWidget.ts
View file

@ -69,7 +69,7 @@ export class SelectionHelperContribution extends Disposable implements IEditorCo
this._reactComponentDisposable = res;
this._rerender = res.rerender;
this._register(this._reactComponentDisposable);
this._register(res);
});