misc + track down icons to change

build/gulpfile.vscode.js

@@ -425,15 +425,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 				'resources/win32/vue.ico',
 				'resources/win32/xml.ico',
 				'resources/win32/yaml.ico',
-				'resources/win32/code_70x70.png',
-				'resources/win32/code_150x150.png'
+				'resources/win32/code_70x70.png', // <-- Void icon
+				'resources/win32/code_150x150.png' // <-- Void icon
 			], { base: '.' }));
 		} else if (platform === 'linux') {
-			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
+			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' })); // <-- Void icon
 		} else if (platform === 'darwin') {
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
 				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename('bin/code'));
+				.pipe(rename('bin/code')); // <-- Void icon
 
 			all = es.merge(all, shortcut);
 		}

build/lib/electron.ts

@@ -68,7 +68,7 @@ function darwinBundleDocumentType(extensions: string[], icon: string, nameOrSuff
 		role: 'Editor',
 		ostypes: ['TEXT', 'utxt', 'TUTX', '****'],
 		extensions,
-		iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns',
+		iconFile: 'resources/darwin/' + icon.toLowerCase() + '.icns', // <-- Void icon code.icns
 		utis
 	};
 }
@@ -196,7 +196,7 @@ export const config = {
 	darwinForceDarkModeSupport: true,
 	darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
 	linuxExecutableName: product.applicationName,
-	winIcon: 'resources/win32/code.ico',
+	winIcon: 'resources/win32/code.ico', // <-- Void icon
 	token: process.env['GITHUB_TOKEN'],
 	repo: product.electronRepository || undefined,
 	validateChecksum: true,

src/vs/workbench/contrib/void/browser/inlineDiffsService.ts

@@ -774,7 +774,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
 				// console.log('TOP ONLY')
 				const numOverlappingLines = endLine - diffArea.startLine + 1
 				const numRemainingLinesInDA = diffArea.endLine - diffArea.startLine + 1 - numOverlappingLines
-				const newHeight = numRemainingLinesInDA + (newTextHeight - 1)
+				const newHeight = (numRemainingLinesInDA - 1) + (newTextHeight - 1) + 1
 				diffArea.startLine = startLine
 				diffArea.endLine = startLine + newHeight
 			}

src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlKChat.tsx

@@ -76,11 +76,11 @@ export const CtrlKChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onChang
 		inputBoxRef.current.value = instructions
 	}, [initText, instructions])
 
-	return <div className='py-2 w-full max-w-xl' ref={sizerRef}>
+	return <div ref={sizerRef} className='py-2 w-full max-w-xl'>
 		<form
 			// copied from SidebarChat.tsx
 			className={`
-				flex flex-col gap-2 p-1 relative input text-left shrink-0
+				flex flex-col gap-2 py-1 px-2 relative input text-left shrink-0
 				transition-all duration-200
 				rounded-md
 				bg-vscode-input-bg
@@ -102,19 +102,23 @@ export const CtrlKChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onChang
 				onSubmit(e)
 			}}
 			onClick={(e) => {
-				if (e.currentTarget === e.target) {
-					inputBoxRef.current?.focus()
-				}
+				inputBoxRef.current?.focus()
 			}}
 		>
 
-			<div // this div is used to position the input box properly
-				className={`w-full p-2 z-[999] relative`}
+			{/* // this div is used to position the input box properly */}
+			<div
+				className={`w-full z-[999] relative
+					@@[&_textarea]:!void-bg-transparent
+					@@[&_textarea]:!void-outline-none
+					@@[&_textarea]:!void-text-vscode-input-fg
+					@@[&_div.monaco-inputbox]:!void-border-none
+					@@[&_div.monaco-inputbox]:!void-outline-none`}
 			>
 				<div className='flex flex-row justify-between items-end gap-1'>
-					<div className='absolute size-0.5 top-0 right-0 z-[1]'>
+					<div className='absolute size-0.5 top-0 right-4 z-[1]'>
 						<X
-						onClick={() => { inlineDiffsService.removeCtrlKZone({ diffareaid }) }}
+							onClick={() => { inlineDiffsService.removeCtrlKZone({ diffareaid }) }}
 						/>
 					</div>
 
@@ -147,7 +151,7 @@ export const CtrlKChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onChang
 						@@[&_select]:!void-border-none
 						@@[&_select]:!void-outline-none'
 					>
-						<ModelDropdown featureName='Ctrl+L' />
+						<ModelDropdown featureName='Ctrl+K' />
 					</div>
 
 					{/* submit / stop button */}

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

@@ -526,9 +526,7 @@ export const SidebarChat = () => {
 					onSubmit(e)
 				}}
 				onClick={(e) => {
-					if (e.currentTarget === e.target) {
-						inputBoxRef.current?.focus()
-					}
+					inputBoxRef.current?.focus()
 				}}
 			>
 				{/* top row */}