Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 17:19:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

update prefix-sum when docs change, add offset/position math, tests

Browse Source
This commit is contained in:
Johannes Rieken
2020-04-20 12:57:13 +02:00
parent 0c0c15ae32
commit 2b5426b447
2 changed files with 91 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/vs/workbench/api/common/extHostNotebookConcatDocument.ts
View File

@@ -34,8 +34,8 @@ export class ExtHostNotebookConcatDocument {
this._init();
extHostDocuments.onDidChangeDocument(e => {
const cell = this._notebook.cells.find(candidate => candidate.uri.toString() === e.document.uri.toString());
if (!cell) {
const cellIdx = this._notebook.cells.findIndex(candidate => candidate.uri.toString() === e.document.uri.toString());
if (cellIdx < 0) {
return;
}
// todo@jrieken reuse raw event!
@@ -52,6 +52,8 @@ export class ExtHostNotebookConcatDocument {
};
})
});
this._cellStarts.changeValue(cellIdx, e.document.getText().length + 1);
this._onDidChange.fire(this);
}, undefined, this._disposables);
@@ -106,6 +108,7 @@ export class ExtHostNotebookConcatDocument {
return this._delegate.getText();
}
locationAt(position: vscode.Position): vscode.Location {
const offset = this._delegate.document.offsetAt(position);
const index = this._cellStarts.getIndexOf(offset);
@@ -119,15 +122,24 @@ export class ExtHostNotebookConcatDocument {
return new types.Location(cell.uri, <any>cellPos);
}
positionAt(location: vscode.Location): vscode.Position {
const idx = this._notebook.cells.findIndex(candidate => candidate.uri.toString() === location.uri.toString());
positionAt(offset: number): vscode.Position;
positionAt(location: vscode.Location): vscode.Position;
positionAt(offsetOrLocation: number | vscode.Location): vscode.Position {
if (typeof offsetOrLocation === 'number') {
return this._delegate.document.positionAt(offsetOrLocation);
}
const idx = this._notebook.cells.findIndex(candidate => candidate.uri.toString() === offsetOrLocation.uri.toString());
if (idx < 0) {
// do better?
// return undefined;
return new types.Position(0, 0);
}
const docOffset = this._notebook.cells[idx].document.offsetAt(location.range.start);
const docOffset = this._notebook.cells[idx].document.offsetAt(offsetOrLocation.range.start);
const cellOffset = this._cellStarts.getAccumulatedValue(idx - 1);
return this._delegate.document.positionAt(docOffset + cellOffset);
}
offsetAt(position: vscode.Position): number {
return this._delegate.document.offsetAt(position);
}
}