From 2c01c423cb3f7b4d2d3087b19e594d80442bfe05 Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 9 Oct 2026 17:09:32 +0300 Subject: [PATCH] Fixing compilation after platform update. --- .../java/coverage/JavaCoverageEngine.java | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/java-coverage-impl/src/main/java/com/intellij/java/coverage/JavaCoverageEngine.java b/java-coverage-impl/src/main/java/com/intellij/java/coverage/JavaCoverageEngine.java index e911fd957..4b0275272 100644 --- a/java-coverage-impl/src/main/java/com/intellij/java/coverage/JavaCoverageEngine.java +++ b/java-coverage-impl/src/main/java/com/intellij/java/coverage/JavaCoverageEngine.java @@ -22,6 +22,7 @@ import consulo.content.ContentFolderTypeProvider; import consulo.execution.configuration.RunConfigurationBase; import consulo.execution.coverage.*; +import consulo.execution.coverage.localize.ExecutionCoverageLocalize; import consulo.execution.coverage.view.CoverageViewExtension; import consulo.execution.test.AbstractTestProxy; import consulo.java.coverage.localize.JavaCoverageLocalize; @@ -32,6 +33,7 @@ import consulo.language.psi.PsiPackage; import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.psi.util.PsiTreeUtil; +import consulo.localize.LocalizeValue; import consulo.logging.Logger; import consulo.module.Module; import consulo.module.content.ModuleRootManager; @@ -193,13 +195,13 @@ public boolean recompileProjectAndRerunAction( CoverageSuitesBundle suite, Runnable chooseSuiteAction ) { - Path outputpath = + Path outputPath = ModuleCompilerPathsManager.getInstance(module).getCompilerOutputPath(ProductionContentFolderTypeProvider.getInstance()); - Path testOutputpath = + Path testOutputPath = ModuleCompilerPathsManager.getInstance(module).getCompilerOutputPath(TestContentFolderTypeProvider.getInstance()); - if ((outputpath == null && isModuleOutputNeeded(module, ProductionContentFolderTypeProvider.getInstance())) - || (suite.isTrackTestFolders() && testOutputpath == null + if ((outputPath == null && isModuleOutputNeeded(module, ProductionContentFolderTypeProvider.getInstance())) + || (suite.isTrackTestFolders() && testOutputPath == null && isModuleOutputNeeded(module, TestContentFolderTypeProvider.getInstance()))) { Project project = module.getProject(); if (suite.isModuleChecked(module)) { @@ -332,11 +334,11 @@ public Set getCorrespondingOutputFiles( } Set classFiles = new HashSet<>(); ModuleCompilerPathsManager pathsManager = ModuleCompilerPathsManager.getInstance(module); - Path outputpath = pathsManager.getCompilerOutputPath(ProductionContentFolderTypeProvider.getInstance()); - Path testOutputpath = pathsManager.getCompilerOutputPath(TestContentFolderTypeProvider.getInstance()); + Path outputPath = pathsManager.getCompilerOutputPath(ProductionContentFolderTypeProvider.getInstance()); + Path testOutputPath = pathsManager.getCompilerOutputPath(TestContentFolderTypeProvider.getInstance()); for (JavaCoverageEngineExtension extension : JavaCoverageEngineExtension.EP_NAME.getExtensions()) { - if (extension.collectOutputFiles(srcFile, outputpath, testOutputpath, suite, classFiles)) { + if (extension.collectOutputFiles(srcFile, outputPath, testOutputPath, suite, classFiles)) { return classFiles; } } @@ -345,21 +347,21 @@ public Set getCorrespondingOutputFiles( String packageVmName = packageFQName.replace('.', '/'); List children = new ArrayList<>(); - File vDir = outputpath == null + File vDir = outputPath == null ? null : packageVmName.length() > 0 - ? new File(outputpath.toFile(), packageVmName) - : outputpath.toFile(); + ? new File(outputPath.toFile(), packageVmName) + : outputPath.toFile(); if (vDir != null && vDir.exists()) { Collections.addAll(children, vDir.listFiles()); } if (suite.isTrackTestFolders()) { - File testDir = testOutputpath == null + File testDir = testOutputPath == null ? null : packageVmName.length() > 0 - ? new File(testOutputpath.toFile(), packageVmName) - : testOutputpath.toFile(); + ? new File(testOutputPath.toFile(), packageVmName) + : testOutputPath.toFile(); if (testDir != null && testDir.exists()) { Collections.addAll(children, testDir.listFiles()); } @@ -384,7 +386,7 @@ public Set getCorrespondingOutputFiles( @Override @RequiredReadAction - public String generateBriefReport( + public LocalizeValue generateBriefReport( Editor editor, PsiFile psiFile, int lineNumber, @@ -393,13 +395,12 @@ public String generateBriefReport( @Nullable CoverageLine coverageLine ) { LineData lineData = coverageLine instanceof AgentCoverageLine agentLine ? agentLine.getLineData() : null; - StringBuilder buf = new StringBuilder(); - buf.append("Hits: "); if (lineData == null) { - buf.append(0); - return buf.toString(); + return ExecutionCoverageLocalize.hitsTitle(0); } - buf.append(lineData.getHits()).append("\n"); + + StringBuilder buf = new StringBuilder(); + buf.append(ExecutionCoverageLocalize.hitsTitle(lineData.getHits()).get()).append("\n"); List expressions = new ArrayList<>(); @@ -442,7 +443,7 @@ else if (parent instanceof PsiAssertStatement assertStatement) { } } catch (AnalysisCanceledException e) { - return buf.toString(); + return LocalizeValue.of(buf.toString()); } } } @@ -508,9 +509,9 @@ else if (parent instanceof PsiAssertStatement assertStatement) { } catch (Exception e) { LOG.info(e); - return "Hits: " + lineData.getHits(); + return ExecutionCoverageLocalize.hitsTitle(0); } - return buf.toString(); + return LocalizeValue.of(buf.toString()); } @Nullable