```
+ // 2. ``````
+ const match = result.match(/```(?:\w+\n)?([\s\S]*?)```|```([\s\S]*?)```/);
+
+ if (!match) {
+ return result;
+ }
+
+ // Return whichever group matched (non-empty)
+ return match[1] ?? match[2] ?? result;
+}
+
+
+// trims the end of the prefix to improve cache hit rate
+const removeLeftTabsAndTrimEnd = (s: string): string => {
+ const trimmedString = s.trimEnd();
+ const trailingEnd = s.slice(trimmedString.length);
+
+ // keep only a single trailing newline
+ if (trailingEnd.includes('\n')) {
+ s = trimmedString + '\n';
+ }
+
+ s = s.replace(/^\s+/gm, ''); // remove left tabs
+
+ return s;
+}
+
+
+
+function getStringUpToUnbalancedParenthesis(s: string, prefix: string): string {
+
+ const pairs: Record = { ')': '(', '}': '{', ']': '[' };
+
+ // process all bracets in prefix
+ let stack: string[] = []
+ const firstOpenIdx = prefix.search(/[[({]/);
+ if (firstOpenIdx !== -1) {
+ const brackets = prefix.slice(firstOpenIdx).split('').filter(c => '()[]{}'.includes(c));
+
+ for (const bracket of brackets) {
+ if (bracket === '(' || bracket === '{' || bracket === '[') {
+ stack.push(bracket);
+ } else {
+ if (stack.length > 0 && stack[stack.length - 1] === pairs[bracket]) {
+ stack.pop();
+ } else {
+ stack.push(bracket);
+ }
+ }
+ }
+ }
+
+ // iterate through each character
+ for (let i = 0; i < s.length; i++) {
+ const char = s[i];
+
+ if (char === '(' || char === '{' || char === '[') { stack.push(char); }
+ else if (char === ')' || char === '}' || char === ']') {
+ if (stack.length === 0 || stack.pop() !== pairs[char]) { return s.substring(0, i); }
+ }
+ }
+ return s;
+}
+
+
+const parenthesisChars = `{}()[]<>\`'"`
+
+// returns the text in the autocompletion to display, assuming the prefix is already matched
+const toInlineCompletions = ({ matchInfo, prefix, suffix, autocompletion, position, debug }: { matchInfo: matchInfo, prefix: string, suffix: string, autocompletion: Autocompletion, position: Position, debug?: boolean }): { insertText: string, range: Range }[] => {
+
+
+ const suffixLines = suffix.split('\n')
+ const prefixLines = prefix.split('\n')
+ const suffixToTheRightOfCursor = suffixLines[0]
+ const prefixToTheLeftOfCursor = prefixLines[prefixLines.length - 1]
+ const generatedMiddle = autocompletion.insertText
+
+ let startIdx = matchInfo.startIdx
+ let endIdx = generatedMiddle.length // exclusive bounds
+
+ // const naiveReturnValue = generatedMiddle.slice(startIdx)
+ // console.log('naiveReturnValue: ', JSON.stringify(naiveReturnValue))
+ // return [{ insertText: naiveReturnValue, }]
+
+ // do postprocessing for better ux
+ // this is a bit hacky but may change a lot
+
+ // if there is space at the start of the completion and user has added it, remove it
+ const charToLeftOfCursor = prefixToTheLeftOfCursor.slice(-1)[0] || ''
+ const userHasAddedASpace = charToLeftOfCursor === ' ' || charToLeftOfCursor === '\t'
+ const rawFirstNonspaceIdx = generatedMiddle.slice(startIdx).search(/[^\t ]/)
+ if (rawFirstNonspaceIdx > -1 && userHasAddedASpace) {
+ const firstNonspaceIdx = rawFirstNonspaceIdx + startIdx;
+ // console.log('p0', startIdx, rawFirstNonspaceIdx)
+ startIdx = Math.max(startIdx, firstNonspaceIdx)
+ }
+
+ // if user is on a blank line and the generation starts with newline(s), remove them
+ const numStartingNewlines = generatedMiddle.slice(startIdx).match(/^\n+/)?.[0].length || 0;
+ if (
+ !prefixToTheLeftOfCursor.trim()
+ && !suffixToTheRightOfCursor.trim()
+ && numStartingNewlines > 0
+ ) {
+ // console.log('p1', numStartingNewlines)
+ startIdx += numStartingNewlines
+ }
+
+ // if the generated text matches with the suffix on the current line, stop
+ if (suffixToTheRightOfCursor.trim()) { // completing in the middle of a line
+ // complete until there is a match
+ const rawMatchIndex = generatedMiddle.slice(startIdx).lastIndexOf(suffixToTheRightOfCursor.trim()[0])
+ if (rawMatchIndex > -1) {
+ // console.log('p2', rawMatchIndex, startIdx, suffixToTheRightOfCursor.trim()[0], 'AAA', generatedMiddle.slice(startIdx))
+ const matchIdx = rawMatchIndex + startIdx;
+ const matchChar = generatedMiddle[matchIdx]
+ if (parenthesisChars.includes(matchChar)) {
+ endIdx = Math.min(endIdx, matchIdx)
+ }
+ }
+ }
+
+ const restOfLineToGenerate = generatedMiddle.slice(startIdx).split('\n')[0] ?? ''
+ // condition to complete as a single line completion
+ if (
+ prefixToTheLeftOfCursor.trim()
+ && !suffixToTheRightOfCursor.trim()
+ && restOfLineToGenerate.trim()
+ ) {
+
+ const rawNewlineIdx = generatedMiddle.slice(startIdx).indexOf('\n')
+ if (rawNewlineIdx > -1) {
+ // console.log('p3', startIdx, rawNewlineIdx)
+ const newlineIdx = rawNewlineIdx + startIdx;
+ endIdx = Math.min(endIdx, newlineIdx)
+ }
+ }
+
+ // // if a generated line matches with a suffix line, stop
+ // if (suffixLines.length > 1) {
+ // console.log('4')
+ // const lines = []
+ // for (const generatedLine of generatedLines) {
+ // if (suffixLines.slice(0, 10).some(suffixLine =>
+ // generatedLine.trim() !== '' && suffixLine.trim() !== ''
+ // && generatedLine.trim().startsWith(suffixLine.trim())
+ // )) break;
+ // lines.push(generatedLine)
+ // }
+ // endIdx = lines.join('\n').length // this is hacky, remove or refactor in future
+ // }
+
+ // console.log('pFinal', startIdx, endIdx)
+ let completionStr = generatedMiddle.slice(startIdx, endIdx)
+
+ // filter out unbalanced parentheses
+ completionStr = getStringUpToUnbalancedParenthesis(completionStr, prefix)
+ // console.log('originalCompletionStr: ', JSON.stringify(generatedMiddle.slice(startIdx)))
+ // console.log('finalCompletionStr: ', JSON.stringify(completionStr))
+
+ let rangeToReplace: Range = new Range(position.lineNumber, position.column, position.lineNumber, position.column)
+
+ return [{
+ insertText: completionStr,
+ range: rangeToReplace,
+ }]
+
+}
+
+
+
+
+
+// returns whether this autocompletion is in the cache
+// const doesPrefixMatchAutocompletion = ({ prefix, autocompletion }: { prefix: string, autocompletion: Autocompletion }): boolean => {
+
+// const originalPrefix = autocompletion.prefix
+// const generatedMiddle = autocompletion.result
+// const originalPrefixTrimmed = trimPrefix(originalPrefix)
+// const currentPrefixTrimmed = trimPrefix(prefix)
+
+// if (currentPrefixTrimmed.length < originalPrefixTrimmed.length) {
+// return false
+// }
+
+// const isMatch = (originalPrefixTrimmed + generatedMiddle).startsWith(currentPrefixTrimmed)
+// return isMatch
+
+// }
+
+const getPrefixAndSuffix = (model: ITextModel, position: Position) => {
+
+ const fullText = model.getValue();
+
+ const cursorOffset = model.getOffsetAt(position)
+ const prefix = fullText.substring(0, cursorOffset)
+ const suffix = fullText.substring(cursorOffset)
+
+ return { prefix, suffix }
+
+}
+
+const getIndex = (str: string, line: number, char: number) => {
+ return str.split('\n').slice(0, line).join('\n').length + (line > 0 ? 1 : 0) + char;
+}
+const getLastLine = (s: string): string => {
+ const matches = s.match(/[^\n]*$/)
+ return matches ? matches[0] : ''
+}
+
+type matchInfo = {
+ lineStart: number,
+ character: number,
+ startIdx: number,
+}
+// returns the startIdx of the match if there is a match, or undefined if there is no match
+// all results are wrt `autocompletion.result`
+const getPrefixAutocompletionMatch = ({ prefix, autocompletion }: { prefix: string, autocompletion: Autocompletion }): matchInfo | undefined => {
+
+ const trimmedCurrentPrefix = removeLeftTabsAndTrimEnd(prefix)
+ const trimmedCompletionPrefix = removeLeftTabsAndTrimEnd(autocompletion.prefix)
+ const trimmedCompletionMiddle = removeLeftTabsAndTrimEnd(autocompletion.insertText)
+
+ // console.log('@result: ', JSON.stringify(autocompletion.insertText))
+ // console.log('@trimmedCurrentPrefix: ', JSON.stringify(trimmedCurrentPrefix))
+ // console.log('@trimmedCompletionPrefix: ', JSON.stringify(trimmedCompletionPrefix))
+ // console.log('@trimmedCompletionMiddle: ', JSON.stringify(trimmedCompletionMiddle))
+
+ if (trimmedCurrentPrefix.length < trimmedCompletionPrefix.length) { // user must write text beyond the original prefix at generation time
+ console.log('@undefined1')
+ return undefined
+ }
+
+ if ( // check that completion starts with the prefix
+ !(trimmedCompletionPrefix + trimmedCompletionMiddle)
+ .startsWith(trimmedCurrentPrefix)
+ ) {
+ console.log('@undefined2')
+ return undefined
+ }
+
+ // reverse map to find position wrt `autocompletion.result`
+ const lineStart =
+ trimmedCurrentPrefix.split('\n').length -
+ trimmedCompletionPrefix.split('\n').length;
+
+ if (lineStart < 0) {
+ console.log('@undefined3')
+
+ console.error('Error: No line found.');
+ return undefined;
+ }
+ const currentPrefixLine = getLastLine(trimmedCurrentPrefix)
+ const completionPrefixLine = lineStart === 0 ? getLastLine(trimmedCompletionPrefix) : ''
+ const completionMiddleLine = autocompletion.insertText.split('\n')[lineStart]
+ const fullCompletionLine = completionPrefixLine + completionMiddleLine
+
+ // console.log('currentPrefixLine', currentPrefixLine)
+ // console.log('completionPrefixLine', completionPrefixLine)
+ // console.log('completionMiddleLine', completionMiddleLine)
+
+ const charMatchIdx = fullCompletionLine.indexOf(currentPrefixLine)
+ if (charMatchIdx < 0) {
+ console.log('@undefined4', charMatchIdx)
+
+ console.error('Warning: Found character with negative index. This should never happen.')
+ return undefined
+ }
+
+ const character = (charMatchIdx +
+ currentPrefixLine.length
+ - completionPrefixLine.length
+ )
+
+ const startIdx = getIndex(autocompletion.insertText, lineStart, character)
+
+ return {
+ lineStart,
+ character,
+ startIdx,
+ }
+
+
+}
+
+
+
+
+const getCompletionOptions = ({ prefix, suffix }: { prefix: string, suffix: string }) => {
+
+ const prefixLines = prefix.split('\n')
+ const suffixLines = suffix.split('\n')
+
+ const prefixToLeftOfCursor = prefixLines.slice(-1)[0] ?? ''
+ const suffixToRightOfCursor = suffixLines[0] ?? ''
+
+ // default parameters
+ let shouldGenerate = true
+ let stopTokens: string[] = ['\n\n', '\r\n\r\n']
+
+ // specific cases
+ if (suffixToRightOfCursor.trim() !== '') { // typing between something
+ stopTokens = ['\n', '\r\n']
+ }
+
+ // if (prefixToLeftOfCursor.trim() === '' && suffixToRightOfCursor.trim() === '') { // at an empty line
+ // stopTokens = ['\n\n', '\r\n\r\n']
+ // }
+
+ if (prefixToLeftOfCursor === '') { // at beginning or end of line
+ shouldGenerate = false
+ }
+
+ return { shouldGenerate, stopTokens }
+
+}
+
+
+
+
+export interface IAutocompleteService {
+ readonly _serviceBrand: undefined;
+}
+
+export const IAutocompleteService = createDecorator('AutocompleteService');
+
+export class AutocompleteService extends Disposable implements IAutocompleteService {
+ _serviceBrand: undefined;
+
+ private _autocompletionId: number = 0;
+ private _autocompletionsOfDocument: { [docUriStr: string]: LRUCache } = {}
+
+ private _lastCompletionTime = 0
+ private _lastPrefix: string = ''
+
+ // used internally by vscode
+ // fires after every keystroke and returns the completion to show
+ async _provideInlineCompletionItems(
+ model: ITextModel,
+ position: Position,
+ context: InlineCompletionContext,
+ token: CancellationToken,
+ ): Promise {
+
+ const disabled = true
+ const testMode = false
+
+ if (disabled) return [];
+
+ const docUriStr = model.uri.toString();
+
+ const { prefix, suffix } = getPrefixAndSuffix(model, position)
+ // initialize cache and other variables
+ // note that whenever an autocompletion is rejected, it is removed from cache
+ if (!this._autocompletionsOfDocument[docUriStr]) {
+ this._autocompletionsOfDocument[docUriStr] = new LRUCache(
+ MAX_CACHE_SIZE,
+ (autocompletion: Autocompletion) => {
+ if (autocompletion.requestId)
+ this._llmMessageService.abort(autocompletion.requestId)
+ }
+ )
+ }
+ this._lastPrefix = prefix
+
+ // print all pending autocompletions
+ // let _numPending = 0
+ // this._autocompletionsOfDocument[docUriStr].items.forEach((a: Autocompletion) => { if (a.status === 'pending') _numPending += 1 })
+ // console.log('@numPending: ' + _numPending)
+
+ // get autocompletion from cache
+ let cachedAutocompletion: Autocompletion | undefined = undefined
+ let matchInfo: matchInfo | undefined = undefined
+ for (const autocompletion of this._autocompletionsOfDocument[docUriStr].items.values()) {
+ // if the user's change matches up with the generated text
+ matchInfo = getPrefixAutocompletionMatch({ prefix, autocompletion })
+ if (matchInfo !== undefined) {
+ cachedAutocompletion = autocompletion
+ break;
+ }
+ }
+
+ // if there is a cached autocompletion, return it
+ if (cachedAutocompletion && matchInfo) {
+
+ // console.log('id: ' + cachedAutocompletion.id)
+
+ if (cachedAutocompletion.status === 'finished') {
+ // console.log('A1')
+
+ const inlineCompletions = toInlineCompletions({ matchInfo, autocompletion: cachedAutocompletion, prefix, suffix, position, debug: true })
+ return inlineCompletions
+
+ } else if (cachedAutocompletion.status === 'pending') {
+ // console.log('A2')
+
+ try {
+ await cachedAutocompletion.llmPromise;
+ const inlineCompletions = toInlineCompletions({ matchInfo, autocompletion: cachedAutocompletion, prefix, suffix, position })
+ return inlineCompletions
+
+ } catch (e) {
+ this._autocompletionsOfDocument[docUriStr].delete(cachedAutocompletion.id)
+ console.error('Error creating autocompletion (1): ' + e)
+ }
+
+ } else if (cachedAutocompletion.status === 'error') {
+ // console.log('A3')
+ }
+
+ return []
+ }
+
+ // else if no more typing happens, then go forwards with the request
+ // wait DEBOUNCE_TIME for the user to stop typing
+ const thisTime = Date.now()
+ this._lastCompletionTime = thisTime
+ const didTypingHappenDuringDebounce = await new Promise((resolve, reject) =>
+ setTimeout(() => {
+ if (this._lastCompletionTime === thisTime) {
+ resolve(false)
+ } else {
+ resolve(true)
+ }
+ }, DEBOUNCE_TIME)
+ )
+
+ // if more typing happened, then do not go forwards with the request
+ if (didTypingHappenDuringDebounce) {
+ return []
+ }
+
+
+ // if there are too many pending requests, cancel the oldest one
+ let numPending = 0
+ let oldestPending: Autocompletion | undefined = undefined
+ for (const autocompletion of this._autocompletionsOfDocument[docUriStr].items.values()) {
+ if (autocompletion.status === 'pending') {
+ numPending += 1
+ if (oldestPending === undefined) {
+ oldestPending = autocompletion
+ }
+ if (numPending >= MAX_PENDING_REQUESTS) {
+ // cancel the oldest pending request and remove it from cache
+ this._autocompletionsOfDocument[docUriStr].delete(oldestPending.id)
+ break
+ }
+ }
+ }
+
+ const { shouldGenerate, stopTokens: _ } = getCompletionOptions({ prefix, suffix }) // TODO mat
+
+ if (!shouldGenerate) return []
+
+ if (testMode && this._autocompletionId !== 0) { // TODO remove this
+ return []
+ }
+
+ // console.log('B')
+
+ // create a new autocompletion and add it to cache
+ const newAutocompletion: Autocompletion = {
+ id: this._autocompletionId++,
+ prefix: prefix,
+ suffix: suffix,
+ startTime: Date.now(),
+ endTime: undefined,
+ status: 'pending',
+ llmPromise: undefined,
+ insertText: '',
+ requestId: null,
+ }
+
+ // set parameters of `newAutocompletion` appropriately
+ newAutocompletion.llmPromise = new Promise((resolve, reject) => {
+
+ const requestId = this._llmMessageService.sendLLMMessage({
+ logging: { loggingName: 'Autocomplete' },
+ messages: [],
+ onText: async ({ newText, fullText }) => {
+
+ newAutocompletion.insertText = fullText
+
+ // if generation doesn't match the prefix for the first few tokens generated, reject it
+ if (!getPrefixAutocompletionMatch({ prefix: this._lastPrefix, autocompletion: newAutocompletion })) {
+ reject('LLM response did not match user\'s text.')
+ }
+ },
+ onFinalMessage: ({ fullText }) => {
+
+ // newAutocompletion.prefix = prefix
+ // newAutocompletion.suffix = suffix
+ // newAutocompletion.startTime = Date.now()
+ newAutocompletion.endTime = Date.now()
+ // newAutocompletion.abortRef = { current: () => { } }
+ newAutocompletion.status = 'finished'
+ // newAutocompletion.promise = undefined
+ newAutocompletion.insertText = postprocessResult(extractCodeFromResult(fullText))
+
+ resolve(newAutocompletion.insertText)
+
+ },
+ onError: ({ message }) => {
+ newAutocompletion.endTime = Date.now()
+ newAutocompletion.status = 'error'
+ reject(message)
+ },
+ featureName: 'Autocomplete',
+ range: { startLineNumber: position.lineNumber, startColumn: position.column, endLineNumber: position.lineNumber, endColumn: position.column },
+ })
+ newAutocompletion.requestId = requestId
+
+ // if the request hasnt resolved in TIMEOUT_TIME seconds, reject it
+ setTimeout(() => {
+ if (newAutocompletion.status === 'pending') {
+ reject('Timeout receiving message to LLM.')
+ }
+ }, TIMEOUT_TIME)
+
+ })
+
+
+
+ // add autocompletion to cache
+ this._autocompletionsOfDocument[docUriStr].set(newAutocompletion.id, newAutocompletion)
+
+ // show autocompletion
+ try {
+ await newAutocompletion.llmPromise
+ // console.log('id: ' + newAutocompletion.id)
+
+ const matchInfo: matchInfo = { startIdx: 0, lineStart: 0, character: 0 }
+ const inlineCompletions = toInlineCompletions({ matchInfo, autocompletion: newAutocompletion, prefix, suffix, position })
+ return inlineCompletions
+
+ } catch (e) {
+ this._autocompletionsOfDocument[docUriStr].delete(newAutocompletion.id)
+ console.error('Error creating autocompletion (2): ' + e)
+ return []
+ }
+
+ }
+
+ constructor(
+ @ILanguageFeaturesService private _langFeatureService: ILanguageFeaturesService,
+ @ILLMMessageService private readonly _llmMessageService: ILLMMessageService,
+ @IEditorService private readonly _editorService: IEditorService,
+ @IModelService private readonly _modelService: IModelService,
+ ) {
+ super()
+
+ this._langFeatureService.inlineCompletionsProvider.register('*', {
+ provideInlineCompletions: async (model, position, context, token) => {
+ const items = await this._provideInlineCompletionItems(model, position, context, token)
+
+ // console.log('item: ', items?.[0]?.insertText)
+ return { items: items, }
+ },
+ freeInlineCompletions: (completions) => {
+
+ // get the `docUriStr` and the `position` of the cursor
+ const activePane = this._editorService.activeEditorPane;
+ if (!activePane) return;
+ const control = activePane.getControl();
+ if (!control || !isCodeEditor(control)) return;
+ const position = control.getPosition();
+ if (!position) return;
+ const resource = EditorResourceAccessor.getCanonicalUri(this._editorService.activeEditor);
+ if (!resource) return;
+ const model = this._modelService.getModel(resource)
+ if (!model) return;
+ const docUriStr = resource.toString();
+
+ const { prefix, } = getPrefixAndSuffix(model, position)
+
+ if (!this._autocompletionsOfDocument[docUriStr]) return;
+
+ // go through cached items and remove matching ones
+ // autocompletion.prefix + autocompletion.insertedText ~== insertedText
+ completions.items.forEach(item => {
+ this._autocompletionsOfDocument[docUriStr].items.forEach((autocompletion: Autocompletion) => {
+ if (removeLeftTabsAndTrimEnd(prefix)
+ === removeLeftTabsAndTrimEnd(autocompletion.prefix + autocompletion.insertText)
+ ) {
+ this._autocompletionsOfDocument[docUriStr].delete(autocompletion.id);
+ }
+ });
+ });
+
+ },
+ })
+
+
+ }
+
+
+}
+
+
+registerSingleton(IAutocompleteService, AutocompleteService, InstantiationType.Eager);
diff --git a/src/vs/workbench/contrib/void/browser/findDiffs.ts b/src/vs/workbench/contrib/void/browser/helpers/findDiffs.ts
similarity index 98%
rename from src/vs/workbench/contrib/void/browser/findDiffs.ts
rename to src/vs/workbench/contrib/void/browser/helpers/findDiffs.ts
index fac7f3db..8586a3ca 100644
--- a/src/vs/workbench/contrib/void/browser/findDiffs.ts
+++ b/src/vs/workbench/contrib/void/browser/helpers/findDiffs.ts
@@ -1,9 +1,9 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Glass Devtools, Inc. All rights reserved.
- * Void Editor additions licensed under the AGPLv3 License.
+ * Void Editor additions licensed under the AGPL 3.0 License.
*--------------------------------------------------------------------------------------------*/
-import { diffLines } from './react/out/util/diffLines.js'
+import { diffLines } from '../react/out/diff/index.js'
export type ComputedDiff = {
type: 'edit';
diff --git a/src/vs/workbench/contrib/void/browser/getCmdKey.ts b/src/vs/workbench/contrib/void/browser/helpers/getCmdKey.ts
similarity index 56%
rename from src/vs/workbench/contrib/void/browser/getCmdKey.ts
rename to src/vs/workbench/contrib/void/browser/helpers/getCmdKey.ts
index 76344138..fe520e42 100644
--- a/src/vs/workbench/contrib/void/browser/getCmdKey.ts
+++ b/src/vs/workbench/contrib/void/browser/helpers/getCmdKey.ts
@@ -1,12 +1,14 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Glass Devtools, Inc. All rights reserved.
- * Void Editor additions licensed under the AGPLv3 License.
+ * Void Editor additions licensed under the AGPL 3.0 License.
*--------------------------------------------------------------------------------------------*/
-import { OperatingSystem, OS } from '../../../../base/common/platform.js';
+import { isMacintosh } from '../../../../../base/common/platform.js';
+// import { OperatingSystem, OS } from '../../../../base/common/platform.js';
+// OS === OperatingSystem.Macintosh
export function getCmdKey(): string {
- if (OS === OperatingSystem.Macintosh) {
+ if (isMacintosh) {
return '⌘';
} else {
return 'Ctrl';
diff --git a/src/vs/workbench/contrib/void/browser/helpers/reactServicesHelper.ts b/src/vs/workbench/contrib/void/browser/helpers/reactServicesHelper.ts
new file mode 100644
index 00000000..08ad3fdb
--- /dev/null
+++ b/src/vs/workbench/contrib/void/browser/helpers/reactServicesHelper.ts
@@ -0,0 +1,54 @@
+import { ServicesAccessor } from '../../../../../editor/browser/editorExtensions.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.js';
+import { IContextViewService, IContextMenuService } from '../../../../../platform/contextview/browser/contextView.js';
+import { IFileService } from '../../../../../platform/files/common/files.js';
+import { IHoverService } from '../../../../../platform/hover/browser/hover.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { ILLMMessageService } from '../../../../../platform/void/common/llmMessageService.js';
+import { IRefreshModelService } from '../../../../../platform/void/common/refreshModelService.js';
+import { IVoidSettingsService } from '../../../../../platform/void/common/voidSettingsService.js';
+import { IInlineDiffsService } from '../inlineDiffsService.js';
+import { IQuickEditStateService } from '../quickEditStateService.js';
+import { ISidebarStateService } from '../sidebarStateService.js';
+import { IThreadHistoryService } from '../threadHistoryService.js';
+
+export type ReactServicesType = {
+ quickEditStateService: IQuickEditStateService;
+ sidebarStateService: ISidebarStateService;
+ settingsStateService: IVoidSettingsService;
+ threadsStateService: IThreadHistoryService;
+ fileService: IFileService;
+ modelService: IModelService;
+ inlineDiffService: IInlineDiffsService;
+ llmMessageService: ILLMMessageService;
+ clipboardService: IClipboardService;
+ refreshModelService: IRefreshModelService;
+
+ themeService: IThemeService,
+ hoverService: IHoverService,
+
+ contextViewService: IContextViewService;
+ contextMenuService: IContextMenuService;
+}
+
+
+export const getReactServices = (accessor: ServicesAccessor): ReactServicesType => {
+ return {
+ quickEditStateService: accessor.get(IQuickEditStateService),
+ settingsStateService: accessor.get(IVoidSettingsService),
+ sidebarStateService: accessor.get(ISidebarStateService),
+ threadsStateService: accessor.get(IThreadHistoryService),
+ fileService: accessor.get(IFileService),
+ modelService: accessor.get(IModelService),
+ inlineDiffService: accessor.get(IInlineDiffsService),
+ llmMessageService: accessor.get(ILLMMessageService),
+ clipboardService: accessor.get(IClipboardService),
+ themeService: accessor.get(IThemeService),
+ hoverService: accessor.get(IHoverService),
+ refreshModelService: accessor.get(IRefreshModelService),
+ contextViewService: accessor.get(IContextViewService),
+ contextMenuService: accessor.get(IContextMenuService),
+ }
+}
+
diff --git a/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts b/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts
similarity index 94%
rename from src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts
rename to src/vs/workbench/contrib/void/browser/inlineDiffsService.ts
index dba595c6..e33c9991 100644
--- a/src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts
+++ b/src/vs/workbench/contrib/void/browser/inlineDiffsService.ts
@@ -1,6 +1,6 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Glass Devtools, Inc. All rights reserved.
- * Void Editor additions licensed under the AGPLv3 License.
+ * Void Editor additions licensed under the AGPL 3.0 License.
*--------------------------------------------------------------------------------------------*/
import { Disposable } from '../../../../base/common/lifecycle.js';
@@ -11,9 +11,8 @@ import { ICodeEditor, IOverlayWidget, IViewZone } from '../../../../editor/brows
// import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.js';
import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
// import { throttle } from '../../../../base/common/decorators.js';
-import { IVoidConfigStateService } from './registerConfig.js';
-import { writeFileWithDiffInstructions } from './prompt/systemPrompts.js';
-import { ComputedDiff, findDiffs } from './findDiffs.js';
+import { writeFileWithDiffInstructions } from './prompt/prompts.js';
+import { ComputedDiff, findDiffs } from './helpers/findDiffs.js';
import { EndOfLinePreference, ITextModel } from '../../../../editor/common/model.js';
import { IRange } from '../../../../editor/common/core/range.js';
import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
@@ -28,8 +27,8 @@ import { ILanguageService } from '../../../../editor/common/languages/language.j
import * as dom from '../../../../base/browser/dom.js';
import { Widget } from '../../../../base/browser/ui/widget.js';
import { URI } from '../../../../base/common/uri.js';
-import { LLMMessageServiceParams } from '../../../../platform/void/common/llmMessageTypes.js';
-import { ISendLLMMessageService } from '../../../../platform/void/browser/llmMessageService.js';
+import { LLMFeatureSelection, ServiceSendLLMMessageParams } from '../../../../platform/void/common/llmMessageTypes.js';
+import { ILLMMessageService } from '../../../../platform/void/common/llmMessageService.js';
// gets converted to --vscode-void-greenBG, see void.css
@@ -103,17 +102,17 @@ type HistorySnapshot = {
entireFileCode: string;
} &
({
- type: 'ctrl+k';
+ type: 'Ctrl+K';
ctrlKText: string;
} | {
- type: 'ctrl+l';
+ type: 'Ctrl+L';
})
+
export interface IInlineDiffsService {
readonly _serviceBrand: undefined;
- startStreaming(type: 'ctrl+k' | 'ctrl+l', userMessage: string): void;
-
+ startStreaming(params: LLMFeatureSelection, str: string): void;
}
export const IInlineDiffsService = createDecorator('inlineDiffAreasService');
@@ -144,12 +143,11 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
constructor(
// @IHistoryService private readonly _historyService: IHistoryService, // history service is the history of pressing alt left/right
- @IVoidConfigStateService private readonly _voidConfigStateService: IVoidConfigStateService,
@ICodeEditorService private readonly _editorService: ICodeEditorService,
@IModelService private readonly _modelService: IModelService,
@IUndoRedoService private readonly _undoRedoService: IUndoRedoService, // undoRedo service is the history of pressing ctrl+z
@ILanguageService private readonly _langService: ILanguageService,
- @ISendLLMMessageService private readonly _sendLLMMessageService: ISendLLMMessageService,
+ @ILLMMessageService private readonly _llmMessageService: ILLMMessageService,
) {
super();
@@ -370,7 +368,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
return {
snapshottedDiffAreaOfId,
entireFileCode: this._readURI(uri) ?? '', // the whole file's code
- type: 'ctrl+l',
+ type: 'Ctrl+L',
}
}
@@ -637,7 +635,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
- private async _initializeStream(uri: URI, diffRepr: string) {
+ private async _initializeStream(opts: LLMFeatureSelection, diffRepr: string, uri: URI,) {
// diff area begin and end line
const numLines = this._getNumLines(uri)
@@ -689,7 +687,6 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
this.diffAreaOfId[diffArea.diffareaid] = diffArea
// actually call the LLM
- const { voidConfig } = this._voidConfigStateService.state
const promptContent = `\
ORIGINAL_CODE
\`\`\`
@@ -706,34 +703,11 @@ Please finish writing the new file by applying the diff to the original file. Re
`
- // CTRL+K prompt:
- // const promptContent = `Here is the user's original selection:
- // \`\`\`
- // ${selection}
- // \`\`\`
-
- // The user wants to apply the following instructions to the selection:
- // ${instructions}
-
- // Please rewrite the selection following the user's instructions.
-
- // Instructions to follow:
- // 1. Follow the user's instructions
- // 2. You may ONLY CHANGE the selection, and nothing else in the file
- // 3. Make sure all brackets in the new selection are balanced the same was as in the original selection
- // 3. Be careful not to duplicate or remove variables, comments, or other syntax by mistake
-
- // Complete the following:
- // \`\`\`
- // ${prefix}
- // ${suffix}
- // `;
-
await new Promise((resolve, reject) => {
let streamRequestId: string | null = null
- const object: LLMMessageServiceParams = {
+ const object: ServiceSendLLMMessageParams = {
logging: { loggingName: 'streamChunk' },
messages: [
{ role: 'system', content: writeFileWithDiffInstructions, },
@@ -756,15 +730,15 @@ Please finish writing the new file by applying the diff to the original file. Re
console.error('Error rewriting file with diff', e);
// TODO indicate there was an error
if (streamRequestId)
- this._sendLLMMessageService.abort(streamRequestId)
+ this._llmMessageService.abort(streamRequestId)
diffArea._sweepState = { isStreaming: false, line: null }
resolve();
},
- voidConfig,
+ ...opts
}
- streamRequestId = this._sendLLMMessageService.sendLLMMessage(object)
+ streamRequestId = this._llmMessageService.sendLLMMessage(object)
})
onFinishEdit()
@@ -776,7 +750,7 @@ Please finish writing the new file by applying the diff to the original file. Re
- async startStreaming(type: 'ctrl+k' | 'ctrl+l', userMessage: string) {
+ async startStreaming(opts: LLMFeatureSelection, userMessage: string) {
const editor = this._editorService.getActiveCodeEditor()
if (!editor) return
@@ -788,7 +762,7 @@ Please finish writing the new file by applying the diff to the original file. Re
// TODO deselect user's cursor
- this._initializeStream(uri, userMessage)
+ this._initializeStream(opts, userMessage, uri)
}
diff --git a/src/vs/workbench/contrib/void/browser/media/void.css b/src/vs/workbench/contrib/void/browser/media/void.css
index 90c274ba..cf317680 100644
--- a/src/vs/workbench/contrib/void/browser/media/void.css
+++ b/src/vs/workbench/contrib/void/browser/media/void.css
@@ -1,4 +1,9 @@
-.monaco-editor .void-sweepIdxBG {
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Glass Devtools, Inc. All rights reserved.
+ * Void Editor additions licensed under the AGPL 3.0 License.
+ *--------------------------------------------------------------------------------------------*/
+
+ .monaco-editor .void-sweepIdxBG {
background-color: var(--vscode-void-sweepIdxBG);
}
diff --git a/src/vs/workbench/contrib/void/browser/prompt/systemPrompts.ts b/src/vs/workbench/contrib/void/browser/prompt/prompts.ts
similarity index 69%
rename from src/vs/workbench/contrib/void/browser/prompt/systemPrompts.ts
rename to src/vs/workbench/contrib/void/browser/prompt/prompts.ts
index 2faa8909..803029c2 100644
--- a/src/vs/workbench/contrib/void/browser/prompt/systemPrompts.ts
+++ b/src/vs/workbench/contrib/void/browser/prompt/prompts.ts
@@ -1,12 +1,146 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Glass Devtools, Inc. All rights reserved.
+ * Void Editor additions licensed under the AGPL 3.0 License.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { CodeSelection } from '../threadHistoryService.js';
+
+const stringifySelections = (selections: CodeSelection[]) => {
+
+ return selections.map(({ fileURI, content, selectionStr }) =>
+ `\
+File: ${fileURI.fsPath}
+\`\`\`
+${content // this was the enite file which is foolish
+ }
+\`\`\`${selectionStr === null ? '' : `
+Selection: ${selectionStr}`}
+`).join('\n')
+}
+
+
+export const generateCtrlLPrompt = (instructions: string, selections: CodeSelection[] | null) => {
+ let str = '';
+ if (selections && selections.length > 0) {
+ str += stringifySelections(selections);
+ str += `Please edit the selected code following these instructions:\n`
+ }
+ str += `${instructions}`;
+ return str;
+};
-// // used for ctrl+l
-// const partialGenerationInstructions = ``
+export const ctrlLSystem = `\
+You are a coding assistant. You are given a list of relevant files \`files\`, a selection that the user is making \`selection\`, and instructions to follow \`instructions\`.
+Please edit the selected file following the user's instructions (or, if appropriate, answer their question instead).
-// // used for ctrl+k, autocomplete
-// const fimInstructions = ``
+Instructions:
+1. Output the changes to make to the entire file.
+1. Do not re-write the entire file.
+3. Instead, you may use code elision to represent unchanged portions of code. For example, write "existing code..." in code comments.
+4. You must give enough context to apply the change in the correct location.
+
+## EXAMPLE
+
+FILES
+selected file \`math.ts\`:
+\`\`\`
+const addNumbers = (a, b) => a + b
+const subtractNumbers = (a, b) => a - b
+const divideNumbers = (a, b) => a / b
+\`\`\`
+
+SELECTION
+\`\`\`
+const subtractNumbers = (a, b) => a - b
+\`\`\`
+
+INSTRUCTIONS
+\`\`\`
+add a function that multiplies numbers below this
+\`\`\`
+
+EXPECTED OUTPUT
+We can add the following code to the file:
+\`\`\`
+// existing code...
+const subtractNumbers = (a, b) => a - b;
+const multiplyNumbers = (a, b) => a * b;
+// existing code...
+\`\`\`
+
+## EXAMPLE
+
+FILES
+selected file \`fib.ts\`:
+\`\`\`
+
+const dfs = (root) => {
+ if (!root) return;
+ console.log(root.val);
+ dfs(root.left);
+ dfs(root.right);
+}
+const fib = (n) => {
+ if (n < 1) return 1
+ return fib(n - 1) + fib(n - 2)
+}
+\`\`\`
+
+SELECTION
+\`\`\`
+ return fib(n - 1) + fib(n - 2)
+\`\`\`
+
+INSTRUCTIONS
+\`\`\`
+memoize results
+\`\`\`
+
+EXPECTED OUTPUT
+To implement memoization in your Fibonacci function, you can use a JavaScript object to store previously computed results. This will help avoid redundant calculations and improve performance. Here's how you can modify your function:
+\`\`\`
+// existing code...
+const fib = (n, memo = {}) => {
+ if (n < 1) return 1;
+ if (memo[n]) return memo[n]; // Check if result is already computed
+ memo[n] = fib(n - 1, memo) + fib(n - 2, memo); // Store result in memo
+ return memo[n];
+}
+\`\`\`
+Explanation:
+Memoization Object: A memo object is used to store the results of Fibonacci calculations for each n.
+Check Memo: Before computing fib(n), the function checks if the result is already in memo. If it is, it returns the stored result.
+Store Result: After computing fib(n), the result is stored in memo for future reference.
+
+## END EXAMPLES\
+`
+
+export const generateCtrlKPrompt = ({ selection, prefix, suffix, instructions, }: { selection: string, prefix: string, suffix: string, instructions: string, }) => `\
+Here is the user's original selection:
+\`\`\`
+${selection}
+\`\`\`
+
+The user wants to apply the following instructions to the selection:
+${instructions}
+
+Please rewrite the selection following the user's instructions.
+
+Instructions to follow:
+1. Follow the user's instructions
+2. You may ONLY CHANGE the selection, and nothing else in the file
+3. Make sure all brackets in the new selection are balanced the same was as in the original selection
+3. Be careful not to duplicate or remove variables, comments, or other syntax by mistake
+
+Complete the following:
+\`\`\`
+${prefix}
+${suffix}
+`;
export const generateDiffInstructions = `
diff --git a/src/vs/workbench/contrib/void/browser/prompt/stringifyFiles.ts b/src/vs/workbench/contrib/void/browser/prompt/stringifyFiles.ts
deleted file mode 100644
index 11056b43..00000000
--- a/src/vs/workbench/contrib/void/browser/prompt/stringifyFiles.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-
-import { CodeSelection } from '../registerThreads.js';
-
-export const filesStr = (selections: CodeSelection[]) => {
-
- return selections.map(({ fileURI, content, selectionStr }) =>
- `\
-File: ${fileURI.fsPath}
-\`\`\`
-${content}
-\`\`\`${selectionStr === null ? '' : `
-Selection: ${selectionStr}`}
-`).join('\n')
-}
-
-
-export const userInstructionsStr = (instructions: string, selections: CodeSelection[] | null) => {
- let str = '';
- if (selections && selections.length > 0) {
- str += filesStr(selections);
- str += `Please edit the selected code following these instructions:\n`
- }
- str += `${instructions}`;
- return str;
-};
diff --git a/src/vs/workbench/contrib/void/browser/quickEditActions.ts b/src/vs/workbench/contrib/void/browser/quickEditActions.ts
new file mode 100644
index 00000000..784011d2
--- /dev/null
+++ b/src/vs/workbench/contrib/void/browser/quickEditActions.ts
@@ -0,0 +1,138 @@
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { ICodeEditor, IViewZone } from '../../../../editor/browser/editorBrowser.js';
+import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { createDecorator, IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { IMetricsService } from '../../../../platform/void/common/metricsService.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
+// import { IInlineDiffService } from '../../../../editor/browser/services/inlineDiffService/inlineDiffService.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { mountCtrlK } from './react/out/ctrl-k-tsx/index.js';
+import { getReactServices } from './helpers/reactServicesHelper.js';
+import { URI } from '../../../../base/common/uri.js';
+
+
+type InitialZone = { uri: URI, startLine: number, selectedText: string, }
+
+export type QuickEditPropsType = {
+ quickEditId: number,
+}
+
+export type QuickEdit = {
+ startLine: number, // 0-indexed
+ beforeCode: string,
+ afterCode?: string,
+ instructions?: string,
+ responseText?: string, // model can produce a text response too
+}
+
+
+export interface IQuickEditService {
+ readonly _serviceBrand: undefined;
+ readonly onDidChangeState: Event;
+ addZone(zone: InitialZone): void;
+}
+
+export const IQuickEditService = createDecorator('voidQuickEditService');
+class VoidQuickEditService extends Disposable implements IQuickEditService {
+ _serviceBrand: undefined;
+
+ quickEditId: number = 0
+
+ private readonly _onDidChangeState = new Emitter();
+ readonly onDidChangeState: Event = this._onDidChangeState.event;
+
+ // state
+ // state: {}
+
+ constructor(
+ // @IInlineDiffService private readonly _inlineDiffService: IInlineDiffService,
+ @ICodeEditorService private readonly _editorService: ICodeEditorService,
+ @IInstantiationService private readonly _instantiationService: IInstantiationService,
+ ) {
+ super();
+ }
+
+ addZone(zone: InitialZone) {
+
+ const addZoneToEditor = (editor: ICodeEditor) => {
+
+ const model = editor.getModel()
+ if (!model) return
+
+ editor.changeViewZones(accessor => {
+
+ const domNode = document.createElement('div');
+ domNode.style.zIndex = '1'
+
+ // domNode.className = 'void-redBG'
+ const viewZone: IViewZone = {
+ // afterLineNumber: computedDiff.startLine - 1,
+ afterLineNumber: 1,
+ heightInPx: 100,
+ // heightInLines: 1,
+ // minWidthInPx: 200,
+ domNode: domNode,
+ // marginDomNode: document.createElement('div'), // displayed to left
+ suppressMouseDown: false,
+ };
+
+ // const zoneId =
+ accessor.addZone(viewZone)
+
+ this._instantiationService.invokeFunction(accessor => {
+ const services = getReactServices(accessor)
+
+ const props: QuickEditPropsType = {
+ quickEditId: this.quickEditId++,
+ }
+ mountCtrlK(domNode, services, props)
+ })
+
+ // disposeInThisEditorFns.push(() => { editor.changeViewZones(accessor => { if (zoneId) accessor.removeZone(zoneId) }) })
+ })
+ }
+
+
+ const editors = this._editorService.listCodeEditors().filter(editor => editor.getModel()?.uri.fsPath === zone.uri.fsPath)
+ for (const editor of editors) {
+ addZoneToEditor(editor)
+ }
+ }
+
+}
+
+registerSingleton(IQuickEditService, VoidQuickEditService, InstantiationType.Eager);
+
+
+
+export const VOID_CTRL_K_ACTION_ID = 'void.ctrlKAction'
+registerAction2(class extends Action2 {
+ constructor() {
+ super({ id: VOID_CTRL_K_ACTION_ID, title: 'Void: Quick Edit', keybinding: { primary: KeyMod.CtrlCmd | KeyCode.KeyK, weight: KeybindingWeight.BuiltinExtension } });
+ }
+ async run(accessor: ServicesAccessor): Promise {
+
+ const quickEditService = accessor.get(IQuickEditService)
+ const editorService = accessor.get(ICodeEditorService)
+
+ const metricsService = accessor.get(IMetricsService)
+ metricsService.capture('User Action', { type: 'Open Ctrl+K' })
+
+ const editor = editorService.getActiveCodeEditor()
+ if (!editor) return;
+ const model = editor.getModel()
+ if (!model) return;
+ const selection = editor.getSelection()
+ if (!selection) return;
+
+ const uri = model.uri
+ const startLine = selection.startLineNumber
+ const selectedText = model.getValueInRange(selection)
+
+ quickEditService.addZone({ uri, startLine, selectedText, })
+
+ }
+});
diff --git a/src/vs/workbench/contrib/void/browser/quickEditStateService.ts b/src/vs/workbench/contrib/void/browser/quickEditStateService.ts
new file mode 100644
index 00000000..355b52f1
--- /dev/null
+++ b/src/vs/workbench/contrib/void/browser/quickEditStateService.ts
@@ -0,0 +1,82 @@
+import { Emitter, Event } from '../../../../base/common/event.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+import { QuickEdit } from './quickEditActions.js';
+
+
+
+// service that manages state
+export type VoidQuickEditState = {
+ quickEditsOfDocument: { [uri: string]: QuickEdit }
+}
+
+export interface IQuickEditStateService {
+ readonly _serviceBrand: undefined;
+
+ readonly state: VoidQuickEditState; // readonly to the user
+ setState(newState: Partial): void;
+ onDidChangeState: Event;
+
+ onDidFocusChat: Event;
+ onDidBlurChat: Event;
+ fireFocusChat(): void;
+ fireBlurChat(): void;
+
+}
+
+export const IQuickEditStateService = createDecorator('voidQuickEditStateService');
+class VoidQuickEditStateService extends Disposable implements IQuickEditStateService {
+ _serviceBrand: undefined;
+
+ static readonly ID = 'voidQuickEditStateService';
+
+ private readonly _onDidChangeState = new Emitter();
+ readonly onDidChangeState: Event = this._onDidChangeState.event;
+
+ private readonly _onFocusChat = new Emitter();
+ readonly onDidFocusChat: Event = this._onFocusChat.event;
+
+ private readonly _onBlurChat = new Emitter();
+ readonly onDidBlurChat: Event = this._onBlurChat.event;
+
+
+ // state
+ state: VoidQuickEditState
+
+ constructor(
+ // @IViewsService private readonly _viewsService: IViewsService,
+ ) {
+ super()
+
+ // initial state
+ this.state = { quickEditsOfDocument: {} }
+ }
+
+
+ setState(newState: Partial) {
+ // make sure view is open if the tab changes
+ // if ('currentTab' in newState) {
+ // this.addQuickEdit()
+ // }
+
+ this.state = { ...this.state, ...newState }
+ this._onDidChangeState.fire()
+ }
+
+ fireFocusChat() {
+ this._onFocusChat.fire()
+ }
+
+ fireBlurChat() {
+ this._onBlurChat.fire()
+ }
+
+ // addQuickEdit() {
+ // this._viewsService.openViewContainer(VOID_VIEW_CONTAINER_ID);
+ // this._viewsService.openView(VOID_VIEW_ID);
+ // }
+
+}
+
+registerSingleton(IQuickEditStateService, VoidQuickEditStateService, InstantiationType.Eager);
diff --git a/src/vs/workbench/contrib/void/browser/react/build.js b/src/vs/workbench/contrib/void/browser/react/build.js
index 481591da..118e2eaa 100755
--- a/src/vs/workbench/contrib/void/browser/react/build.js
+++ b/src/vs/workbench/contrib/void/browser/react/build.js
@@ -1,13 +1,65 @@
-import { execSync } from 'child_process';
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Glass Devtools, Inc. All rights reserved.
+ * Void Editor additions licensed under the AGPL 3.0 License.
+ *--------------------------------------------------------------------------------------------*/
-// clear temp dirs
-execSync('npx rimraf out/ && npx rimraf src2/')
+import { spawn, execSync } from 'child_process';
-// build and scope tailwind
-execSync('npx scope-tailwind ./src -o src2/ -s void-scope -c styles.css -p "prefix-" ')
+const args = process.argv.slice(2);
+const isWatch = args.includes('--watch') || args.includes('-w');
-// tsup to build src2/ into out/
-execSync('npx tsup')
+if (isWatch) {
+ // Watch mode
+ // Create a watcher for scope-tailwind using nodemon
+ const scopeTailwindWatcher = spawn('npx', [
+ 'nodemon',
+ '--watch', 'src',
+ '--ext', 'ts,tsx,css',
+ '--exec',
+ 'npx scope-tailwind ./src -o src2/ -s void-scope -c styles.css -p "void-"'
+ ]);
+ // Create a watcher for tsup in watch mode
+ const tsupWatcher = spawn('npx', [
+ 'tsup',
+ '--watch'
+ ]);
-console.log('✅ Done building! Kill your build script(s) (Ctrl+D in them), then press Cmd+Shift+B again.')
+ // Handle scope-tailwind watcher output
+ scopeTailwindWatcher.stdout.on('data', (data) => {
+ console.log(`[scope-tailwind] ${data}`);
+ });
+
+ scopeTailwindWatcher.stderr.on('data', (data) => {
+ console.error(`[scope-tailwind] ${data}`);
+ });
+
+ // Handle tsup watcher output
+ tsupWatcher.stdout.on('data', (data) => {
+ console.log(`[tsup] ${data}`);
+ });
+
+ tsupWatcher.stderr.on('data', (data) => {
+ console.error(`[tsup] ${data}`);
+ });
+
+ // Handle process termination
+ process.on('SIGINT', () => {
+ scopeTailwindWatcher.kill();
+ tsupWatcher.kill();
+ process.exit();
+ });
+
+ console.log('🔄 Watchers started! Press Ctrl+C to stop both watchers.');
+} else {
+ // Build mode
+ console.log('📦 Building...');
+
+ // Run scope-tailwind once
+ execSync('npx scope-tailwind ./src -o src2/ -s void-scope -c styles.css -p "void-"', { stdio: 'inherit' });
+
+ // Run tsup once
+ execSync('npx tsup', { stdio: 'inherit' });
+
+ console.log('✅ Build complete!');
+}
diff --git a/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlK.tsx b/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlK.tsx
new file mode 100644
index 00000000..e57acf4a
--- /dev/null
+++ b/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlK.tsx
@@ -0,0 +1,18 @@
+import { useEffect, useState } from 'react'
+import { useIsDark, useSidebarState } from '../util/services.js'
+import ErrorBoundary from '../sidebar-tsx/ErrorBoundary.js'
+import { CtrlKChat } from './CtrlKChat.js'
+import { QuickEditPropsType } from '../../../quickEditActions.js'
+
+export const CtrlK = (props: QuickEditPropsType) => {
+
+ const isDark = useIsDark()
+
+ return
+
+
+
+
+
+}
diff --git a/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlKChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlKChat.tsx
new file mode 100644
index 00000000..edfb3664
--- /dev/null
+++ b/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/CtrlKChat.tsx
@@ -0,0 +1,83 @@
+
+import React, { FormEvent, useCallback, useRef, useState } from 'react';
+import { useSettingsState, useSidebarState, useThreadsState, useQuickEditState, useService } from '../util/services.js';
+import { OnError } from '../../../../../../../platform/void/common/llmMessageTypes.js';
+import { InputBox } from '../../../../../../../base/browser/ui/inputbox/inputBox.js';
+import { getCmdKey } from '../../../helpers/getCmdKey.js';
+import { VoidInputBox } from '../util/inputs.js';
+import { QuickEditPropsType } from '../../../quickEditActions.js';
+
+export const CtrlKChat = (props: QuickEditPropsType) => {
+
+ const inputBoxRef: React.MutableRefObject = useRef(null);
+
+ // -- imported state --
+ // const threadsStateService = useService('service')
+ // const sidebarState = useSidebarState()
+
+ const quickEditState = useQuickEditState()
+
+
+ // -- local state --
+ // state of chat
+ const [messageStream, setMessageStream] = useState(null)
+ const [isLoading, setIsLoading] = useState(false)
+ const latestRequestIdRef = useRef(null)
+ const [latestError, setLatestError] = useState[0] | null>(null)
+
+
+ // state of current message
+ const [instructions, setInstructions] = useState('') // the user's instructions
+ const onChangeText = useCallback((newStr: string) => { setInstructions(newStr) }, [setInstructions])
+ const isDisabled = !instructions.trim()
+
+ const onSubmit = useCallback((e: FormEvent) => {
+ // TODO
+ }, [])
+
+ return
+
+
+
+}
diff --git a/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/index.tsx b/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/index.tsx
new file mode 100644
index 00000000..3b4882d5
--- /dev/null
+++ b/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/index.tsx
@@ -0,0 +1,8 @@
+
+import { mountFnGenerator } from '../util/mountFnGenerator.js'
+import { CtrlK } from './CtrlK.js'
+
+
+export const mountCtrlK = mountFnGenerator(CtrlK)
+
+
diff --git a/src/vs/workbench/contrib/void/browser/react/src/diff/index.tsx b/src/vs/workbench/contrib/void/browser/react/src/diff/index.tsx
new file mode 100644
index 00000000..18584d7b
--- /dev/null
+++ b/src/vs/workbench/contrib/void/browser/react/src/diff/index.tsx
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Glass Devtools, Inc. All rights reserved.
+ * Void Editor additions licensed under the AGPL 3.0 License.
+ *--------------------------------------------------------------------------------------------*/
+
+import { diffLines, Change } from 'diff';
+
+export { diffLines, Change }
diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/BlockCode.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/BlockCode.tsx
index 4773d645..b2c83e66 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/markdown/BlockCode.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/BlockCode.tsx
@@ -1,3 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Glass Devtools, Inc. All rights reserved.
+ * Void Editor additions licensed under the AGPL 3.0 License.
+ *--------------------------------------------------------------------------------------------*/
+
import React, { ReactNode } from "react"
import SyntaxHighlighter from "react-syntax-highlighter";
import { atomOneDarkReasonable } from "react-syntax-highlighter/dist/esm/styles/hljs";
diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/MarkdownRender.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx
similarity index 82%
rename from src/vs/workbench/contrib/void/browser/react/src/markdown/MarkdownRender.tsx
rename to src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx
index e17beb37..c1750d81 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/markdown/MarkdownRender.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx
@@ -1,3 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Glass Devtools, Inc. All rights reserved.
+ * Void Editor additions licensed under the AGPL 3.0 License.
+ *--------------------------------------------------------------------------------------------*/
+
import React, { JSX, useCallback, useEffect, useState } from 'react'
import { marked, MarkedToken, Token } from 'marked'
import { BlockCode } from './BlockCode.js'
@@ -16,6 +21,9 @@ const CodeButtonsOnHover = ({ diffRepr: text }: { diffRepr: string }) => {
const [copyButtonState, setCopyButtonState] = useState(CopyButtonState.Copy)
const inlineDiffService = useService('inlineDiffService')
+ const clipboardService = useService('clipboardService')
+
+
useEffect(() => {
if (copyButtonState !== CopyButtonState.Copy) {
setTimeout(() => {
@@ -25,15 +33,10 @@ const CodeButtonsOnHover = ({ diffRepr: text }: { diffRepr: string }) => {
}, [copyButtonState])
const onCopy = useCallback(() => {
- navigator.clipboard.writeText(text).then(
- () => {
- setCopyButtonState(CopyButtonState.Copied)
- },
- () => {
- setCopyButtonState(CopyButtonState.Error)
- }
- )
- }, [text])
+ clipboardService.writeText(text)
+ .then(() => { setCopyButtonState(CopyButtonState.Copied) })
+ .catch(() => { setCopyButtonState(CopyButtonState.Error) })
+ }, [text, clipboardService])
return <>