Elgato_dark/void
1
0
Fork 0
mirror of https://github.com/voideditor/void synced 2026-05-24 09:58:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor prompt fix

Browse source
This commit is contained in:
Andrew Pareles 2025-03-21 02:53:02 -07:00
parent 8511681710
commit 90a282a1f7
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/vs/workbench/contrib/void/browser/chatThreadService.ts
View file

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

14
src/vs/workbench/contrib/void/browser/editCodeService.ts
View file

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

9
src/vs/workbench/contrib/void/common/prompt/prompts.ts
View file

@ -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) => {