From 90a282a1f7f1e0220315c402995bdb2f7bc2cf63 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Fri, 21 Mar 2025 02:53:02 -0700 Subject: [PATCH] minor prompt fix --- .../contrib/void/browser/chatThreadService.ts | 1 + .../contrib/void/browser/editCodeService.ts | 14 +++++++------- .../contrib/void/common/prompt/prompts.ts | 9 ++------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/vs/workbench/contrib/void/browser/chatThreadService.ts b/src/vs/workbench/contrib/void/browser/chatThreadService.ts index 2455bb44..861e1847 100644 --- a/src/vs/workbench/contrib/void/browser/chatThreadService.ts +++ b/src/vs/workbench/contrib/void/browser/chatThreadService.ts @@ -753,6 +753,7 @@ class ChatThreadService extends Disposable implements IChatThreadService { { role: 'user', content: userMessageFullContent }, ...messages_.slice(lastUserMsgIdx + 1, Infinity), ] + // console.log('MESSAGES!!!', messages) return messages } diff --git a/src/vs/workbench/contrib/void/browser/editCodeService.ts b/src/vs/workbench/contrib/void/browser/editCodeService.ts index dba6870a..a89ffa50 100644 --- a/src/vs/workbench/contrib/void/browser/editCodeService.ts +++ b/src/vs/workbench/contrib/void/browser/editCodeService.ts @@ -1245,18 +1245,18 @@ class EditCodeService extends Disposable implements IEditCodeService { // ctrlkzone should never have any conflicts } else { - console.log('KEEPING CONFLICTS!!!!!!!!') + // console.log('KEEPING CONFLICTS!!!!!!!!') // keep conflict on whole file - to keep conflict, revert the change and use those contents as original, then un-revert the file - console.log('originalFile', originalFileStr) - console.log('diffareas A', JSON.stringify(this.diffAreasOfURI, null, 2)) + // console.log('originalFile', originalFileStr) + // console.log('diffareas A', JSON.stringify(this.diffAreasOfURI, null, 2)) this.acceptOrRejectAllDiffAreas({ uri, removeCtrlKs: true, behavior: 'reject', _addToHistory: false }) - console.log('diffareas B', JSON.stringify(this.diffAreasOfURI, null, 2)) + // console.log('diffareas B', JSON.stringify(this.diffAreasOfURI, null, 2)) const oldFileStr = model.getValue(EndOfLinePreference.LF) // use this as original code - console.log('oldFileStr', { oldFileStr }) + // console.log('oldFileStr', { oldFileStr }) this._writeURIText(uri, originalFileStr, 'wholeFileRange', { shouldRealignDiffAreas: true }) // un-revert originalCode = oldFileStr - console.log('originalCode', { originalCode }) - console.log('NEW STR', { newStr: model.getValue(EndOfLinePreference.LF) }) + // console.log('originalCode', { originalCode }) + // console.log('NEW STR', { newStr: model.getValue(EndOfLinePreference.LF) }) } } diff --git a/src/vs/workbench/contrib/void/common/prompt/prompts.ts b/src/vs/workbench/contrib/void/common/prompt/prompts.ts index d6c05f13..350eaa3b 100644 --- a/src/vs/workbench/contrib/void/common/prompt/prompts.ts +++ b/src/vs/workbench/contrib/void/common/prompt/prompts.ts @@ -282,13 +282,8 @@ export const chat_selectionsString = async ( const filesStr = await stringifyFileSelections(fileSelections, voidModelService) const selnsStr = stringifyCodeSelections(codeSelections) - - if (filesStr || selnsStr) return `\ -ALL FILE CONTENTS -${filesStr} -${selnsStr}` - - return null + const fileContents = [filesStr, selnsStr].filter(Boolean).join('\n') + return fileContents || null } export const chat_lastUserMessageWithFilesAdded = (userMessage: string, selectionsString: string | null) => {