synced/void
1
0
Fork 0
mirror of https://github.com/voideditor/void.git synced 2025-03-14 13:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/model-selection' into autocomplete-readd

Browse Source
This commit is contained in:
Mathew Pareles
2025-01-22 00:07:28 -08:00
parent 3aa6d3d28a 24e276ba47
commit 5257e9c82d
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/win32/code.iss
View File

@ -23,7 +23,7 @@ AppMutex={code:GetAppMutex}
SetupMutex={#AppMutex}setup
; this is a Void icon comment. Old: WizardImageFile="{#RepoDir}\resources\win32\inno-big-100.bmp,{#RepoDir}\resources\win32\inno-big-125.bmp,{#RepoDir}\resources\win32\inno-big-150.bmp,{#RepoDir}\resources\win32\inno-big-175.bmp,{#RepoDir}\resources\win32\inno-big-200.bmp,{#RepoDir}\resources\win32\inno-big-225.bmp,{#RepoDir}\resources\win32\inno-big-250.bmp"
; this is a Void icon comment. Old: WizardSmallImageFile="{#RepoDir}\resources\win32\inno-small-100.bmp,{#RepoDir}\resources\win32\inno-small-125.bmp,{#RepoDir}\resources\win32\inno-small-150.bmp,{#RepoDir}\resources\win32\inno-small-175.bmp,{#RepoDir}\resources\win32\inno-small-200.bmp,{#RepoDir}\resources\win32\inno-small-225.bmp,{#RepoDir}\resources\win32\inno-small-250.bmp"
WizardImageFile="{#RepoDir}\resources\win32\inno-void.bmp"
; WizardImageFile="{#RepoDir}\resources\win32\inno-void.bmp"
WizardSmallImageFile="{#RepoDir}\resources\win32\inno-void.bmp"
SetupIconFile={#RepoDir}\resources\win32\code.ico
UninstallDisplayIcon={app}\{#ExeBasename}.exe

BIN
resources/win32/inno-void.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 MiB

After

Width:  |  Height:  |  Size: 1.4 MiB

4
src/vs/workbench/contrib/void/browser/helperServices/consistentItemService.ts
View File

@ -127,8 +127,6 @@ export class ConsistentItemService extends Disposable {
const editorId = editor.getId()
this.itemIdsOfEditorId[editorId]?.delete(itemId)
if (this.itemIdsOfEditorId[editorId]?.size === 0)
delete this.itemIdsOfEditorId[editorId]
this.disposeFnOfItemId[itemId]?.()
delete this.disposeFnOfItemId[itemId]
@ -175,8 +173,6 @@ export class ConsistentItemService extends Disposable {
// clear
this.consistentItemIdsOfURI[uri.fsPath]?.delete(consistentItemId)
if (this.consistentItemIdsOfURI[uri.fsPath]?.size === 0)
delete this.consistentItemIdsOfURI[uri.fsPath]
delete this.infoOfConsistentItemId[consistentItemId]

13
src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
View File

@ -325,7 +325,7 @@ export const SelectedFiles = (
>
{/* selection summary */}
<div // container for item and its delete button (if it's last)
className='flex items-center gap-1 mr-0.5 mb-0.5'
className='flex items-center gap-1 mr-0.5 my-0.5'
>
<div // styled summary box
className={`flex items-center gap-0.5 relative
@ -380,7 +380,7 @@ export const SelectedFiles = (
</div>
{/* clear all selections button */}
{type !== 'staging' || selections.length === 0 || i !== selections.length - 1
{/* {type !== 'staging' || selections.length === 0 || i !== selections.length - 1
? null
: <div className={`flex items-center ${isThisSelectionOpened ? 'w-full' : ''}`}>
<div
@ -402,7 +402,7 @@ export const SelectedFiles = (
/>
</div>
</div>
}
} */}
</div>
{/* selection text */}
{isThisSelectionOpened &&
@ -423,9 +423,8 @@ export const SelectedFiles = (
</div>)
return <Fragment key={thisKey}>
{selections.length > 0 && i === selections.length &&
<div className='w-full'></div> // divider between `selections` and `prospectiveSelections`
}
{/* divider between `selections` and `prospectiveSelections` */}
{/* {selections.length > 0 && i === selections.length && <div className='w-full'></div>} */}
{selectionHTML}
</Fragment>
@ -675,7 +674,7 @@ export const SidebarChat = () => {
{/* top row */}
<>
{/* selections */}
<SelectedFiles type='staging' selections={selections || []} setSelections={chatThreadsService.setStaging.bind(chatThreadsService)} showProspectiveSelections={previousMessages.length === 0}/>
<SelectedFiles type='staging' selections={selections || []} setSelections={chatThreadsService.setStaging.bind(chatThreadsService)} showProspectiveSelections={previousMessages.length === 0} />
</>
{/* middle row */}

1
src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarThreadSelector.tsx
View File

@ -104,6 +104,7 @@ export const SidebarThreadSelector = () => {
flex items-center
`}
onClick={() => chatThreadsService.switchToThread(pastThread.id)}
onDoubleClick={() => sidebarStateService.setState({ isHistoryOpen: false })}
title={new Date(pastThread.createdAt).toLocaleString()}
>
<div className='truncate'>{`${firstMsg}`}</div>

2
src/vs/workbench/contrib/void/browser/react/src/util/inputs.tsx
View File

@ -687,6 +687,8 @@ export const VoidCodeEditor = ({ initValue, language, maxHeight, showScrollbars
// maxColumn: 0,
},
hover: { enabled: false },
selectionHighlight: false, // highlights whole words
renderLineHighlight: 'none',