Skip to content

fix: TC-1631 Explicitly synchronize PSI file cached document content and disk file content to avoid analysis happens before changes is saved to disk. #197

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
soul2zimate merged 1 commit into from
Jul 14, 2025
Merged

fix: TC-1631 Explicitly synchronize PSI file cached document content and disk file content to avoid analysis happens before changes is saved to disk. #197

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
30 changes: 19 additions & 11 deletions src/main/java/org/jboss/tools/intellij/componentanalysis/CAService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,14 @@

import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.components.Service;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.redhat.exhort.api.v4.AnalysisReport;
Expand Down Expand Up @@ -73,20 +78,23 @@ public static boolean performAnalysis(String packageManager,
Set<Dependency> dependencies,
PsiFile file) {
if (dependenciesModified(filePath, dependencies)) {
Path tempManifest;
Path tempDirectory;
ApiService apiService = ServiceManager.getService(ApiService.class);
try {
tempDirectory = Files.createTempDirectory("rhda-idea");
tempManifest = Files.createFile(Path.of(tempDirectory.toString(),fileName));
Files.write(tempManifest,PsiDocumentManager.getInstance(file.getProject()).getCachedDocument(file).getText().getBytes());
} catch (IOException e) {
throw new RuntimeException(e);
Project project = file.getProject();
Document document = PsiDocumentManager.getInstance(project).getDocument(file);
if (document == null) {
throw new RuntimeException("Failed to perform component analysis, document " + file + " is invalid.");
}
// Fix for TC-1631 to avoid analysis happens before changes is saved to disk.
// Explicitly synchronize PSI file cached document content and disk file content
if (FileDocumentManager.getInstance().isDocumentUnsaved(document)) {
ApplicationManager.getApplication().invokeAndWait(() ->
WriteCommandAction.runWriteCommandAction(project, () ->
FileDocumentManager.getInstance().saveDocument(document)
)
);
}

// AnalysisReport report = apiService.getComponentAnalysis(packageManager, fileName, filePath);
AnalysisReport report = apiService.getComponentAnalysis(packageManager, fileName, tempManifest.toString());
deleteTempDir(tempDirectory);
AnalysisReport report = apiService.getComponentAnalysis(packageManager, fileName, filePath);
if (report == null) {
throw new RuntimeException("Failed to perform component analysis, result is invalid.");
}
Expand Down
Loading