MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-13 15:52:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Better null safety

Browse Source 
(cherry picked from commit 82de48da15a8cc39e2f89de63ad50c9128b5348a)

IJ-MR-144601

GitOrigin-RevId: 4dfc182f973b9ef2e9d3c946c9e5821477385904
This commit is contained in:
Egor Malyshev
2024-09-11 15:12:44 +02:00
committed by intellij-monorepo-bot
parent 226d0c031f
commit 0aacc9080d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/built-in-help/src/com/jetbrains/builtInHelp/BuiltInHelpManager.kt
View File

@@ -25,13 +25,14 @@ private val LOG = Logger.getInstance(BuiltInHelpManager::class.java)
class BuiltInHelpManager : HelpManager() {
override fun invokeHelp(helpId: String?) {
logWillOpenHelpId(helpId)
val helpIdToUse = helpId ?: "top"
logWillOpenHelpId(helpIdToUse)
try {
var url = "http://127.0.0.1:${BuiltInServerOptions.getInstance().effectiveBuiltInServerPort}/help/?${
if (helpId != null) URLEncoder.encode(
helpId, StandardCharsets.UTF_8)
else "top"
URLEncoder.encode(
helpIdToUse, StandardCharsets.UTF_8)
}"
val tryOpenWebSite = java.lang.Boolean.valueOf(Utils.getStoredValue(
SettingsPage.OPEN_HELP_FROM_WEB, "true"))
@@ -70,7 +71,7 @@ class BuiltInHelpManager : HelpManager() {
url = "${baseUrl}help/$productWebPath/$productVersion/?${
URLEncoder.encode(
helpId, StandardCharsets.UTF_8)
helpIdToUse, StandardCharsets.UTF_8)
}"
if (PlatformUtils.isJetBrainsProduct() && baseUrl == Utils.BASE_HELP_URL) {
@@ -95,10 +96,10 @@ class BuiltInHelpManager : HelpManager() {
}
catch (e: URISyntaxException) {
LOG.error("Help id '$helpId' produced an invalid URL.", e)
LOG.error("Help id '$helpIdToUse' produced an invalid URL.", e)
}
catch (e: IOException) {
LOG.error("Cannot load help for '$helpId'.", e)
LOG.error("Cannot load help for '$helpIdToUse'.", e)
}
}
}