MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-14 18:05:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

[diff] DBE-23091 Fix unhandled InvalidPathException

Browse Source 
GitOrigin-RevId: 26fe13d4fe10379878c62f0884f2ca0b27cce455
This commit is contained in:
Ilia.Shulgin
2025-04-24 13:46:28 +02:00
committed by intellij-monorepo-bot
parent 47d3c5722f
commit b4276da83b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/diff-impl/src/com/intellij/diff/impl/DiffEditorTitleDetails.kt
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.diff.impl
import com.intellij.diff.DiffEditorTitleCustomizer
@@ -9,6 +9,7 @@ import com.intellij.openapi.project.guessProjectDir
import com.intellij.openapi.util.NlsContexts
import com.intellij.openapi.util.NlsSafe
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.io.toNioPathOrNull
import com.intellij.openapi.vcs.FilePath
import com.intellij.ui.components.JBLabel
import org.jetbrains.annotations.ApiStatus
@@ -46,13 +47,13 @@ class DiffEditorTitleDetails(val pathLabel: DetailsLabelProvider?, val revisionL
)
private fun getRelativeOrFullPath(project: Project?, file: FilePath): @NlsSafe String {
val fileNioPath = file.path.toNioPathOrNull() ?: return file.path
val guessedProjectDir = project?.guessProjectDir()
if (guessedProjectDir == null) return FileUtil.getLocationRelativeToUserHome(file.presentableUrl)
val filePath = file.ioFile.toPath()
val projectDirPath = guessedProjectDir.toNioPath()
return if (filePath.startsWith(projectDirPath)) projectDirPath.relativize(filePath).toString()
return if (fileNioPath.startsWith(projectDirPath)) projectDirPath.relativize(fileNioPath).toString()
else FileUtil.getLocationRelativeToUserHome(file.presentableUrl)
}
}