Не подтверждена Коммит 0c404872 создал по автору Don Jayamanne's avatar Don Jayamanne Зафиксировано автором GitHub
Просмотр файлов

Rename internalMetadata.id of cell to `internalId` and generate based on hash of Cell Uri (#243829) 

* Rename internalMetadata.id of cell to `internalId` and generate based on hash of Cell Uri

* Updatges
владелец 88599311
Скрыть пробелы
Построчно Рядом
src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedNotebookEntry.ts
Просмотр файла @ 0c404872
......@@ -125,9 +125,9 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
restoreSnapshot(originalRef.object.notebook, initialContent);
const edits: ICellEditOperation[] = [];
notebook.cells.forEach((cell, index) => {
const cellId = cell.internalMetadata?.cellId;
if (cellId) {
edits.push({ editType: CellEditType.PartialInternalMetadata, index, internalMetadata: { cellId } });
const internalId = cell.internalMetadata?.internalId;
if (internalId) {
edits.push({ editType: CellEditType.PartialInternalMetadata, index, internalMetadata: { internalId } });
}
});
originalRef.object.notebook.applyEdits(edits, true, undefined, () => undefined, undefined, true);
......@@ -748,7 +748,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
source: cell.getValue(),
mime: cell.mime,
internalMetadata: {
cellId: cell.internalMetadata.cellId
internalId: cell.internalMetadata.internalId
}
};
this.cellEntryMap.get(cell.uri)?.dispose();
......@@ -772,7 +772,7 @@ export class ChatEditingModifiedNotebookEntry extends AbstractChatEditingModifie
source: originalCell.getValue(),
mime: originalCell.mime,
internalMetadata: {
cellId: originalCell.internalMetadata.cellId
internalId: originalCell.internalMetadata.internalId
}
};
const cellDiffs = adjustCellDiffForRevertingADeletedCell(
......
src/vs/workbench/contrib/chat/browser/chatEditing/notebook/chatEditingModifiedNotebookSnapshot.ts
Просмотр файла @ 0c404872
......@@ -41,9 +41,9 @@ export function restoreSnapshot(notebook: NotebookTextModel, snapshot: string):
notebook.restoreSnapshot(data, transientOptions);
const edits: ICellEditOperation[] = [];
data.cells.forEach((cell, index) => {
const cellId = cell.internalMetadata?.cellId;
if (cellId) {
edits.push({ editType: CellEditType.PartialInternalMetadata, index, internalMetadata: { cellId } });
const internalId = cell.internalMetadata?.internalId;
if (internalId) {
edits.push({ editType: CellEditType.PartialInternalMetadata, index, internalMetadata: { internalId } });
}
});
notebook.applyEdits(edits, true, undefined, () => undefined, undefined, false);
......
src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.ts
Просмотр файла @ 0c404872
......@@ -209,6 +209,7 @@ export class NotebookCellTextModel extends Disposable implements ICell {
this._outputs = outputs.map(op => new NotebookCellOutputTextModel(op));
this._metadata = metadata ?? {};
this._internalMetadata = internalMetadata ?? {};
this._internalMetadata.internalId ??= generateCellHash(uri);
}
enableAutoLanguageDetection() {
......@@ -569,3 +570,9 @@ export function sortObjectPropertiesRecursively(obj: any): any {
}
return obj;
}
function generateCellHash(cellUri: URI) {
const hash = new StringSHA1();
hash.update(cellUri.toString());
return hash.digest().substring(0, 8);
}
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
Просмотр файла @ 0c404872
......@@ -125,7 +125,7 @@ export interface NotebookCellInternalMetadata {
* This is not persisted and generally useful only when diffing two notebooks.
* Useful only after we've manually matched a few cells together so we know which cells are matching.
*/
cellId?: string;
internalId?: string;
executionId?: string;
executionOrder?: number;
lastRunSuccess?: boolean;
......
src/vs/workbench/contrib/notebook/common/services/notebookSimpleWorker.ts
Просмотр файла @ 0c404872
......@@ -66,7 +66,7 @@ class MirrorCell {
hashValue = doHash(this.getValue(), hashValue);
hashValue = doHash(this.metadata, hashValue);
// For purpose of diffing only cellId matters, rest do not
hashValue = doHash(this.internalMetadata?.cellId || '', hashValue);
hashValue = doHash(this.internalMetadata?.internalId || '', hashValue);
for (const op of this.outputs) {
hashValue = doHash(op.metadata, hashValue);
for (const output of op.outputs) {
......@@ -162,9 +162,9 @@ class CellSequence implements ISequence {
static createWithCellId(cells: MirrorCell[], includeCellContents?: boolean) {
const hashValue = cells.map((c) => {
if (includeCellContents) {
return `${doHash(c.internalMetadata?.cellId, numberHash(104579, 0))}#${c.getComparisonValue()}`;
return `${doHash(c.internalMetadata?.internalId, numberHash(104579, 0))}#${c.getComparisonValue()}`;
} else {
return `${doHash(c.internalMetadata?.cellId, numberHash(104579, 0))}}`;
return `${doHash(c.internalMetadata?.internalId, numberHash(104579, 0))}}`;
}
});
return new CellSequence(hashValue);
......@@ -418,8 +418,8 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
}
canComputeDiffWithCellInternalIds(original: MirrorNotebookDocument, modified: MirrorNotebookDocument): boolean {
const originalCellIndexIds = original.cells.map((cell, index) => ({ index, id: (cell.internalMetadata?.cellId || '') as string }));
const modifiedCellIndexIds = modified.cells.map((cell, index) => ({ index, id: (cell.internalMetadata?.cellId || '') as string }));
const originalCellIndexIds = original.cells.map((cell, index) => ({ index, id: (cell.internalMetadata?.internalId || '') as string }));
const modifiedCellIndexIds = modified.cells.map((cell, index) => ({ index, id: (cell.internalMetadata?.internalId || '') as string }));
// If we have a cell without an id, do not use metadata.id for diffing.
if (originalCellIndexIds.some(c => !c.id) || modifiedCellIndexIds.some(c => !c.id)) {
return false;
......@@ -445,35 +445,35 @@ export class NotebookEditorSimpleWorker implements IRequestHandler, IDisposable
// Internally we use internalMetadata.cellId for diffing, hence update the internalMetadata.cellId
original.cells.map((cell, index) => {
cell.internalMetadata = cell.internalMetadata || {};
cell.internalMetadata.cellId = cell.metadata?.id as string || '';
cell.internalMetadata.internalId = cell.metadata?.id as string || '';
});
modified.cells.map((cell, index) => {
cell.internalMetadata = cell.internalMetadata || {};
cell.internalMetadata.cellId = cell.metadata?.id as string || '';
cell.internalMetadata.internalId = cell.metadata?.id as string || '';
});
return true;
}
isOriginalCellMatchedWithModifiedCell(originalCell: MirrorCell) {
return (originalCell.internalMetadata?.cellId as string || '').startsWith(PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS);
return (originalCell.internalMetadata?.internalId as string || '').startsWith(PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS);
}
updateCellIdsBasedOnMappings(mappings: { modified: number; original: number }[], originalCells: MirrorCell[], modifiedCells: MirrorCell[]): boolean {
const uuids = new Map<number, string>();
originalCells.map((cell, index) => {
cell.internalMetadata = cell.internalMetadata || { cellId: '' };
cell.internalMetadata.cellId = `${PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS}${generateUuid()}`;
cell.internalMetadata = cell.internalMetadata || { internalId: '' };
cell.internalMetadata.internalId = `${PREFIX_FOR_UNMATCHED_ORIGINAL_CELLS}${generateUuid()}`;
const found = mappings.find(r => r.original === index);
if (found) {
// Do not use the indexes as ids.
// If we do, then the hashes will be very similar except for last digit.
cell.internalMetadata.cellId = generateUuid();
uuids.set(found.modified, cell.internalMetadata.cellId as string);
cell.internalMetadata.internalId = generateUuid();
uuids.set(found.modified, cell.internalMetadata.internalId as string);
}
});
modifiedCells.map((cell, index) => {
cell.internalMetadata = cell.internalMetadata || { cellId: '' };
cell.internalMetadata.cellId = uuids.get(index) ?? generateUuid();
cell.internalMetadata = cell.internalMetadata || { internalId: '' };
cell.internalMetadata.internalId = uuids.get(index) ?? generateUuid();
});
return true;
}
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать