@vscode/chat-lib 0.0.3 → 0.0.5-0

package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts

@@ -12,6 +12,7 @@ import { Prediction } from '../../../platform/networking/common/fetch';
 import { IChatEndpoint } from '../../../platform/networking/common/networking';
 import { ISimulationTestContext } from '../../../platform/simulationTestContext/common/simulationTestContext';
 import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
+import { ITelemetryService } from '../../../platform/telemetry/common/telemetry';
 import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
 import { Result } from '../../../util/common/result';
 import { ITracer } from '../../../util/common/tracing';
@@ -19,10 +20,10 @@ import { CancellationToken } from '../../../util/vs/base/common/cancellation';
 import { OffsetRange } from '../../../util/vs/editor/common/core/ranges/offsetRange';
 import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
 import { DelaySession } from '../../inlineEdits/common/delayer';
-export declare const IGNORE_TEXT_BEFORE: RegExp;
+import { PromptPieces } from '../common/promptCrafting';
 declare const enum RetryState {
     NotRetrying = 0,
-    RetryingWithExpandedWindow = 1
+    Retrying = 1
 }
 export declare class XtabProvider implements IStatelessNextEditProvider {
     private readonly simulationCtx;
@@ -35,23 +36,28 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
     private readonly langCtxService;
     private readonly langDiagService;
     private readonly ignoreService;
+    private readonly telemetryService;
     static readonly ID = "XtabProvider";
     readonly ID = "XtabProvider";
     readonly dependsOnSelection = true;
     readonly showNextEditPreference = ShowNextEditPreference.Always;
+    private static computeTokens;
     private readonly tracer;
     private readonly delayer;
     private forceUseDefaultModel;
-    constructor(simulationCtx: ISimulationTestContext, instaService: IInstantiationService, workspaceService: IWorkspaceService, diffService: IDiffService, configService: IConfigurationService, expService: IExperimentationService, logService: ILogService, langCtxService: ILanguageContextProviderService, langDiagService: ILanguageDiagnosticsService, ignoreService: IIgnoreService);
+    constructor(simulationCtx: ISimulationTestContext, instaService: IInstantiationService, workspaceService: IWorkspaceService, diffService: IDiffService, configService: IConfigurationService, expService: IExperimentationService, logService: ILogService, langCtxService: ILanguageContextProviderService, langDiagService: ILanguageDiagnosticsService, ignoreService: IIgnoreService, telemetryService: ITelemetryService);
     handleAcceptance(): void;
     handleRejection(): void;
     provideNextEdit(request: StatelessNextEditRequest, pushEdit: PushEdit, logContext: InlineEditRequestLogContext, cancellationToken: CancellationToken): Promise<StatelessNextEditResult>;
     private filterEdit;
     _provideNextEdit(request: StatelessNextEditRequest, pushEdit: PushEdit, logContext: InlineEditRequestLogContext, cancellationToken: CancellationToken): Promise<StatelessNextEditResult>;
     private doGetNextEdit;
+    private doGetNextEditWithSelection;
+    private constructTaggedFile;
+    private getAndProcessLanguageContext;
     private getLanguageContext;
     streamEdits(request: StatelessNextEditRequest, pushEdit: PushEdit, endpoint: IChatEndpoint, messages: Raw.ChatMessage[], editWindow: OffsetRange, editWindowLines: string[], cursorOriginalLinesOffset: number, cursorLineOffset: number, // cursor offset within the line it's in; 1-based
-    editWindowLineRange: OffsetRange, prediction: Prediction | undefined, opts: {
+    editWindowLineRange: OffsetRange, promptPieces: PromptPieces, prediction: Prediction | undefined, opts: {
         promptingStrategy: xtabPromptOptions.PromptingStrategy | undefined;
         shouldRemoveCursorTagFromResponse: boolean;
         retryState: RetryState;
@@ -59,9 +65,11 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
     private pushNoSuggestionsOrRetry;
     private computeAreaAroundEditWindowLinesRange;
     private computeEditWindowLinesRange;
-    static getBacktickSection(text: string): string;
     private static mapChatFetcherErrorToNoNextEditReason;
-    private determinePromptOptions;
+    private determineModelConfiguration;
+    private overrideByStringModelConfig;
+    private static overrideModelConfig;
+    private predictNextCursorPosition;
     private determinePromptingStrategy;
     private pickSystemPrompt;
     private determineLanguageContextOptions;
@@ -72,5 +80,14 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
     private enforceArtificialDelay;
     private trace;
 }
+/**
+ * Finds the range of lines containing merge conflict markers within a specified edit window.
+ *
+ * @param lines - Array of strings representing the lines of text to search through
+ * @param editWindowRange - The range within which to search for merge conflict markers
+ * @param maxMergeConflictLines - Maximum number of lines to search for conflict markers
+ * @returns An OffsetRange object representing the start and end of the conflict markers, or undefined if not found
+ */
+export declare function findMergeConflictMarkersRange(lines: string[], editWindowRange: OffsetRange, maxMergeConflictLines: number): OffsetRange | undefined;
 export {};
 //# sourceMappingURL=xtabProvider.d.ts.map

package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xtabProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xtabProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabProvider.ts"],"names":[],"mappings":"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"}