Skip to content

Refresh deleted source file location #47950

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

Merged
merged 1 commit into from
May 20, 2025
Merged

Refresh deleted source file location #47950

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ nb-configuration.xml
.mvn/.develocity
.mvn/.gradle-enterprise/
.quarkus

.goosehints
.goose
18 changes: 13 additions & 5 deletions core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,10 +849,18 @@ private void checkForClassFilesChangesInModule(DevModeContext.ModuleInfo module,
.collect(Collectors.toSet());

for (Path classFilePath : classFilePaths) {
final Path sourceFilePath = retrieveSourceFilePathForClassFile(classFilePath, moduleChangedSourceFiles,
module, cuf, timestampSet);

Path sourceFilePath = retrieveSourceFilePathForClassFile(classFilePath, moduleChangedSourceFiles,
module, cuf, timestampSet, false);
if (sourceFilePath != null) {
if (!sourceFilePath.toFile().exists()) {
// We need to refresh this in case the source file has changed
// This can happen if you rename a kotlin file, the same class will now be provided by a new file
var updated = retrieveSourceFilePathForClassFile(classFilePath, moduleChangedSourceFiles,
module, cuf, timestampSet, true);
if (updated != null) {
sourceFilePath = updated;
}
}
if (!sourceFilePath.toFile().exists()) {
// Source file has been deleted. Delete class and restart
cleanUpClassFile(classFilePath, timestampSet);
Expand Down Expand Up @@ -888,9 +896,9 @@ private void checkForClassFilesChangesInModule(DevModeContext.ModuleInfo module,

private Path retrieveSourceFilePathForClassFile(Path classFilePath, List<Path> moduleChangedSourceFiles,
DevModeContext.ModuleInfo module, Function<DevModeContext.ModuleInfo, DevModeContext.CompilationUnit> cuf,
TimestampSet timestampSet) {
TimestampSet timestampSet, boolean forceRefresh) {
Path sourceFilePath = timestampSet.classFilePathToSourceFilePath.get(classFilePath);
if (sourceFilePath == null || moduleChangedSourceFiles.contains(sourceFilePath)) {
if (sourceFilePath == null || moduleChangedSourceFiles.contains(sourceFilePath) || forceRefresh) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't !Files.exists(sourceFilePath) instead of forceRefresh achieve the same?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because this could result in the function returning null when previously it would have returned the non-existant file.

sourceFilePath = compiler.findSourcePath(classFilePath, cuf.apply(module).getSourcePaths(),
cuf.apply(module).getClassesPath());
}
Expand Down
Loading