Skip to content

Commit bb411d6

Browse files
committed
nes: refactor: get config from within computeEditWindowLinesRange
1 parent f1f2a07 commit bb411d6

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/extension/xtab/node/xtabProvider.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,7 @@ export class XtabProvider implements IStatelessNextEditProvider {
245245

246246
const areaAroundEditWindowLinesRange = this.computeAreaAroundEditWindowLinesRange(currentFileContentLines, cursorLineIdx);
247247

248-
const maxMergeConflictLines = this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabMaxMergeConflictLines, this.expService);
249-
250-
const editWindowLinesRange = this.computeEditWindowLinesRange(currentFileContentLines, cursorLineIdx, request, maxMergeConflictLines, retryState);
248+
const editWindowLinesRange = this.computeEditWindowLinesRange(currentFileContentLines, cursorLineIdx, request, retryState);
251249

252250
const cursorOriginalLinesOffset = Math.max(0, cursorLineIdx - editWindowLinesRange.start);
253251
const editWindowLastLineLength = activeDocument.documentAfterEdits.getTransformer().getLineLength(editWindowLinesRange.endExclusive);
@@ -786,7 +784,7 @@ export class XtabProvider implements IStatelessNextEditProvider {
786784
return new OffsetRange(areaAroundStart, areaAroundEndExcl);
787785
}
788786

789-
private computeEditWindowLinesRange(currentDocLines: string[], cursorLine: number, request: StatelessNextEditRequest, maxMergeConflictLines: number | undefined, retryState: RetryState): OffsetRange {
787+
private computeEditWindowLinesRange(currentDocLines: string[], cursorLine: number, request: StatelessNextEditRequest, retryState: RetryState): OffsetRange {
790788
let nLinesAbove: number;
791789
{
792790
const useVaryingLinesAbove = this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabProviderUseVaryingLinesAbove, this.expService);
@@ -833,6 +831,7 @@ export class XtabProvider implements IStatelessNextEditProvider {
833831
let codeToEditStart = Math.max(0, cursorLine - nLinesAbove);
834832
let codeToEditEndExcl = Math.min(currentDocLines.length, cursorLine + nLinesBelow + 1);
835833

834+
const maxMergeConflictLines = this.configService.getExperimentBasedConfig(ConfigKey.Internal.InlineEditsXtabMaxMergeConflictLines, this.expService);
836835
if (maxMergeConflictLines) {
837836
const tentativeEditWindow = new OffsetRange(codeToEditStart, codeToEditEndExcl);
838837
const mergeConflictRange = findMergeConflictMarkersRange(currentDocLines, tentativeEditWindow, maxMergeConflictLines);

0 commit comments

Comments
 (0)