development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-04 02:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #206055 from microsoft/aiday/doingChecksOnLineNumberAndLength

Browse source 
Doing checks on length and line number in the `inlineCompletionsModel` file
This commit is contained in:
Aiday Marlen Kyzy 2024-02-23 11:53:58 +01:00 committed by GitHub
parent 13d3452a5c 1ad43ea49a
commit ba8645668e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.ts
View file

@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { mapFindFirst } from 'vs/base/common/arraysFind';
import { BugIndicatingError, onUnexpectedExternalError } from 'vs/base/common/errors';
import { BugIndicatingError, onUnexpectedError, onUnexpectedExternalError } from 'vs/base/common/errors';
import { Disposable } from 'vs/base/common/lifecycle';
import { IObservable, IReader, ITransaction, autorun, derived, derivedHandleChanges, derivedOpts, recomputeInitiallyAndOnChange, observableSignal, observableValue, subtransaction, transaction } from 'vs/base/common/observable';
import { commonPrefixLength, splitLinesIncludeSeparators } from 'vs/base/common/strings';
@ -470,6 +470,10 @@ export class InlineCompletionsModel extends Disposable {
}
export function getSecondaryEdits(textModel: ITextModel, positions: readonly Position[], primaryEdit: SingleTextEdit): SingleTextEdit[] {
if (positions.length === 1) {
// No secondary cursor positions
return [];
}
const primaryPosition = positions[0];
const secondaryPositions = positions.slice(1);
const primaryEditStartPosition = primaryEdit.range.getStartPosition();
@ -478,6 +482,13 @@ export function getSecondaryEdits(textModel: ITextModel, positions: readonly Pos
Range.fromPositions(primaryPosition, primaryEditEndPosition)
);
const positionWithinTextEdit = subtractPositions(primaryPosition, primaryEditStartPosition);
if (positionWithinTextEdit.lineNumber < 1) {
onUnexpectedError(new BugIndicatingError(
`positionWithinTextEdit line number should be bigger than 0.
Invalid subtraction between ${primaryPosition.toString()} and ${primaryEditStartPosition.toString()}`
));
return [];
}
const secondaryEditText = substringPos(primaryEdit.text, positionWithinTextEdit);
return secondaryPositions.map(pos => {
const posEnd = addPositions(subtractPositions(pos, primaryEditStartPosition), primaryEditEndPosition);