[Veykril]

Turns out there is no need to keep the files around. We either upload them to salsa once processed, or we need to keep them around for the DidChangeTextDocumentNotification, but that notification is only valid for opened documents, so instead we can just keep the files around in the MemDocs!

Fixes #16301

[lnicola]

@Veykril looks like the sync PR is unlikely to get merged today, so feel free to merge anything that doesn't touch the proc macro server parts.

[Veykril]

It's fine, I'm done for the day anyways.

[davidbarsky]

having touched this side of things, this is a great improvement :)

[lnicola]

Let's get it in the nightly.

@bors r+

[bors]

📌 Commit 1c40ac7 has been approved by lnicola

It is now in the queue for this repository.

[bors]

⌛ Testing commit 1c40ac7 with merge c1c2421...

[bors]

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing c1c2421 to master...

[roife]

After this PR, if we read a file (Vec<u8>) from vfs-notify, we may store the text in two places (mem_docs and salsa). The text stored in salsa is of type Arc<str>, while in mem_docs it is of type Vec<u8>. Every time we operate on the Vec<u8> retrieved from mem_docs, we need to convert it to String or &str using from_utf8; and after that we need to convert it back to bytes with Vec<u8> to store in mem_docs. Thus, perhaps we can convert the incoming file to UTF-8 in vfs-notify itself, so that we don't have to frequently perform conversions between into_bytes() and from_utf8 in subsequent operations.

Furthermore, I noticed a FIXME in global_state.rs: Consider doing (LineEndings) normalization in the vfs instead? We could also merge this step into vfs-notify, thereby reducing locking on main_loop.

[Veykril]

Hmm, ye we do one round trip unnecessarily there. We can fix that, though that won't really matter too much I believe.

Regarding the FIXME, that might work though I'm unsure whether that will get rid of any locking (though it might make the lock holding shorter which would also be nice).

[roife]

Hmm, ye we do one round trip unnecessarily there. We can fix that, though that won't really matter too much I believe.

Regarding the FIXME, that might work though I'm unsure whether that will get rid of any locking (though it might make the lock holding shorter which would also be nice).

If this will not have any negative impact on the project, perhaps I can try to do it; at least it can make the project more concise.

[Veykril]

Feel free to take a look!