From 7eac4aad6f268b48c5d27c50404e8889cab5cbb7 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Thu, 5 Jun 2025 02:41:54 -0700 Subject: [PATCH 1/3] remove ugly button --- .../parts/editor/editorGroupWatermark.ts | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts index f9001e53..120223e4 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupWatermark.ts @@ -26,7 +26,6 @@ import { IViewsService } from '../../../services/views/common/viewsService.js'; /* eslint-disable */ // Void import { VOID_CTRL_K_ACTION_ID, VOID_CTRL_L_ACTION_ID } from '../../../contrib/void/browser/actionIDs.js'; -import { VOID_OPEN_SETTINGS_ACTION_ID } from '../../../contrib/void/browser/voidSettingsPane.js'; import { VIEWLET_ID as REMOTE_EXPLORER_VIEWLET_ID } from '../../../contrib/remote/browser/remoteExplorer.js'; /* eslint-enable */ @@ -306,21 +305,21 @@ export class EditorGroupWatermark extends Disposable { label2.set(keys2); this.currentDisposables.add(label2); - const keys3 = this.keybindingService.lookupKeybinding('workbench.action.openGlobalKeybindings'); - const button3 = append(recentsBox, $('button')); - button3.textContent = `Void Settings` - button3.style.display = 'block' - button3.style.marginLeft = 'auto' - button3.style.marginRight = 'auto' - button3.classList.add('void-settings-watermark-button') + // const keys3 = this.keybindingService.lookupKeybinding('workbench.action.openGlobalKeybindings'); + // const button3 = append(recentsBox, $('button')); + // button3.textContent = `Void Settings` + // button3.style.display = 'block' + // button3.style.marginLeft = 'auto' + // button3.style.marginRight = 'auto' + // button3.classList.add('void-settings-watermark-button') - const label3 = new KeybindingLabel(button3, OS, { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles }); - if (keys3) - label3.set(keys3); - button3.onclick = () => { - this.commandService.executeCommand(VOID_OPEN_SETTINGS_ACTION_ID) - } - this.currentDisposables.add(label3); + // const label3 = new KeybindingLabel(button3, OS, { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles }); + // if (keys3) + // label3.set(keys3); + // button3.onclick = () => { + // this.commandService.executeCommand(VOID_OPEN_SETTINGS_ACTION_ID) + // } + // this.currentDisposables.add(label3); } From 77c9284df5694c5d0f017d486bbab00027e01bbc Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Thu, 5 Jun 2025 02:41:58 -0700 Subject: [PATCH 2/3] fix ssh? --- .../workbench/contrib/void/browser/toolsService.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/void/browser/toolsService.ts b/src/vs/workbench/contrib/void/browser/toolsService.ts index 6d56bd46..0d32db3c 100644 --- a/src/vs/workbench/contrib/void/browser/toolsService.ts +++ b/src/vs/workbench/contrib/void/browser/toolsService.ts @@ -42,8 +42,16 @@ const validateStr = (argName: string, value: unknown) => { const validateURI = (uriStr: unknown) => { if (uriStr === null) throw new Error(`Invalid LLM output: uri was null.`) if (typeof uriStr !== 'string') throw new Error(`Invalid LLM output format: Provided uri must be a string, but it's a(n) ${typeof uriStr}. Full value: ${JSON.stringify(uriStr)}.`) - const uri = URI.file(uriStr) - return uri + + // Try to parse as full URI first (for remote schemes like ssh://, wsl://, etc.) + try { + const uri = URI.parse(uriStr) + return uri + } catch (e) { + // If parsing as URI fails, treat as file path (backwards compatibility) + const uri = URI.file(uriStr) + return uri + } } const validateOptionalURI = (uriStr: unknown) => { From aacae4728f58dbdc5bf6e06a37b487d5b82cb147 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Thu, 5 Jun 2025 02:47:07 -0700 Subject: [PATCH 3/3] 1.4.2 version bump --- product.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product.json b/product.json index da035bd9..2a17a2a9 100644 --- a/product.json +++ b/product.json @@ -1,8 +1,8 @@ { "nameShort": "Void", "nameLong": "Void", - "voidVersion": "1.4.1", - "voidRelease": "0036", + "voidVersion": "1.4.2", + "voidRelease": "0037", "applicationName": "void", "dataFolderName": ".void-editor", "win32MutexName": "voideditor",