From 5134ebc761099c1afc0b93e96a684ff63642077f Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Sun, 27 Apr 2025 23:45:05 -0700 Subject: [PATCH] EOL pref --- src/vs/workbench/contrib/void/browser/autocompleteService.ts | 4 ++-- src/vs/workbench/contrib/void/browser/chatThreadService.ts | 2 +- .../contrib/void/browser/convertToLLMMessageService.ts | 3 ++- src/vs/workbench/contrib/void/browser/editCodeService.ts | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/contrib/void/browser/autocompleteService.ts b/src/vs/workbench/contrib/void/browser/autocompleteService.ts index 95ec65c2..bfd62321 100644 --- a/src/vs/workbench/contrib/void/browser/autocompleteService.ts +++ b/src/vs/workbench/contrib/void/browser/autocompleteService.ts @@ -6,7 +6,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js'; import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js'; import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js'; -import { ITextModel } from '../../../../editor/common/model.js'; +import { EndOfLinePreference, ITextModel } from '../../../../editor/common/model.js'; import { Position } from '../../../../editor/common/core/position.js'; import { InlineCompletion, } from '../../../../editor/common/languages.js'; import { Range } from '../../../../editor/common/core/range.js'; @@ -425,7 +425,7 @@ const toInlineCompletions = ({ autocompletionMatchup, autocompletion, prefixAndS type PrefixAndSuffixInfo = { prefix: string, suffix: string, prefixLines: string[], suffixLines: string[], prefixToTheLeftOfCursor: string, suffixToTheRightOfCursor: string } const getPrefixAndSuffixInfo = (model: ITextModel, position: Position): PrefixAndSuffixInfo => { - const fullText = model.getValue(); + const fullText = model.getValue(EndOfLinePreference.LF); const cursorOffset = model.getOffsetAt(position) const prefix = fullText.substring(0, cursorOffset) diff --git a/src/vs/workbench/contrib/void/browser/chatThreadService.ts b/src/vs/workbench/contrib/void/browser/chatThreadService.ts index b3aa1651..12614595 100644 --- a/src/vs/workbench/contrib/void/browser/chatThreadService.ts +++ b/src/vs/workbench/contrib/void/browser/chatThreadService.ts @@ -799,7 +799,7 @@ class ChatThreadService extends Disposable implements IChatThreadService { // if (fsPath in lastIdxOfURI) continue // if already visisted, don't visit again // const { model } = this._voidModelService.getModelFromFsPath(fsPath) // if (!model) continue - // currStrOfFsPath[fsPath] = model.getValue() + // currStrOfFsPath[fsPath] = model.getValue(EndOfLinePreference.LF) // } return { voidFileSnapshotOfURI } diff --git a/src/vs/workbench/contrib/void/browser/convertToLLMMessageService.ts b/src/vs/workbench/contrib/void/browser/convertToLLMMessageService.ts index 7ed729ae..ea9bc60c 100644 --- a/src/vs/workbench/contrib/void/browser/convertToLLMMessageService.ts +++ b/src/vs/workbench/contrib/void/browser/convertToLLMMessageService.ts @@ -15,6 +15,7 @@ import { IDirectoryStrService } from './directoryStrService.js'; import { ITerminalToolService } from './terminalToolService.js'; import { IVoidModelService } from '../common/voidModelService.js'; import { URI } from '../../../../base/common/uri.js'; +import { EndOfLinePreference } from '../../../../editor/common/model.js'; @@ -447,7 +448,7 @@ class ConvertToLLMMessageService extends Disposable implements IConvertToLLMMess const uri = URI.joinPath(folder.uri, '.voidrules') const { model } = this.voidModelService.getModel(uri) if (!model) continue - voidRules += model.getValue() + '\n\n'; + voidRules += model.getValue(EndOfLinePreference.LF) + '\n\n'; } return voidRules.trim(); } diff --git a/src/vs/workbench/contrib/void/browser/editCodeService.ts b/src/vs/workbench/contrib/void/browser/editCodeService.ts index c42d3139..d6c849df 100644 --- a/src/vs/workbench/contrib/void/browser/editCodeService.ts +++ b/src/vs/workbench/contrib/void/browser/editCodeService.ts @@ -1848,7 +1848,7 @@ class EditCodeService extends Disposable implements IEditCodeService { const [startLine, endLine] = convertOriginalRangeToFinalRange(originalBounds) // console.log('---------adding-------') - // console.log('CURRENT TEXT!!!', { current: model?.getValue() }) + // console.log('CURRENT TEXT!!!', { current: model?.getValue(EndOfLinePreference.LF) }) // console.log('block', deepClone(block)) // console.log('origBounds', originalBounds) // console.log('start end', startLine, endLine)