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

Jump to bottom

feat: display up to 60 chars of the filepath in tree view #451

Merged

bastiandoetsch merged 9 commits into master from feat/display-relative-path-to-file-in-tool-window-tree-node

Oct 9, 2023

Collaborator

bastiandoetsch commented Sep 22, 2023 •

edited

Loading

Description

Display up to 60 chars of the filepath in tree view

Checklist

Tests added and all succeed
Linted
CHANGELOG.md updated
README.md updated, if user-facing

Screenshots / GIFs

bastiandoetsch requested a review from a team as a code owner

September 22, 2023 09:10

github-advanced-security bot found potential problems

View reviewed changes

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt Fixed Show fixed Hide fixed

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt Fixed Show fixed Hide fixed

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt Fixed Show fixed Hide fixed

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt Fixed Show fixed Hide fixed

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt Fixed Show fixed Hide fixed

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt Fixed Show fixed Hide fixed

bastiandoetsch changed the title ~~feat: display up to 70 chars of the filepath in tree view~~ feat: display up to 60 chars of the filepath in tree view

github-advanced-security bot found potential problems

View reviewed changes

src/test/kotlin/snyk/oss/OssServiceTest.kt

                                   {
                                     "ok": false,
                                     "error": "Missing node_modules folder: we can't test without dependencies.\nPlease run 'npm install' first.",
                                     "path": "/Users/user/Desktop/example-npm-project"
                                   }
-                              """.trimIndent())
+                              """.trimIndent()

Check warning

Code scanning / detekt

Reports mis-indented code Warning test

Unexpected indent of multiline string closing quotes

src/test/kotlin/snyk/oss/OssServiceTest.kt

                                   Missing node_modules folder: we can't test without dependencies. Please run 'npm install' first.
-                              """.trimIndent())
+                              """.trimIndent()

Check warning

Code scanning / detekt

Reports mis-indented code Warning test

Unexpected indent of multiline string closing quotes

src/test/kotlin/snyk/oss/OssServiceTest.kt

                                   {
                                     "ok": false,
                                     "error": ["could not be","array here"],
                                     "path": "some/path/here"
                                   }
-                              """.trimIndent())
+                              """.trimIndent()

Check warning

Code scanning / detekt

Reports mis-indented code Warning test

Unexpected indent of multiline string closing quotes

src/test/kotlin/snyk/oss/OssServiceTest.kt

                                   {
                                     "ok": false,
                                     "error": "error",
                                     "path_not_provided": ""
                                   }
-                              """.trimIndent())
+                              """.trimIndent()

Check warning

Code scanning / detekt

Reports mis-indented code Warning test

Unexpected indent of multiline string closing quotes

src/test/kotlin/snyk/oss/OssServiceTest.kt

Comment on lines +371 to +372

		cliResult3.getFirstError()!!.message.contains(
		"Parameter specified as non-null is null: method snyk.oss.OssVulnerabilitiesForFile.copy, parameter displayTargetFile"

Check warning

Code scanning / detekt

Reports lines with exceeded length Warning test

Exceeded max line length (120)

src/test/kotlin/snyk/oss/OssServiceTest.kt

-                      ))
+                      assertTrue(
+                          cliResult3.getFirstError()!!.message.contains(
+                              "Parameter specified as non-null is null: method snyk.oss.OssVulnerabilitiesForFile.copy, parameter displayTargetFile"

Check warning

Code scanning / detekt

Line detected, which is longer than the defined maximum line length in the code style. Warning test

Line detected, which is longer than the defined maximum line length in the code style.

bastiandoetsch commented

View reviewed changes

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt

Comment on lines +73 to +85

+                              val relativePath = fileVulns.virtualFile?.let {
+                                  GotoFileCellRenderer.getRelativePath(
+                                      fileVulns.virtualFile, value.project
+                                  )
+                              } ?: ""
+                              toolTipText =
+                                  relativePath + fileVulns.sanitizedTargetFile + ProductType.OSS.getCountText(value.childCount)
+                              text = toolTipText.letIf(toolTipText.length > MAX_FILE_TREE_NODE_LENGTH) {
+                                  "..." + it.substring(
+                                      it.length - MAX_FILE_TREE_NODE_LENGTH, it.length
+                                  )
+                              }

Collaborator Author

bastiandoetsch Sep 22, 2023

This may be interesting for review

bastiandoetsch commented

View reviewed changes

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt

Comment on lines +112 to +122

+                              toolTipText =
+                                  GotoFileCellRenderer.getRelativePath(file.virtualFile, file.project) + productType.getCountText(
+                                      value.childCount
+                                  )
+                              text = toolTipText.letIf(toolTipText.length > MAX_FILE_TREE_NODE_LENGTH) {
+                                  "..." + it.substring(
+                                      it.length - MAX_FILE_TREE_NODE_LENGTH, it.length
+                                  )
+                              }

Collaborator Author

bastiandoetsch Sep 22, 2023

This may be interesting for review

bastiandoetsch commented

View reviewed changes

src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykTreeCellRenderer.kt

Comment on lines +137 to +148

+                              val relativePath = iacVulnerabilitiesForFile.virtualFile?.let {
+                                  GotoFileCellRenderer.getRelativePath(
+                                      iacVulnerabilitiesForFile.virtualFile, value.project
+                                  )
+                              } ?: iacVulnerabilitiesForFile.targetFilePath
+                              toolTipText = relativePath + ProductType.IAC.getCountText(value.childCount)
+                              text = toolTipText.letIf(toolTipText.length > MAX_FILE_TREE_NODE_LENGTH) {
+                                  "..." + it.substring(
+                                      it.length - MAX_FILE_TREE_NODE_LENGTH, it.length
+                                  )
+                              }

Collaborator Author

bastiandoetsch Sep 22, 2023

This may be interesting for review

bastiandoetsch commented

View reviewed changes

src/main/kotlin/snyk/iac/IacIssuesForFile.kt

Comment on lines +15 to +16


		val virtualFile: VirtualFile? = LocalFileSystem.getInstance().findFileByPath(this.targetFilePath)

Collaborator Author

bastiandoetsch Sep 22, 2023

This may be interesting for review

bastiandoetsch commented

View reviewed changes

src/main/kotlin/snyk/oss/OssVulnerabilitiesForFile.kt

Comment on lines +17 to +18

		val virtualFile: VirtualFile? = LocalFileSystem.getInstance().findFileByPath(this.path)

Collaborator Author

bastiandoetsch Sep 22, 2023

This may be interesting for review

bastiandoetsch commented

View reviewed changes

src/test/kotlin/io/snyk/plugin/ui/toolwindow/SnykToolWindowPanelIntegTest.kt

Comment on lines +105 to +106

		mockkStatic(GotoFileCellRenderer::class)
		every { GotoFileCellRenderer.getRelativePath(any(), any()) } returns "abc/"

Collaborator Author

bastiandoetsch Sep 22, 2023

This may be interesting for review

bastiandoetsch commented

View reviewed changes

src/test/kotlin/snyk/oss/OssServiceTest.kt

Comment on lines +44 to +45

		mockkStatic(GotoFileCellRenderer::class)
		every { GotoFileCellRenderer.getRelativePath(any(), any()) } returns "abc/"

Collaborator Author

bastiandoetsch Sep 22, 2023

This may be interesting for review

bastiandoetsch enabled auto-merge (squash)

September 22, 2023 13:41

bastiandoetsch added 9 commits

October 9, 2023 16:29


          feat: display up to 70 chars of file path in tree view for file nodes


          docs: update CHANGELOG.md

4ea3279


          chore: update linter rules and fix some linter warnings

315b46e


          chore: update linter rules

741ebee


          fix: outofmemory and formatting in SnykToolWindowPanelIntegTest

9bad140


          fix: SnykToolWindowPanelIntegTest

a7bc3fb


          fix: OssServiceTest

79604aa


          fix: detekt rule file

017eb1b


          docs: update changelog

60972c0

bastiandoetsch force-pushed the feat/display-relative-path-to-file-in-tool-window-tree-node branch from 668bd05 to 60972c0 Compare

October 9, 2023 14:33

cat2608 approved these changes

View reviewed changes

Contributor

cat2608 left a comment

🚀

bastiandoetsch merged commit bf46cf7 into master

8 checks passed

bastiandoetsch deleted the feat/display-relative-path-to-file-in-tool-window-tree-node branch

October 9, 2023 14:50

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet