Skip to content

Fix line coverage in html #61

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
gayaldassanayake merged 1 commit into from
May 31, 2025
Merged

Fix line coverage in html #61

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
29 changes: 21 additions & 8 deletions scan-command/src/main/java/io/ballerina/scan/internal/StaticCodeAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,10 @@ private void checkNonIsolatedConstructsInTypeDefinition(TypeDefinitionNode typeD
TypeSymbol typeSymbol = typeDefinitionSymbol.typeDescriptor();
if (typeSymbol instanceof ObjectTypeSymbol objectTypeSymbol) {
List<Qualifier> qualifiers = objectTypeSymbol.qualifiers();
List<Qualifier> typeDefQualifiers = typeDefinitionSymbol.qualifiers();
if (hasQualifier(typeDefQualifiers, PUBLIC_KEYWORD) &&
!hasQualifier(qualifiers, ISOLATED_KEYWORD)) {
reportIssue(typeDefinitionNode, CoreRule.PUBLIC_NON_ISOLATED_OBJECT_CONSTRUCT);
Optional<Token> visibilityQualifier = typeDefinitionNode.visibilityQualifier();
if (visibilityQualifier.isPresent() && visibilityQualifier.get().kind().equals(PUBLIC_KEYWORD)
&& !hasQualifier(qualifiers, ISOLATED_KEYWORD)) {
reportIssue(visibilityQualifier.get(), CoreRule.PUBLIC_NON_ISOLATED_OBJECT_CONSTRUCT);
}
}
}
Expand All @@ -373,7 +373,9 @@ private void checkNonIsolatedPublicClassDefinition(ClassDefinitionNode classDefi
if (symbol instanceof ObjectTypeSymbol objectTypeSymbol) {
List<Qualifier> qualifiers = objectTypeSymbol.qualifiers();
if (isPublicIsolatedConstruct(qualifiers)) {
reportIssue(classDefinitionNode, CoreRule.PUBLIC_NON_ISOLATED_CLASS_CONSTRUCT);
Token visibilityQualifier = classDefinitionNode.visibilityQualifier().orElseThrow(
() -> new IllegalStateException("Expected visibility qualifier to be present"));
reportIssue(visibilityQualifier, CoreRule.PUBLIC_NON_ISOLATED_CLASS_CONSTRUCT);
}
}
});
Expand All @@ -395,8 +397,11 @@ private void checkNonIsolatedPublicClassMethod(ClassDefinitionNode classDefiniti
}

private void checkNonIsolatedPublicMethod(FunctionDefinitionNode member) {
if (isPublicIsolatedConstruct(member.qualifierList())) {
reportIssue(member, CoreRule.PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT);
NodeList<Token> qualifiers = member.qualifierList();
if (isPublicIsolatedConstruct(qualifiers)) {
Token publicToken = getQualifier(qualifiers, PUBLIC_KEYWORD).orElseThrow(
() -> new IllegalStateException("Expected public token to be present"));
reportIssue(publicToken, CoreRule.PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT);
}
}

Expand All @@ -405,12 +410,20 @@ private void checkNonIsolatedPublicFunction(FunctionDefinitionNode functionDefin
if (symbol.kind() != SymbolKind.METHOD) {
NodeList<Token> qualifiers = functionDefinitionNode.qualifierList();
if (isPublicIsolatedConstruct(qualifiers)) {
reportIssue(functionDefinitionNode, CoreRule.PUBLIC_NON_ISOLATED_FUNCTION_CONSTRUCT);
Token publicToken = getQualifier(qualifiers, PUBLIC_KEYWORD).orElseThrow(
() -> new IllegalStateException("Expected public token to be present"));
reportIssue(publicToken, CoreRule.PUBLIC_NON_ISOLATED_FUNCTION_CONSTRUCT);
}
}
});
}

private Optional<Token> getQualifier(NodeList<Token> qualifierList, SyntaxKind qualifier) {
return qualifierList.stream()
.filter(t -> t.kind() == qualifier)
.findFirst();
}

private boolean hasQualifier(List<Qualifier> qualifierList, SyntaxKind qualifierValue) {
String qualifierValueStr = qualifierValue.stringValue();
for (Qualifier qualifier : qualifierList) {
Expand Down
Binary file modified scan-command/src/main/resources/report.zip
View file
Open in desktop
Binary file not shown.
24 changes: 12 additions & 12 deletions scan-command/src/test/java/io/ballerina/scan/internal/Rule003And004Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,29 +53,29 @@ void testNonIsolatedPublicFunctionOrMethodConstructsUsage() {

List<Issue> issues = scannerContext.getReporter().getIssues();
Assert.assertEquals(issues.size(), 12);
assertIssue(issues.get(0), documentName, 16, 0, 18, 1, "ballerina:3", 3,
assertIssue(issues.get(0), documentName, 16, 0, 16, 6, "ballerina:3", 3,
PUBLIC_NON_ISOLATED_FUNCTION_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(1), documentName, 63, 4, 65, 5, "ballerina:4", 4,
assertIssue(issues.get(1), documentName, 63, 4, 63, 10, "ballerina:4", 4,
PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(2), documentName, 67, 4, 69, 5, "ballerina:4", 4,
assertIssue(issues.get(2), documentName, 67, 4, 67, 10, "ballerina:4", 4,
PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(3), documentName, 75, 4, 77, 5, "ballerina:4", 4,
assertIssue(issues.get(3), documentName, 75, 4, 75, 10, "ballerina:4", 4,
PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(4), documentName, 89, 4, 91, 5, "ballerina:4", 4,
assertIssue(issues.get(4), documentName, 89, 4, 89, 10, "ballerina:4", 4,
PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(5), documentName, 97, 4, 99, 5, "ballerina:4", 4,
assertIssue(issues.get(5), documentName, 97, 4, 97, 10, "ballerina:4", 4,
PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(6), documentName, 102, 0, 122, 1, "ballerina:5", 5,
assertIssue(issues.get(6), documentName, 102, 0, 102, 6, "ballerina:5", 5,
PUBLIC_NON_ISOLATED_CLASS_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(7), documentName, 111, 4, 113, 5, "ballerina:4", 4,
assertIssue(issues.get(7), documentName, 111, 4, 111, 10, "ballerina:4", 4,
PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(8), documentName, 133, 4, 135, 5, "ballerina:4", 4,
assertIssue(issues.get(8), documentName, 133, 4, 133, 10, "ballerina:4", 4,
PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(9), documentName, 146, 0, 166, 1, "ballerina:5", 5,
assertIssue(issues.get(9), documentName, 146, 0, 146, 6, "ballerina:5", 5,
PUBLIC_NON_ISOLATED_CLASS_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(10), documentName, 155, 4, 157, 5, "ballerina:4", 4,
assertIssue(issues.get(10), documentName, 155, 4, 155, 10, "ballerina:4", 4,
PUBLIC_NON_ISOLATED_METHOD_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(11), documentName, 180, 0, 184, 1, "ballerina:5", 5,
assertIssue(issues.get(11), documentName, 180, 0, 180, 6, "ballerina:5", 5,
PUBLIC_NON_ISOLATED_CLASS_CONSTRUCT, RuleKind.CODE_SMELL);
}
}
8 changes: 4 additions & 4 deletions scan-command/src/test/java/io/ballerina/scan/internal/Rule005And006Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ void testNonIsolatedPublicClassOrObjectConstructsUsage() {

List<Issue> issues = scannerContext.getReporter().getIssues();
Assert.assertEquals(issues.size(), 4);
assertIssue(issues.get(0), documentName, 20, 0, 22, 1, "ballerina:5", 5,
assertIssue(issues.get(0), documentName, 20, 0, 20, 6, "ballerina:5", 5,
PUBLIC_NON_ISOLATED_CLASS_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(1), documentName, 37, 0, 40, 2, "ballerina:6", 6,
assertIssue(issues.get(1), documentName, 37, 0, 37, 6, "ballerina:6", 6,
PUBLIC_NON_ISOLATED_OBJECT_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(2), documentName, 57, 0, 60, 2, "ballerina:6", 6,
assertIssue(issues.get(2), documentName, 57, 0, 57, 6, "ballerina:6", 6,
PUBLIC_NON_ISOLATED_OBJECT_CONSTRUCT, RuleKind.CODE_SMELL);
assertIssue(issues.get(3), documentName, 74, 0, 76, 1, "ballerina:5", 5,
assertIssue(issues.get(3), documentName, 74, 0, 74, 6, "ballerina:5", 5,
PUBLIC_NON_ISOLATED_CLASS_CONSTRUCT, RuleKind.CODE_SMELL);
}
}
2 changes: 1 addition & 1 deletion scan-command/src/test/resources/command-outputs/common/empty-issues-html-report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="description" content="Ballerina Scan Report"/><link rel="icon" href="./favicon.ico"/><link rel="manifest" href="./manifest.json"/><title>Ballerina Static Code Analysis Report</title><script defer="defer" src="./static/js/main.2a3e436d.js"></script><link href="./static/css/main.8d242420.css" rel="stylesheet"></head><body><div id="root"></div><script id="scanData" type="text/json">{
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="description" content="Ballerina Scan Report"/><link rel="icon" href="./favicon.ico"/><link rel="manifest" href="./manifest.json"/><title>Ballerina Static Code Analysis Report</title><script defer="defer" src="./static/js/main.f54f7504.js"></script><link href="./static/css/main.8d242420.css" rel="stylesheet"></head><body><div id="root"></div><script id="scanData" type="text/json">{
"projectName": "valid_bal_project",
"scannedFiles": []
}</script></body></html>
2 changes: 1 addition & 1 deletion scan-command/src/test/resources/command-outputs/unix/issues-html-report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="description" content="Ballerina Scan Report"/><link rel="icon" href="./favicon.ico"/><link rel="manifest" href="./manifest.json"/><title>Ballerina Static Code Analysis Report</title><script defer="defer" src="./static/js/main.2a3e436d.js"></script><link href="./static/css/main.8d242420.css" rel="stylesheet"></head><body><div id="root"></div><script id="scanData" type="text/json">{
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="description" content="Ballerina Scan Report"/><link rel="icon" href="./favicon.ico"/><link rel="manifest" href="./manifest.json"/><title>Ballerina Static Code Analysis Report</title><script defer="defer" src="./static/js/main.f54f7504.js"></script><link href="./static/css/main.8d242420.css" rel="stylesheet"></head><body><div id="root"></div><script id="scanData" type="text/json">{
"projectName": "valid_bal_project",
"scannedFiles": [
{
Expand Down
2 changes: 1 addition & 1 deletion scan-command/src/test/resources/command-outputs/windows/issues-html-report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="description" content="Ballerina Scan Report"/><link rel="icon" href="./favicon.ico"/><link rel="manifest" href="./manifest.json"/><title>Ballerina Static Code Analysis Report</title><script defer="defer" src="./static/js/main.2a3e436d.js"></script><link href="./static/css/main.8d242420.css" rel="stylesheet"></head><body><div id="root"></div><script id="scanData" type="text/json">{
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="description" content="Ballerina Scan Report"/><link rel="icon" href="./favicon.ico"/><link rel="manifest" href="./manifest.json"/><title>Ballerina Static Code Analysis Report</title><script defer="defer" src="./static/js/main.f54f7504.js"></script><link href="./static/css/main.8d242420.css" rel="stylesheet"></head><body><div id="root"></div><script id="scanData" type="text/json">{
"projectName": "valid_bal_project",
"scannedFiles": [
{
Expand Down
2 changes: 1 addition & 1 deletion scan-command/tool-scan/BalTool.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
id = "scan"

[[dependency]]
path = "../build/libs/scan-command-0.9.0.jar"
path = "../build/libs/scan-command-0.9.1-SNAPSHOT.jar"
2 changes: 1 addition & 1 deletion scan-command/tool-scan/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerina"
name = "tool_scan"
version = "0.9.0"
version = "0.9.1-SNAPSHOT"
distribution = "2201.12.0"
authors = ["Ballerina"]
keywords = ["scan", "static code analysis"]
Expand Down
2 changes: 1 addition & 1 deletion scan-command/tool-scan/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ distribution-version = "2201.12.0"
[[package]]
org = "ballerina"
name = "tool_scan"
version = "0.9.0"
version = "0.9.1-SNAPSHOT"
modules = [
{org = "ballerina", packageName = "tool_scan", moduleName = "tool_scan"}
]
Expand Down
Loading
Loading