eclipse-theia/theia

Active editor doesn't detect when content on disk is newer

Open

#7,036 opened on Jan 31, 2020

View on GitHub
 (2 comments) (0 reactions) (0 assignees)TypeScript (18,676 stars) (2,478 forks)batch import
bugeditorhelp wantedvscode

Description

Description

There is an inconsistency between Theia and VS Code, in that in doesn't detect if content of a file is newer when modified outside of Theia.

This happens also when you programmatically try to change the content of the active editor. Please see: https://github.com/zowe/vscode-extension-for-zowe/blob/c7cd5c8a021ebe24b040d9c98c1d06dc99e3a3e7/src/extension.ts#L1700-L1738 In here, the editBuilder.delete(deleteRange); and editBuilder.insert(startPosition, oldDocText); don't mark the file as dirty, so when we call save() on the document, it doesn't actually generate the Compare. This works as expected in VS Code.

Reproduction Steps

In VS Code:

  • open a file
  • edit without saving
  • open same file outside VS Code (I used Notepad)
  • edit and save in Notepad
  • save in VS Code
  • Error is generated because content of the file is newer on disk
  • from here, I am able to resolve this merge conflict by selecting Compare vscode-compare

In Theia, following exact same steps, the result is different:

  • merge conflict is not generated and Theia silently saves the content and overwrites the file. theia11-compare

OS and Theia version: v 0.11.0 (built from source and ran on localhost) Nightly build (ran from docker theiaide/theia:next) Windows 10 Pro Chrome Version 78.0.3904.97 (Official Build) (64-bit)

Diagnostics: N/A

Contributor guide

Tech stack
typescriptnodejs
Domain
backenddeveloper experience
Issue type
bug
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
3
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
1-3 hours
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
stale
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
clear
Prerequisites
Knowledge of Theia's resource modelUnderstanding of document dirty state
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
40
Research direction
Investigate how Theia's editor monitors file changes and compares timestamps. Look at the 'resource' and 'editor' services in the codebase. Check if there is a file watcher that triggers a comparison when the file changes externally. Consider the approach used in VS Code's file management for contrast. Reference the provided Zowe extension code snippet to understand the use case.