amend

extensions/void/package-lock.json

@@ -6024,14 +6024,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/monaco-editor": {
-      "version": "0.52.0",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.52.0.tgz",
-      "integrity": "sha512-OeWhNpABLCeTqubfqLMXGsqf6OmPU6pHM85kF3dhy6kq5hnhuVS1p3VrEW/XhWHc71P2tHyS5JFySD8mgs1crw==",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",

extensions/void/src/extension/DiffProvider.ts

@@ -28,6 +28,8 @@ export class DiffProvider implements vscode.CodeLensProvider {
 	private _originalFileOfDocument: { [docUriStr: string]: string } = {}
 	private _diffAreasOfDocument: { [docUriStr: string]: DiffArea[] } = {}
 	private _diffsOfDocument: { [docUriStr: string]: Diff[] } = {}
+	private _insetsOfDocument: { [docUriStr: string]: vscode.WebviewEditorInset[] } = {}
+
 
 	private _diffareaidPool = 0
 	private _diffidPool = 0
@@ -176,6 +178,10 @@ export class DiffProvider implements vscode.CodeLensProvider {
 		// reset all diffs (we update them below)
 		this._diffsOfDocument[docUriStr] = []
 
+		// reset all insets (we update them below)
+		this._insetsOfDocument[docUriStr]?.forEach(inset => inset.dispose())
+		this._insetsOfDocument[docUriStr] = []
+
 		// for each diffArea
 		for (const diffArea of diffAreas) {
 
@@ -215,20 +221,27 @@ export class DiffProvider implements vscode.CodeLensProvider {
 		);
 
 		// update red highlighting
-		// this._diffsOfDocument[docUriStr]
-		// 	.filter(diff => diff.originalCode !== '')
-		// 	.forEach(diff => {
-		// 		const text = originalFile.split('\n').slice(diff.originalRange.start.line, diff.originalRange.start.line + 1).join('\n')
-		// 		const height = text.split('\n').length
-		// 		const line = diff.range.start.line - 1
+		this._insetsOfDocument[docUriStr] = this._diffsOfDocument[docUriStr]
+			.filter(diff => diff.originalCode !== '')
+			.map(diff => {
 
-		// 		const inset = vscode.window.createWebviewTextEditorInset(editor, line, height);
-		// 		updateWebviewHTML(inset.webview, this._extensionUri, { jsOutLocation: 'dist/webviews/diffline/index.js', cssOutLocation: 'dist/webviews/styles.css' },
-		// 			{ text }
-		// 		)
+				// create new inset
+				const text = originalFile.split('\n').slice(diff.originalRange.start.line, diff.originalRange.end.line + 1).join('\n')
+				const height = text.split('\n').length
+				const line = diff.range.start.line - 1
+
+				const inset = vscode.window.createWebviewTextEditorInset(editor, line, height);
+				updateWebviewHTML(inset.webview, this._extensionUri, { jsOutLocation: 'dist/webviews/diffline/index.js', cssOutLocation: 'dist/webviews/styles.css' },
+					{ text }
+				)
 
 
-		// 	})
+				setTimeout(() => {
+					console.log('updating!')
+					vscode.window.updateWebviewTextEditorInset(inset.handle, line + 2, height)
+				}, 2000)
+				return inset
+			})
 
 		// for each diffArea, highlight its sweepIndex in dark gray
 		editor.setDecorations(

extensions/void/src/extension/extension.ts

@@ -12,19 +12,25 @@ import { CtrlKWebviewProvider } from './providers/CtrlKWebviewProvider';
 
 // this comes from vscode.proposed.editorInsets.d.ts
 declare module 'vscode' {
+
 	export interface WebviewEditorInset {
 		readonly editor: vscode.TextEditor;
 		readonly line: number;
 		readonly height: number;
 		readonly webview: vscode.Webview;
+		readonly handle: number;
 		readonly onDidDispose: Event<void>;
 		dispose(): void;
 	}
+
 	export namespace window {
 		export function createWebviewTextEditorInset(editor: vscode.TextEditor, line: number, height: number, options?: vscode.WebviewOptions): WebviewEditorInset;
+		export function updateWebviewTextEditorInset(handle: number, line: number, height: number): WebviewEditorInset;
 	}
 }
 
+
+
 const roundRangeToLines = (selection: vscode.Selection) => {
 	let endLine = selection.end.character === 0 ? selection.end.line - 1 : selection.end.line // e.g. if the user triple clicks, it selects column=0, line=line -> column=0, line=line+1
 	return new vscode.Range(selection.start.line, 0, endLine, Number.MAX_SAFE_INTEGER)

extensions/void/src/extension/extensionLib/readFileContentOfUri.ts

@@ -1,14 +1,13 @@
 import * as vscode from 'vscode'
 
 
-export const readFileContentOfUri = async (uri: vscode.Uri): Promise<string> => {
-	const document = await vscode.workspace.openTextDocument(uri);
-	return document.getText().replace(/\r\n/g, '\n') ?? '' // Normalize line endings
+// export const readFileContentOfUri = async (uri: vscode.Uri): Promise<string> => {
+// 	const document = await vscode.workspace.openTextDocument(uri.fsPath);
+// 	return document.getText().replace(/\r\n/g, '\n') ?? '' // Normalize line endings
+// };
 
-};
-
-// this is the old version, which only reads the most recently saved version
-// export const readFileContentOfUri = async (uri: vscode.Uri) => {
-// 	return Buffer.from(await vscode.workspace.fs.readFile(uri)).toString('utf8')
-// 		.replace(/\r\n/g, '\n') // replace windows \r\n with \n
-// }
+// TODO this only accesses the most recently saved version; make it instead access the most recent version in the vscode editor
+export const readFileContentOfUri = async (uri: vscode.Uri) => {
+	return Buffer.from(await vscode.workspace.fs.readFile(uri)).toString('utf8')
+		.replace(/\r\n/g, '\n') // replace windows \r\n with \n
+}

extensions/void/src/extension/providers/CtrlKWebviewProvider.ts

@@ -3,22 +3,6 @@
 import * as vscode from 'vscode';
 import { updateWebviewHTML as _updateWebviewHTML, updateWebviewHTML } from '../extensionLib/updateWebviewHTML';
 
-// this comes from vscode.proposed.editorInsets.d.ts
-declare module 'vscode' {
-	export interface WebviewEditorInset {
-		readonly editor: vscode.TextEditor;
-		readonly line: number;
-		readonly height: number;
-		readonly webview: vscode.Webview;
-		readonly onDidDispose: Event<void>;
-		dispose(): void;
-	}
-	export namespace window {
-		export function createWebviewTextEditorInset(editor: vscode.TextEditor, line: number, height: number, options?: vscode.WebviewOptions): WebviewEditorInset;
-	}
-}
-
-
 
 export class CtrlKWebviewProvider {
 

extensions/void/src/webviews/diffline/DiffLine.tsx

@@ -21,9 +21,9 @@ export const DiffLine = () => {
 	const text = props.text
 
 	return <>
-		<div>
+		<pre>
 			{text}
-		</div>
+		</pre>
 	</>
 };
 

src/vs/workbench/api/common/extHost.api.impl.ts

@@ -826,6 +826,10 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 				// checkProposedApiEnabled(extension, 'editorInsets'); // Void commented this out
 				return extHostEditorInsets.createWebviewEditorInset(editor, line, height, options, extension);
 			},
+			// Void created this function:
+			updateWebviewTextEditorInset(handle: number, line: number, height: number): vscode.WebviewEditorInset {
+				return extHostEditorInsets.updateEditorInset(handle, line, height);
+			},
 			createTerminal(nameOrOptions?: vscode.TerminalOptions | vscode.ExtensionTerminalOptions | string, shellPath?: string, shellArgs?: readonly string[] | string): vscode.Terminal {
 				if (typeof nameOrOptions === 'object') {
 					if ('pty' in nameOrOptions) {

src/vs/workbench/api/common/extHostCodeInsets.ts

@@ -99,11 +99,11 @@ export class ExtHostEditorInsets implements ExtHostEditorInsetsShape {
 		};
 
 		const inset = new class implements vscode.WebviewEditorInset {
-
 			readonly editor: vscode.TextEditor = editor;
 			readonly line: number = line;
 			readonly height: number = height;
 			readonly webview: vscode.Webview = webview;
+			readonly handle: number = handle;
 			readonly onDidDispose: vscode.Event<void> = onDidDispose.event;
 
 			dispose(): void {
@@ -125,6 +125,34 @@ export class ExtHostEditorInsets implements ExtHostEditorInsetsShape {
 		return inset;
 	}
 
+
+	updateEditorInset(handle: number, line: number, height: number): vscode.WebviewEditorInset {
+		const _inset = this._insets.get(handle);
+
+		if (!_inset) {
+			throw new Error(`Inset with handle ${handle} not found`);
+		}
+
+		const { editor, onDidReceiveMessage, inset: { webview, onDidDispose, dispose } } = _inset
+
+		const inset = new class implements vscode.WebviewEditorInset {
+			readonly editor: vscode.TextEditor = editor;
+			readonly line: number = line;
+			readonly height: number = height;
+			readonly webview: vscode.Webview = webview;
+			readonly handle: number = handle;
+			readonly onDidDispose: vscode.Event<void> = onDidDispose;
+			dispose = dispose
+		};
+
+		this._insets.set(handle, { editor, inset: inset, onDidReceiveMessage });
+		// _inset?.onDidReceiveMessage.fire({});
+
+		return inset
+	}
+
+
+
 	$onDidDispose(handle: number): void {
 		const value = this._insets.get(handle);
 		if (value) {

src/vscode-dts/vscode.proposed.editorInsets.d.ts

@@ -12,11 +12,13 @@ declare module 'vscode' {
 		readonly line: number;
 		readonly height: number;
 		readonly webview: Webview;
+		readonly handle: number;
 		readonly onDidDispose: Event<void>;
 		dispose(): void;
 	}
 
 	export namespace window {
 		export function createWebviewTextEditorInset(editor: TextEditor, line: number, height: number, options?: WebviewOptions): WebviewEditorInset;
+		export function updateWebviewTextEditorInset(handle: number, line: number, height: number): WebviewEditorInset;
 	}
 }