Skip to content
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

Jump to bottom

Introduce better logic to handle content recoveries #285

Closed
tobous opened this issue Oct 24, 2018 · 0 comments
Closed

Introduce better logic to handle content recoveries #285

tobous opened this issue Oct 24, 2018 · 0 comments
Assignees
@tobous
Labels
Area: IntelliJ Issue affecting Saros for IntelliJ (Saros/I)

Comments

@tobous
Copy link
Member

tobous commented Oct 24, 2018

The rework of the SharedResorucesManager implemented in #277 removes the logic to recover existing files with the wrong content.

To recover existing files with the wrong content, Saros also dispatches creation FileActivities. The old recovery logic just overwrote the content of the existing file in the filesystem.
This is not the best approach as it bypasses the IntelliJ logic to make changes undo-able, meaning the recovery would irreversibly change the local file content.

A better approach would be to change the content of the Document (the cached version of the file held by IntelliJ that is used to back the local Editors).
@tobous tobous added the Area: IntelliJ Issue affecting Saros for IntelliJ (Saros/I) label Oct 24, 2018
@tobous tobous self-assigned this Oct 24, 2018
@tobous tobous mentioned this issue Nov 2, 2018
Merged
tobous added a commit that referenced this issue Dec 4, 2018
@tobous
[FIX][I] #285 Introduce logic to handle content recovery
710dc40 
Adds logic to handle content recovery, meaning the content of an
existing file needs to be adjusted. Previously, this was handled on the
filesystem level, meaning the changes made by the recovery were not
undo-able. This commit introduces a logic to handle content recoveries
on the document level to avoid such issues.
tobous added a commit that referenced this issue Dec 4, 2018
@tobous
[FIX][I] #285 Introduce logic to handle content recovery
99a2916 
Adds logic to handle content recovery, meaning the content of an
existing file needs to be adjusted. Previously, this was handled on the
filesystem level, meaning the changes made by the recovery were not
undo-able. This commit introduces a logic to handle content recoveries
on the document level to avoid such issues.

Resolves #285.
tobous added a commit that referenced this issue Dec 4, 2018
@tobous
[FIX][I] #285 Introduce logic to handle content recovery
5e630f1 
Adds logic to handle content recovery, meaning the content of an
existing file needs to be adjusted. Previously, this was handled on the
filesystem level, meaning the changes made by the recovery were not
undo-able. This commit introduces a logic to handle content recoveries
on the document level to avoid such issues.

Resolves #285.

Subsequently enables the recovery button as the feature should now be
functional.
@tobous tobous mentioned this issue Dec 4, 2018
Merged
tobous added a commit that referenced this issue Dec 4, 2018
@tobous
[FIX][I] #285 Introduce logic to handle content recovery
b99452f 
Adds logic to handle content recovery, meaning the content of an
existing file needs to be adjusted. Previously, this was handled on the
filesystem level, meaning the changes made by the recovery were not
undo-able. This commit introduces a logic to handle content recoveries
on the document level to avoid such issues.

Resolves #285.

Subsequently enables the recovery button as the feature should now be
functional.
tobous added a commit that referenced this issue Dec 5, 2018
@tobous
[FIX][I] #285 Introduce logic to handle content recovery
e876105 
Adds logic to handle content recovery, meaning the content of an
existing file needs to be adjusted. Previously, this was handled on the
filesystem level, meaning the changes made by the recovery were not
undo-able. This commit introduces a logic to handle content recoveries
on the document level to avoid such issues.

Resolves #285.

Subsequently enables the recovery button as the feature should now be
functional.
tobous added a commit that referenced this issue Dec 9, 2018
@tobous
[FIX][I] #285 Introduce logic to handle content recovery
166505e 
Adds logic to handle content recovery, meaning the content of an
existing file needs to be adjusted. Previously, this was handled on the
filesystem level, meaning the changes made by the recovery were not
undo-able. This commit introduces a logic to handle content recoveries
on the document level to avoid such issues.

Resolves #285.

Subsequently enables the recovery button as the feature should now be
functional.
tobous added a commit that referenced this issue Dec 10, 2018
@tobous
[FIX][I] #285 Introduce logic to handle content recovery
e55c9ae 
Adds logic to handle content recovery, meaning the content of an
existing file needs to be adjusted. Previously, this was handled on the
filesystem level, meaning the changes made by the recovery were not
undo-able. This commit introduces a logic to handle content recoveries
on the document level to avoid such issues.

Resolves #285.

Subsequently enables the recovery button as the feature should now be
functional.
tobous added a commit that referenced this issue Dec 11, 2018
@tobous
[FIX][I] #285 Introduce logic to handle content recovery
7d95161 
Adds logic to handle content recovery, meaning the content of an
existing file needs to be adjusted. Previously, this was handled on the
filesystem level, meaning the changes made by the recovery were not
undo-able. This commit introduces a logic to handle content recoveries
on the document level to avoid such issues.

Resolves #285.

Subsequently enables the recovery button as the feature should now be
functional.
tobous added a commit that referenced this issue Dec 11, 2018
@tobous
[FIX][I] #285 Introduce logic to handle content recovery
9ec5c66 
Adds logic to handle content recovery, meaning the content of an
existing file needs to be adjusted. Previously, this was handled on the
filesystem level, meaning the changes made by the recovery were not
undo-able. This commit introduces a logic to handle content recoveries
on the document level to avoid such issues.

Resolves #285.

Subsequently enables the recovery button as the feature should now be
functional.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@tobous tobous

Labels
Area: IntelliJ Issue affecting Saros for IntelliJ (Saros/I)
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@tobous