From e2b36d735cad05ebc9b1c3ccaa5d4c3bfe178cc7 Mon Sep 17 00:00:00 2001
From: Andrew Pareles <andrewpareles@gmail.com>
Date: Fri, 15 Nov 2024 04:31:01 -0800
Subject: [PATCH] update VSReadFile

---
 .../browser/react/src/sidebar-tsx/SidebarChat.tsx  | 14 +++++++++++++-
 .../contrib/void/browser/registerInlineDiffs.ts    |  9 ---------
 2 files changed, 13 insertions(+), 10 deletions(-)

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 5c921757..804dcd96 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
@@ -2,7 +2,6 @@ import React, { FormEvent, Fragment, useCallback, useRef, useState } from 'react
 
 
 import { useConfigState, useService, useThreadsState } from '../util/services.js';
-import { VSReadFile } from '../../../registerInlineDiffs.js';
 import { sendLLMMessage } from '../util/sendLLMMessage.js';
 import { generateDiffInstructions } from '../../../prompt/systemPrompts.js';
 import { userInstructionsStr } from '../../../prompt/stringifyFiles.js';
@@ -10,6 +9,19 @@ import { CodeSelection, CodeStagingSelection } from '../../../registerThreads.js
 
 import { BlockCode } from '../markdown/BlockCode.js';
 import { MarkdownRender } from '../markdown/MarkdownRender.js';
+import { IModelService } from '../../../../../../../editor/common/services/model.js';
+import { URI } from '../../../../../../../base/common/uri.js';
+import { EndOfLinePreference } from '../../../../../../../editor/common/model.js';
+
+
+
+// read files from VSCode
+const VSReadFile = async (modelService: IModelService, uri: URI): Promise<string | null> => {
+	const model = modelService.getModel(uri)
+	if (!model) return null
+	return model.getValue(EndOfLinePreference.LF)
+}
+
 
 
 export type ChatMessage =
diff --git a/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts b/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts
index 6133b514..2357ffca 100644
--- a/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts
+++ b/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts
@@ -15,19 +15,10 @@ import { findDiffs } from './findDiffs.js';
 import { EndOfLinePreference, IModelDecorationOptions, IModelDeltaDecoration, ITextModel } from '../../../../editor/common/model.js';
 import { IRange } from '../../../../editor/common/core/range.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
-import { IModelService } from '../../../../editor/common/services/model.js';
 // import { IModelService } from '../../../../editor/common/services/model.js';
 
 
 
-// read files from VSCode
-export const VSReadFile = async (modelService: IModelService, uri: URI): Promise<string | null> => {
-	const model = modelService.getModel(uri)
-	if (!model) return null
-	return model.getValue(EndOfLinePreference.LF)
-}
-
-
 export type Diff = {
 	diffid: number,
 	diffareaid: number, // the diff area this diff belongs to, "computed"