Skip to content

Commit

Permalink
chore: update linter rules and fix some linter warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@bastiandoetsch
bastiandoetsch committed Sep 22, 2023
1 parent 7b4a484 commit faa8d8b
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
max_line_length = 120

[*.md]
trim_trailing_whitespace = false

[*.{kt,kts}]
indent_size = 4
wildcard_import_limit = 999
ij_kotlin_packages_to_use_import_on_demand = ^
ij_kotlin_name_count_to_use_star_import = 999
ij_kotlin_name_count_to_use_star_import_for_members = 999
Expand Down
5 changes: 5 additions & 0 deletions .github/detekt/detekt-config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
formatting:
Indentation:
continuationIndentSize: 8
MaxLineLength:
active: false
NoWildcardImports:
active: false

complexity:
# don't count private & deprecated
Expand All @@ -21,3 +25,4 @@ style:
excludeLabeled: false
excludeReturnFromLambda: true
excludeGuardClauses: true

65 changes: 27 additions & 38 deletions src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,13 @@ import java.util.*
import javax.swing.Icon
import javax.swing.JTree

private const val MAX_FILE_TREE_NODE_LENGTH = 70
private const val MAX_FILE_TREE_NODE_LENGTH = 60

class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
@Suppress("UNCHECKED_CAST")
override fun customizeCellRenderer(
tree: JTree,
value: Any,
selected: Boolean,
expanded: Boolean,
leaf: Boolean,
row: Int,
hasFocus: Boolean
tree: JTree, value: Any, selected: Boolean, expanded: Boolean, leaf: Boolean, row: Int, hasFocus: Boolean
) {

var nodeIcon: Icon? = null
var text: String? = null
var attributes = SimpleTextAttributes.REGULAR_ATTRIBUTES
Expand All @@ -73,20 +66,20 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
is FileTreeNode -> {
val fileVulns = value.userObject as OssVulnerabilitiesForFile
nodeIcon = PackageManagerIconProvider.getIcon(fileVulns.packageManager.lowercase(Locale.getDefault()))
toolTipText = GotoFileCellRenderer.getRelativePath(fileVulns.virtualFile, value.project) +
fileVulns.sanitizedTargetFile + ProductType.OSS.getCountText(value.childCount)
toolTipText = GotoFileCellRenderer.getRelativePath(
fileVulns.virtualFile, value.project
) + fileVulns.sanitizedTargetFile + ProductType.OSS.getCountText(value.childCount)

text = toolTipText.letIf(toolTipText.length > MAX_FILE_TREE_NODE_LENGTH) {
"..." + it.substring(
it.length - 47,
it.length
it.length - MAX_FILE_TREE_NODE_LENGTH, it.length
)
}

val snykCachedResults = getSnykCachedResults(value.project)
if (snykCachedResults?.currentOssResults == null) {
attributes = SimpleTextAttributes.GRAYED_ATTRIBUTES
text += obsoleteSuffix
text += OBSOLETE_SUFFIX
nodeIcon = getDisabledIcon(nodeIcon)
}
}
Expand Down Expand Up @@ -115,16 +108,15 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {

text = toolTipText.letIf(toolTipText.length > MAX_FILE_TREE_NODE_LENGTH) {
"..." + it.substring(
it.length - 47,
it.length
it.length - MAX_FILE_TREE_NODE_LENGTH, it.length
)
}

val psiFile = PDU.toPsiFile(file)
nodeIcon = psiFile?.getIcon(Iconable.ICON_FLAG_READ_STATUS)
if (!AnalysisData.instance.isFileInCache(file)) {
attributes = SimpleTextAttributes.GRAYED_ATTRIBUTES
text += obsoleteSuffix
text += OBSOLETE_SUFFIX
nodeIcon = getDisabledIcon(nodeIcon)
}
}
Expand All @@ -135,23 +127,20 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
iacVulnerabilitiesForFile.packageManager.lowercase(Locale.getDefault())
)
toolTipText = GotoFileCellRenderer.getRelativePath(
iacVulnerabilitiesForFile.virtualFile,
value.project
iacVulnerabilitiesForFile.virtualFile, value.project
) + ProductType.IAC.getCountText(value.childCount)

text = toolTipText.letIf(toolTipText.length > MAX_FILE_TREE_NODE_LENGTH) {
"..." + it.substring(
it.length - 47,
it.length
it.length - MAX_FILE_TREE_NODE_LENGTH, it.length
)
}


val snykCachedResults = getSnykCachedResults(value.project)
if (snykCachedResults?.currentIacResult == null || iacVulnerabilitiesForFile.obsolete) {
attributes = SimpleTextAttributes.GRAYED_ATTRIBUTES
nodeIcon = getDisabledIcon(nodeIcon)
text += obsoleteSuffix
text += OBSOLETE_SUFFIX
}
}

Expand All @@ -164,7 +153,7 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
if (snykCachedResults?.currentContainerResult == null || issuesForImage.obsolete) {
attributes = SimpleTextAttributes.GRAYED_ATTRIBUTES
nodeIcon = getDisabledIcon(nodeIcon)
text += obsoleteSuffix
text += OBSOLETE_SUFFIX
}
}

Expand All @@ -180,8 +169,8 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
nodeIcon = SnykIcons.getSeverityIcon(issue.getSeverity())
val prefix = if (issue.lineNumber > 0) "line ${issue.lineNumber}: " else ""
text = prefix + issue.title + when {
issue.ignored -> ignoredSuffix
snykCachedResults?.currentIacResult == null || issue.obsolete -> obsoleteSuffix
issue.ignored -> IGNORED_SUFFIX
snykCachedResults?.currentIacResult == null || issue.obsolete -> OBSOLETE_SUFFIX
else -> ""
}
if (snykCachedResults?.currentIacResult == null || issue.ignored || issue.obsolete) {
Expand All @@ -195,8 +184,8 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
val snykCachedResults = getSnykCachedResults(value.project)
nodeIcon = SnykIcons.getSeverityIcon(issue.getSeverity())
text = issue.title + when {
issue.ignored -> ignoredSuffix
snykCachedResults?.currentContainerResult == null || issue.obsolete -> obsoleteSuffix
issue.ignored -> IGNORED_SUFFIX
snykCachedResults?.currentContainerResult == null || issue.obsolete -> OBSOLETE_SUFFIX
else -> ""
}
if (snykCachedResults?.currentContainerResult == null || issue.ignored || issue.obsolete) {
Expand All @@ -217,7 +206,7 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
text = if (settings.ossScanEnable) {
value.userObject.toString()
} else {
SnykToolWindowPanel.OSS_ROOT_TEXT + disabledSuffix
SnykToolWindowPanel.OSS_ROOT_TEXT + DISABLED_SUFFIX
}
}

Expand All @@ -233,8 +222,8 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
text = if (settings.snykCodeSecurityIssuesScanEnable) {
value.userObject.toString()
} else {
SnykToolWindowPanel.CODE_SECURITY_ROOT_TEXT +
snykCodeAvailabilityPostfix().ifEmpty { disabledSuffix }
SnykToolWindowPanel.CODE_SECURITY_ROOT_TEXT + snykCodeAvailabilityPostfix()
.ifEmpty { DISABLED_SUFFIX }
}
}

Expand All @@ -250,8 +239,8 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
text = if (settings.snykCodeQualityIssuesScanEnable) {
value.userObject.toString()
} else {
SnykToolWindowPanel.CODE_QUALITY_ROOT_TEXT +
snykCodeAvailabilityPostfix().ifEmpty { disabledSuffix }
SnykToolWindowPanel.CODE_QUALITY_ROOT_TEXT + snykCodeAvailabilityPostfix()
.ifEmpty { DISABLED_SUFFIX }
}
}

Expand All @@ -267,7 +256,7 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
text = if (settings.iacScanEnabled) {
value.userObject.toString()
} else {
SnykToolWindowPanel.IAC_ROOT_TEXT + disabledSuffix
SnykToolWindowPanel.IAC_ROOT_TEXT + DISABLED_SUFFIX
}
}

Expand All @@ -283,7 +272,7 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
text = if (settings.containerScanEnabled) {
value.userObject.toString()
} else {
SnykToolWindowPanel.CONTAINER_ROOT_TEXT + disabledSuffix
SnykToolWindowPanel.CONTAINER_ROOT_TEXT + DISABLED_SUFFIX
}
}
}
Expand All @@ -293,8 +282,8 @@ class SnykTreeCellRenderer : ColoredTreeCellRenderer() {
}

companion object {
private const val obsoleteSuffix = " (obsolete)"
private const val ignoredSuffix = " (ignored)"
private const val disabledSuffix = " (disabled in Settings)"
private const val OBSOLETE_SUFFIX = " (obsolete)"
private const val IGNORED_SUFFIX = " (ignored)"
private const val DISABLED_SUFFIX = " (disabled in Settings)"
}
}

0 comments on commit faa8d8b

Please sign in to comment.