Skip to content

Coverage fix #94

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
VISTALL merged 3 commits into from
Jun 18, 2025
Merged

Coverage fix #94

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b35f6f
Reformatting DotNetCoverageViewExtension.
unv-unv Jun 18, 2025
f03babb
Refactoring DotNetCoverageViewExtension.
unv-unv Jun 18, 2025
6b6cf41
Fixing DotNetCoverageViewExtension.
unv-unv Jun 18, 2025
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
297 changes: 139 additions & 158 deletions ...tion-impl/src/main/java/consulo/dotnet/run/impl/coverage/DotNetCoverageViewExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package consulo.dotnet.run.impl.coverage;

import com.intellij.rt.coverage.data.ClassData;
import com.intellij.rt.coverage.data.LineData;
import consulo.application.ApplicationManager;
import consulo.annotation.access.RequiredReadAction;
import consulo.dotnet.psi.DotNetNamedElement;
import consulo.dotnet.psi.DotNetTypeDeclaration;
import consulo.dotnet.psi.resolve.DotNetNamespaceAsElement;
import consulo.dotnet.psi.resolve.DotNetPsiSearcher;
import consulo.execution.coverage.CoverageSuitesBundle;
import consulo.execution.coverage.CoverageViewManager;
import consulo.execution.coverage.localize.ExecutionCoverageLocalize;
import consulo.execution.coverage.view.CoverageListRootNode;
import consulo.execution.coverage.view.CoverageViewExtension;
import consulo.execution.coverage.view.ElementColumnInfo;
Expand All @@ -35,169 +35,150 @@
import consulo.project.Project;
import consulo.project.ui.view.tree.AbstractTreeNode;
import consulo.ui.ex.awt.ColumnInfo;

import jakarta.annotation.Nullable;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.function.Supplier;

/**
* @author VISTALL
* @since 10.01.15
* @since 2015-01-10
*/
public class DotNetCoverageViewExtension extends CoverageViewExtension
{
private static final String UNKNOWN = "?? %";

private final GlobalSearchScope mySearchScope;

public DotNetCoverageViewExtension(Project project, CoverageSuitesBundle suitesBundle, CoverageViewManager.StateBean stateBean)
{
super(project, suitesBundle, stateBean);
mySearchScope = getSuitesBundle().getSearchScope(getProject());
}

@Nullable
@Override
public String getSummaryForNode(AbstractTreeNode node)
{
return null;
}

@Nullable
@Override
public String getSummaryForRootNode(AbstractTreeNode childNode)
{
return null;
}

@Nullable
@Override
public String getPercentage(int columnIdx, AbstractTreeNode node)
{
Object value = node.getValue();
if(!(value instanceof PsiElement))
{
return UNKNOWN;
}
double percentValue = getPercentValue((PsiElement) value, -1);
if(percentValue == -1)
{
return UNKNOWN;
}
else
{
return percentValue + " %";
}
}

private double getPercentValue(PsiElement value, double unknownValue)
{
if(value instanceof DotNetTypeDeclaration)
{
String vmQName = ((DotNetTypeDeclaration) value).getVmQName();
if(vmQName == null)
{
return unknownValue;
}

ClassData classData = getSuitesBundle().getCoverageData().getOrCreateClassData(vmQName);

LineData[] lines = (LineData[]) classData.getLines();
if(lines == null)
{
return unknownValue;
}

int len = 0;
double i = 0;
for(LineData line : lines)
{
if(line != null)
{
if(line.getHits() > 0)
{
i++;
}
len ++;
}
}

return (i / len) * 100;
}
else if(value instanceof DotNetNamespaceAsElement)
{
Collection<PsiElement> children = ((DotNetNamespaceAsElement) value).getChildren(mySearchScope, DotNetNamespaceAsElement.ChildrenFilter.NONE);
double all = 0;
for(PsiElement temp : children)
{
all += getPercentValue(temp, 0);
}

return all / children.size();
}
return unknownValue;
}

@Override
public List<AbstractTreeNode> getChildrenNodes(final AbstractTreeNode node)
{
return ApplicationManager.getApplication().runReadAction(new Supplier<List<AbstractTreeNode>>()
{
@Override
public List<AbstractTreeNode> get()
{
List<AbstractTreeNode> nodes = new ArrayList<AbstractTreeNode>();
Object element = node.getValue();
if(element instanceof DotNetNamespaceAsElement)
{
Collection<PsiElement> children = ((DotNetNamespaceAsElement) element).getChildren(mySearchScope, DotNetNamespaceAsElement.ChildrenFilter.NONE);
for(PsiElement element1 : children)
{
if(element1 instanceof PsiNamedElement)
{
CoverageListRootNode e = new CoverageListRootNode(getProject(), (PsiNamedElement) element1, getSuitesBundle(),
getStateBean());
e.setParent(node);
nodes.add(e);
}
}
}
else if(element instanceof DotNetTypeDeclaration)
{
for(DotNetNamedElement element1 : ((DotNetTypeDeclaration) element).getMembers())
{
if(element1 instanceof DotNetTypeDeclaration)
{
CoverageListRootNode e = new CoverageListRootNode(getProject(), element1, getSuitesBundle(), getStateBean());
e.setParent(node);
nodes.add(e);
}
}
}
return nodes;
}
});
}

@Override
public ColumnInfo[] createColumnInfos()
{
return new ColumnInfo[]{new ElementColumnInfo(), new PercentageCoverageColumnInfo(1, "Statistics, %", getSuitesBundle(), getStateBean())};
}

@Nullable
@Override
public PsiElement getParentElement(PsiElement element)
{
return element.getParent();
}

@Override
public AbstractTreeNode createRootNode()
{
DotNetNamespaceAsElement namespace = DotNetPsiSearcher.getInstance(getProject()).findNamespace("", mySearchScope);
return new CoverageListRootNode(getProject(), namespace, getSuitesBundle(), getStateBean());
}
public class DotNetCoverageViewExtension extends CoverageViewExtension {
private static final String UNKNOWN = "?? %";

private final GlobalSearchScope mySearchScope;

public DotNetCoverageViewExtension(Project project, CoverageSuitesBundle suitesBundle, CoverageViewManager.StateBean stateBean) {
super(project, suitesBundle, stateBean);
mySearchScope = getSuitesBundle().getSearchScope(getProject());
}

@Nullable
@Override
public String getSummaryForNode(AbstractTreeNode node) {
return null;
}

@Nullable
@Override
public String getSummaryForRootNode(AbstractTreeNode childNode) {
return null;
}

@Nullable
@Override
@RequiredReadAction
public String getPercentage(int columnIdx, AbstractTreeNode node) {
Object value = node.getValue();
if (!(value instanceof PsiElement)) {
return UNKNOWN;
}
double percentValue = getPercentValue((PsiElement) value, -1);
if (percentValue == -1) {
return UNKNOWN;
}
else {
return percentValue + " %";
}
}

@RequiredReadAction
private double getPercentValue(PsiElement value, double unknownValue) {
if (value instanceof DotNetTypeDeclaration typeDeclaration) {
String vmQName = typeDeclaration.getVmQName();
if (vmQName == null) {
return unknownValue;
}

ClassData classData = getSuitesBundle().getCoverageData().getOrCreateClassData(vmQName);

LineData[] lines = (LineData[]) classData.getLines();
if (lines == null) {
return unknownValue;
}

int len = 0;
double i = 0;
for (LineData line : lines) {
if (line != null) {
if (line.getHits() > 0) {
i++;
}
len++;
}
}

return (i / len) * 100;
}
else if (value instanceof DotNetNamespaceAsElement namespaceAsElement) {
Collection<PsiElement> children = namespaceAsElement.getChildren(mySearchScope, DotNetNamespaceAsElement.ChildrenFilter.NONE);
double all = 0;
for (PsiElement temp : children) {
all += getPercentValue(temp, 0);
}

return all / children.size();
}
return unknownValue;
}

@Override
public List<AbstractTreeNode> getChildrenNodes(AbstractTreeNode node) {
return myProject.getApplication().runReadAction((Supplier<List<AbstractTreeNode>>) () -> {
List<AbstractTreeNode> nodes = new ArrayList<>();
Object element = node.getValue();
if (element instanceof DotNetNamespaceAsElement namespaceAsElement) {
Collection<PsiElement> children =
namespaceAsElement.getChildren(mySearchScope, DotNetNamespaceAsElement.ChildrenFilter.NONE);
for (PsiElement child : children) {
if (child instanceof PsiNamedElement namedElement) {
CoverageListRootNode e = new CoverageListRootNode(getProject(), namedElement, getSuitesBundle(),
getStateBean()
);
e.setParent(node);
nodes.add(e);
}
}
}
else if (element instanceof DotNetTypeDeclaration typeDeclaration) {
for (DotNetNamedElement members : typeDeclaration.getMembers()) {
if (members instanceof DotNetTypeDeclaration) {
CoverageListRootNode e = new CoverageListRootNode(getProject(), members, getSuitesBundle(), getStateBean());
e.setParent(node);
nodes.add(e);
}
}
}
return nodes;
});
}

@Override
public ColumnInfo[] createColumnInfos() {
return new ColumnInfo[]{
new ElementColumnInfo(),
new PercentageCoverageColumnInfo(
1,
ExecutionCoverageLocalize.tableColumnNameStatistics(),
getSuitesBundle(),
getStateBean()
)
};
}

@Nullable
@Override
public PsiElement getParentElement(PsiElement element) {
return element.getParent();
}

@Override
@RequiredReadAction
public AbstractTreeNode createRootNode() {
DotNetNamespaceAsElement namespace = DotNetPsiSearcher.getInstance(getProject()).findNamespace("", mySearchScope);
return new CoverageListRootNode(getProject(), namespace, getSuitesBundle(), getStateBean());
}
}
Loading