From 14a276e4a0ce88251d5df1dbe1dc022fe979f595 Mon Sep 17 00:00:00 2001
From: Andrew Pareles <andrewpareles@gmail.com>
Date: Thu, 1 May 2025 04:04:10 -0700
Subject: [PATCH] flatten settings

---
 .voidrules                                    |  3 ++-
 .../contrib/void/browser/editCodeService.ts   |  2 +-
 .../react/src/sidebar-tsx/SidebarChat.tsx     |  2 +-
 .../react/src/void-settings-tsx/Settings.tsx  | 19 +++++++------------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.voidrules b/.voidrules
index c06e70b4..08826ef2 100644
--- a/.voidrules
+++ b/.voidrules
@@ -2,4 +2,5 @@ This is a fork of the VSCode repo called Void.
 
 Most code we care about lives in src/vs/workbench/contrib/void.
 
-You may sometimes need to explore the full repo to find relevant parts of code.
+You may often need to explore the full repo to find relevant parts of code.
+Look for services, and built-in functions that you might need to use to solve the problem.
\ No newline at end of file
diff --git a/src/vs/workbench/contrib/void/browser/editCodeService.ts b/src/vs/workbench/contrib/void/browser/editCodeService.ts
index a106e601..f099fa25 100644
--- a/src/vs/workbench/contrib/void/browser/editCodeService.ts
+++ b/src/vs/workbench/contrib/void/browser/editCodeService.ts
@@ -1563,7 +1563,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 		const descStr = str === `Not found` ?
 			`The edit was not applied. The text in ORIGINAL must EXACTLY match lines of code in the file, but there was no match for:\n${problematicCode}. Ensure you have the latest version of the file, and ensure the ORIGINAL code matches a code excerpt exactly.`
 			: str === `Not unique` ?
-				`The edit was not applied. The text in ORIGINAL must be unique, but the following ORIGINAL code appears multiple times in the file:\n${problematicCode}. Ensure you have the latest version of the file, and ensure the ORIGINAL code is unique.`
+				`The edit was not applied. The text in ORIGINAL must be unique in the file being edited, but the following ORIGINAL code appears multiple times in the file:\n${problematicCode}. Ensure you have the latest version of the file, and ensure the ORIGINAL code is unique.`
 				: str === 'Has overlap' ?
 					`The edit was not applied. The text in the ORIGINAL blocks must not overlap, but the following ORIGINAL code had overlap with another ORIGINAL string:\n${problematicCode}. Ensure you have the latest version of the file, and ensure the ORIGINAL code blocks do not overlap.`
 					: ``
diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
index 8733e140..3d7a7348 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
@@ -722,7 +722,7 @@ const ToolHeaderWrapper = ({
 	return (<div className=''>
 		<div className={`w-full border border-void-border-3 rounded px-2 py-1 bg-void-bg-3 overflow-hidden ${className}`}>
 			{/* header */}
-			<div className={`select-none flex items-center min-h-[24px]`}>
+			<div className={`select-none flex items-center ml-4 min-h-[24px]`}>
 				<div className={`flex items-center w-full gap-x-2 overflow-hidden justify-between ${isRejected ? 'line-through' : ''}`}>
 					{/* left */}
 					<div className={`
diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
index df46b296..8544d7f1 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
@@ -1006,14 +1006,13 @@ export const Settings = () => {
 
 
 				<h2 className={`text-3xl mt-12`}>Feature Options</h2>
-				{/* L1 */}
 
-				<div className='flex items-start justify-around my-4 gap-x-8'>
+				<div className='flex flex-col gap-y-8 my-4'>
 					<ErrorBoundary>
 						{/* FIM */}
-						<div className='w-full'>
+						<div>
 							<h4 className={`text-base`}>{displayInfoOfFeatureName('Autocomplete')}</h4>
-							<div className='text-sm italic text-void-fg-3 mt-1 mb-4'>
+							<div className='text-sm italic text-void-fg-3 mt-1'>
 								<span>
 									Experimental.{' '}
 								</span>
@@ -1057,7 +1056,7 @@ export const Settings = () => {
 
 						<div className='w-full'>
 							<h4 className={`text-base`}>{displayInfoOfFeatureName('Apply')}</h4>
-							<div className='text-sm italic text-void-fg-3 mt-1 mb-4'>Settings that control the behavior of the Apply button.</div>
+							<div className='text-sm italic text-void-fg-3 mt-1'>Settings that control the behavior of the Apply button.</div>
 
 							<div className='my-2'>
 								{/* Sync to Chat Switch */}
@@ -1087,18 +1086,14 @@ export const Settings = () => {
 						</div>
 					</ErrorBoundary>
 
-				</div>
 
 
 
-				{/* L2 */}
-
-				<div className='flex items-start justify-around my-4 gap-x-8'>
 
 					{/* Tools Section */}
-					<div className='w-full'>
+					<div>
 						<h4 className={`text-base`}>Tools</h4>
-						<div className='text-sm italic text-void-fg-3 mt-1 mb-4'>{`Tools are functions that LLMs can call. Some tools require user approval.`}</div>
+						<div className='text-sm italic text-void-fg-3 mt-1'>{`Tools are functions that LLMs can call. Some tools require user approval.`}</div>
 
 						<div className='my-2'>
 							{/* Auto Accept Switch */}
@@ -1130,7 +1125,7 @@ export const Settings = () => {
 
 					<div className='w-full'>
 						<h4 className={`text-base`}>Editor</h4>
-						<div className='text-sm italic text-void-fg-3 mt-1 mb-4'>{`Settings that control the visibility of Void suggestions in the code editor.`}</div>
+						<div className='text-sm italic text-void-fg-3 mt-1'>{`Settings that control the visibility of Void suggestions in the code editor.`}</div>
 
 						<div className='my-2'>
 							{/* Auto Accept Switch */}