maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improves cursor positioning for injected text.

Browse source
This commit is contained in:
Henning Dieterichs 2021-07-01 18:40:13 +02:00
parent 991cd8dc85
commit 313b71c4ec
No known key found for this signature in database
GPG key ID: 771381EFFDB9EC06
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/editor/common/viewModel/viewModel.ts
View file

@ -96,6 +96,10 @@ export class OutputPosition {
this.outputLineIndex = outputLineIndex;
this.outputOffset = outputOffset;
}
toString(): string {
return `${this.outputLineIndex}:${this.outputOffset}`;
}
}
export class LineBreakData {
@ -137,7 +141,7 @@ export class LineBreakData {
let delta = 0;
if (this.injectionOffsets !== null) {
for (let i = 0; i < this.injectionOffsets.length; i++) {
if (inputOffset < this.injectionOffsets[i]) {
if (inputOffset <= this.injectionOffsets[i]) {
break;
}
delta += this.injectionOptions![i].content.length;

19
src/vs/editor/test/common/viewModel/lineBreakData.test.ts
View file

@ -33,25 +33,38 @@ suite('Editor ViewModel - LineBreakData', () => {
return sequence(11).map(i => data.getInputOffsetOfOutputPosition(outputLineIdx, i));
}
function getOutputOffsets(data: LineBreakData): string[] {
return sequence(25).map(i => data.getOutputPositionOfInputOffset(i).toString());
}
function mapTextToInjectedTextOptions(arr: string[]): ModelDecorationInjectedTextOptions[] {
return arr.map(e => ModelDecorationInjectedTextOptions.from({ content: e }));
}
suite('Injected Text 1', () => {
const data = new LineBreakData([10], [], 0, [2, 3, 10], mapTextToInjectedTextOptions(['1', '22', '333']));
const data = new LineBreakData([10, 100], [], 0, [2, 3, 10], mapTextToInjectedTextOptions(['1', '22', '333']));
test('getInputOffsetOfOutputPosition', () => {
// For every view model position, what is the model position?
assert.deepStrictEqual(getInputOffsets(data, 0), [0, 1, 2, 2, 3, 3, 3, 4, 5, 6, 7]);
assert.deepStrictEqual(getInputOffsets(data, 1), [7, 8, 9, 10, 10, 10, 10, 11, 12, 13, 14]);
});
test('getOutputPositionOfInputOffset', () => {
data.getOutputPositionOfInputOffset(20);
assert.deepStrictEqual(getOutputOffsets(data), [
'0:0', '0:1', '0:2', '0:4', '0:7', '0:8', '0:9',
'1:0', '1:1', '1:2', '1:3', '1:7', '1:8', '1:9', '1:10', '1:11', '1:12', '1:13', '1:14', '1:15', '1:16', '1:17', '1:18', '1:19', '1:20',
]);
});
test('getInputOffsetOfOutputPosition is inverse of getOutputPositionOfInputOffset', () => {
testInverse(data);
});
});
suite('Injected Text 2', () => {
const data = new LineBreakData([10], [], 0, [2, 2, 6], mapTextToInjectedTextOptions(['1', '22', '333']));
const data = new LineBreakData([10, 100], [], 0, [2, 2, 6], mapTextToInjectedTextOptions(['1', '22', '333']));
test('getInputOffsetOfOutputPosition', () => {
assert.deepStrictEqual(getInputOffsets(data, 0), [0, 1, 2, 2, 2, 2, 3, 4, 5, 6, 6]);
@ -64,7 +77,7 @@ suite('Editor ViewModel - LineBreakData', () => {
});
suite('Injected Text 3', () => {
const data = new LineBreakData([10], [], 0, [2, 2, 7], mapTextToInjectedTextOptions(['1', '22', '333']));
const data = new LineBreakData([10, 100], [], 0, [2, 2, 7], mapTextToInjectedTextOptions(['1', '22', '333']));
test('getInputOffsetOfOutputPosition', () => {
assert.deepStrictEqual(getInputOffsets(data, 0), [0, 1, 2, 2, 2, 2, 3, 4, 5, 6, 7]);