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

Beta!

CHANGELOG.md

@@ -1,35 +0,0 @@
-
-
-
-
-
-## Jan. 13, 2025 - Entering beta
-
-- Added quick edits! Void handles FIM-prompting, output parsing, and history management for inline UI.
-
-- Migrated away from VS Code extension API - Void now lives and interacts entirely within the VS Code codebase.
-
-- New settings page with model configuration, one-click switch, and user settings.
-
-- Added auto-detection (via polling) of local models by default.
-
-- LLM requests originate from `node/`, which fixes common CORS and CSP issues when running some models locally.
-
-- Misc improvements like UI and history for Accept | Reject in the sidebar and editor, streaming interruptions, and past chat history.
-
-- Automatic file selection on tab switches.
-
-- Lots of new UI, misc bug fixes, and performance improvements.
-
-- VS Code's default Ctrl+L is now Ctrl+M in Void (on Mac Cmd+L becomes Cmd+M).
-
-- Switched from the MIT License to the Apache 2.0 License. Apache's attribution clause provides a small amount of protection to our source initiative.
-
-A huge shoutout to our many contributors. If you'd like to help build Void,
-
-## Sept/Oct. 2024 - Early launch
-
-- Initialized Void's website and GitHub repo.
-
-- Started a waitlist.
-

CONTRIBUTING.md

@@ -2,17 +2,18 @@
 
 Welcome! 👋 This is the official guide on how to contribute to Void. We want to make it as easy as possible to contribute, so if you have any questions or comments, reach out via email or discord!
 
+
+
 There are a few ways to contribute:
 
 - 👨‍💻 Build new features - see [Issues](https://github.com/voideditor/void/issues).
 - 💡 Make suggestions in our [Discord](https://discord.gg/RSNjgaugJs).
 - ⭐️ If you want to build your AI tool into Void, feel free to get in touch! It's very easy to extend Void, and the UX you create will be much more natural than a VSCode Extension.
 
-Void's code lives in `src/vs/workbench/contrib/void/browser/` and `src/vs/platform/void/`.
+Void's code mostly lives in `src/vs/workbench/contrib/void/` and `src/vs/platform/void/`.
 
 
-
-## Building the full IDE
+## Building Void
 
 ### a. Build Prerequisites - Mac
 
@@ -41,7 +42,7 @@ First, run `npm install -g node-gyp`. Then:
 - Red Hat (Fedora, etc): `sudo dnf install @development-tools gcc gcc-c++ make libsecret-devel krb5-devel libX11-devel libxkbfile-devel`.
 - Others: see [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute).
 
-### Building Void
+### d. Building Void
 
 To build Void, open `void/` inside VSCode. Then open your terminal and run:
 
@@ -52,10 +53,11 @@ To build Void, open `void/` inside VSCode. Then open your terminal and run:
    - Press <kbd>Ctrl+Shift+B</kbd> (Windows/Linux).
    - This step can take ~5 min. The build is done when you see two check marks.
 4. Run Void.
-	 - Run `./scripts/code.sh` (Mac/Linux).
+   - Run `./scripts/code.sh` (Mac/Linux).
    - Run `./scripts/code.bat` (Windows).
-   - This command should open up the built IDE. You can always press <kbd>Ctrl+R</kbd> (<kbd>Cmd+R</kbd>)  inside the new window to see changes without re-building, or press or <kbd>Ctrl+Shift+P</kbd> in the new window and run "Reload Window".
-	- If you are actively developing Void, we strongly recommend adding the flags `--user-data-dir ./.tmp/user-data --extensions-dir ./.tmp/extensions` to the above run command (just append them at the end of the string). This will save all data and extensions to the `.tmp` folder. You can delete this folder to reset any IDE changes you made when testing.
+6. Nice-to-knows.
+   - You can always press <kbd>Ctrl+R</kbd> (<kbd>Cmd+R</kbd>) inside the new window to reload and see your new changes. It's faster than <kbd>Ctrl+Shift+P</kbd> and `Reload Window`.
+   - You might want to add the flags `--user-data-dir ./.tmp/user-data --extensions-dir ./.tmp/extensions` to the above run command, which lets you delete the `.tmp` folder to reset any IDE changes you made when testing.
 
 #### Building Void from Terminal
 
@@ -70,20 +72,19 @@ Alternatively, if you want to build Void from the terminal, instead of pressing
 
 
 
-### Common Fixes
+#### Common Fixes
 
-- Make sure you follow the prerequisite steps.
+- Make sure you followed the prerequisite steps.
 - Make sure you have the same NodeJS version as `.nvmrc`.
-- Make sure your `npm run watchreact` is running if you change any React files, or else you'll need to re-build.
-- If you see missing styles, go to `src2/styles.css` and re-save the file.
-- If you get `"TypeError: Failed to fetch dynamically imported module: vscode-file://vscode-app/.../workbench.desktop.main.js", source: file:///.../bootstrap-window.js`, make sure all imports end with `.js`.
-- If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new). For building questions, you can also refer to VSCode's full [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
+- If you get `"TypeError: Failed to fetch dynamically imported module"`, make sure all imports end with `.js`.
+- If you see missing styles, wait a few seconds and then reload.
+- If you have any questions, feel free to [submit an issue](https://github.com/voideditor/void/issues/new). You can also refer to VSCode's complete [How to Contribute](https://github.com/microsoft/vscode/wiki/How-to-Contribute) page.
 
 
 
-## Bundling
+## Packaging
 
-We don't usually recommend bundling. Instead, you should probably just build. If you're sure you want to bundle Void into an executable app, make sure you've built first, then run one of the following commands. This will create a folder named `VSCode-darwin-arm64` or similar outside of the void/ repo (see below). Be patient - compiling can take ~25 minutes.
+We don't usually recommend packaging. Instead, you should probably just build. If you're sure you want to package Void into an executable app, make sure you've built first, then run one of the following commands. This will create a folder named `VSCode-darwin-arm64` or similar outside of the void/ repo (see below). Be patient - packaging can take ~25 minutes.
 
 
 ### Mac
@@ -109,17 +110,15 @@ workspace/
 └── VSCode-darwin-arm64/ # Generated output
 ```
 
+### Distributing
+We have a few scripts to convert `Mac .app -> .dmg`, `Windows folder -> .exe`, and `Linux folder -> appimage` for distribution. Let us know if you'd like access to them. 
+
+## Pull Request Guidelines
 
 
-# Guidelines
-
-We're always glad to talk about new ideas, help you get set up, and make sure your changes align with our vision for the project! Feel free to shoot Mat or Andrew a message, or start chatting with us in the `#contributing` channel of our [Discord](https://discord.gg/RSNjgaugJs).
-
-
-## Submitting a Pull Request
-
-- Please submit a pull request once you've made a change. No need to submit an Issue unless you're creating a new feature.
-- Please don't use AI to write your PR 🙂.
+- Please submit a pull request once you've made a change.
+- No need to submit an Issue unless you're creating a new feature.
+- Please don't use AI to write your PR 🙂
 
 
 <!--
@@ -127,6 +126,8 @@ We're always glad to talk about new ideas, help you get set up, and make sure yo
 
 We keep track of all the files we've changed with Void so it's easy to rebase:
 
+Edit: far too many changes to track... this is old
+
 - README.md
 - CONTRIBUTING.md
 - VOID_USEFUL_LINKS.md
@@ -146,6 +147,7 @@ We keep track of all the files we've changed with Void so it's easy to rebase:
 - build/npm/dirs.js
 
 - vscode.proposed.editorInsets.d.ts - not modified, but code copied
+
 -->
 
 ## References

build/win32/code.iss

@@ -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

src/vs/workbench/contrib/void/browser/helperServices/consistentItemService.ts

@@ -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]
 

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

@@ -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 */}

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

@@ -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>

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

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

src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx

@@ -513,7 +513,7 @@ const OneClickSwitchButton = () => {
 
 	if (transferTheseFiles.length === 0)
 		return <>
-			<WarningBox text={transferError ?? `One-click-switch not available.`} />
+			<WarningBox text={transferError ?? `One-click switch not available.`} />
 		</>