Skip to content

Improve handling of array editing #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eneufeld wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −7
Open

Improve handling of array editing #468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions client/coffee-editor-extension/src/browser/coffee-tree/coffee-tree-editor-widget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ export class CoffeeTreeEditorWidget extends NavigatableTreeEditorWidget {
)
};
} else {
const feature = this.getFeature(diffPatch.path, !!diffPatch.path.match(/^\/ram(\/\d+)?/gm));
const feature = this.getFeature(diffPatch.path);
return {
op: diffPatch.op,
path: this.getOperationPath(this.getOwnerIdByPath(diffPatch.path, changedObject, oldObject, diffPatch.op), feature),
Expand All @@ -262,7 +262,7 @@ export class CoffeeTreeEditorWidget extends NavigatableTreeEditorWidget {
}
}
case 'add': {
const feature = this.getFeature(diffPatch.path, !!diffPatch.path.match(/^\/ram(\/\d+)?/gm));
const feature = this.getFeature(diffPatch.path);
return {
op: diffPatch.op,
path: this.getOperationPath(this.getOwnerIdByPath(diffPatch.path, changedObject, oldObject, diffPatch.op), feature),
Expand All @@ -283,12 +283,13 @@ export class CoffeeTreeEditorWidget extends NavigatableTreeEditorWidget {
}
}

protected getFeature(patchPath: string, addFeature = false): string {
if (addFeature) {
const segments = patchPath.split('/').slice(1);
return segments.length > 1 ? segments.slice(0, -1)[0] : segments[0];
protected getFeature(patchPath: string): string {
let segments = patchPath.split('/');
const segmentsLength = segments.length - 1;
if (!isNaN(segments[segmentsLength] as any)) {
segments = segments.slice(0, segmentsLength);
}
return patchPath.split('/').reverse()[0];
return segments[segments.length - 1];
}

protected getOwnerIdByPath(
Expand Down