Improving "internal reload" during project reload #7748
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sdedic
force-pushed
the
sdedic/project-internal-reload
branch
from
42dac65 to
664269f
Compare
mbien
reviewed
Sep 14, 2024
ide/project.dependency/src/org/netbeans/modules/project/dependency/ProjectReload.java
Outdated
Show resolved
Hide resolved
...va.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
Outdated
Show resolved
Hide resolved
ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/Reloader.java
Outdated
Show resolved
Hide resolved
sdedic
force-pushed
the
sdedic/project-internal-reload
branch
from
664269f to
2d925f2
Compare
|
Rebased on latest master; @mbien review comments addressed. |
ok thanks, don't forget to squash the third commit into the other commits before merge though. |
Sure, waiting until Mon for other possible review comments + fixes. |
jhorvath
approved these changes
Sep 18, 2024
MartinBalin
approved these changes
Sep 18, 2024
sdedic
force-pushed
the
sdedic/project-internal-reload
branch
from
2d925f2 to
9db7581
Compare
|
Fixes merged into 2nd commit; prepare for merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Seems awkward... but sometimes events are delivered in the middle of a project loading process. The API checks the project's state at the end for quality and/or consistency - and that can cause spurious errors about project reloads while reading it. This PR improves stability by allowing a recovery - but at the same time if a reload would be repeated again because of file changes, the
ProjectReload.withProjectState()fails indicating that project is being modified, as it was before. Similar approach was already implemented for the case theProjectReloadImplementationrequested a retry: one is OK, but the same (super)set repeated again will result in an error.During investigation, I needed quite detailed logging, so I've added that as a separate commit; the "logging" commit should bring no functional changes, just diagnostics.