mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-03-22 06:50:54 +07:00
[JavaScript Debugger] WEB-70462 Fix encoded file urls parsing
(cherry picked from commit b8b0570b25c8019b9f19bb6c5f1230cae7c4d7c7) IJ-CR-157267 GitOrigin-RevId: e765d5660f343effc45c33696ff72169cc1c7166
This commit is contained in:
committed by
intellij-monorepo-bot
parent
d1496583be
commit
aaa5113400
@@ -10,7 +10,6 @@ import com.intellij.util.Url
|
||||
import com.intellij.util.Urls
|
||||
import com.intellij.util.io.URLUtil
|
||||
import org.jetbrains.annotations.ApiStatus
|
||||
import java.net.URISyntaxException
|
||||
|
||||
@ApiStatus.Internal
|
||||
object ScriptDebuggerUrls {
|
||||
@@ -29,13 +28,16 @@ object ScriptDebuggerUrls {
|
||||
}
|
||||
|
||||
private fun toUriPath(path: String): String {
|
||||
var result = FileUtilRt.toSystemIndependentName(path)
|
||||
var result = decodeAndConvertToSystemIndependent(path)
|
||||
if (result.length >= 2 && result[1] == ':') result = "/$result"
|
||||
return result
|
||||
}
|
||||
|
||||
// Shumaf: I hate that we have so many ways to parse a URL, yet none of them are correct
|
||||
private fun decodeAndConvertToSystemIndependent(path: String): String = FileUtilRt.toSystemIndependentName(URLUtil.unescapePercentSequences(path))
|
||||
|
||||
private fun toUri(absoluteOrRelativePath: String): Url {
|
||||
var result = FileUtilRt.toSystemIndependentName(absoluteOrRelativePath)
|
||||
var result = decodeAndConvertToSystemIndependent(absoluteOrRelativePath)
|
||||
if (result.length >= 2 && result[1] == ':') result = "/$result"
|
||||
return if (result.isNotEmpty() && result[0] == '/') newLocalFileUrl(result) else Urls.newUnparsable(result)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user