Skip to content

Commit 5279899

Browse files
committed
Build: get rid of the internal API calls
1 parent 778018e commit 5279899

File tree

4 files changed

+21
-27
lines changed

4 files changed

+21
-27
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.intellij.plugin.powershell.ide
2+
3+
import com.intellij.openapi.diagnostic.Logger
4+
import kotlin.coroutines.cancellation.CancellationException
5+
6+
/**
7+
* See [IJPL-171743](https://youtrack.jetbrains.com/issue/IJPL-171743) for details: IntelliJ has a similar function, but
8+
* it's marked as internal.
9+
*/
10+
inline fun <T> Logger.runAndLogException(action: () -> T): T? {
11+
try {
12+
return action()
13+
} catch (t: Throwable) {
14+
if (t is CancellationException) throw t
15+
error(t)
16+
return null
17+
}
18+
}

src/main/kotlin/com/intellij/plugin/powershell/ide/run/PowerShellScriptCommandLineState.kt

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,55 +4,33 @@ import com.intellij.execution.DefaultExecutionResult
44
import com.intellij.execution.ExecutionException
55
import com.intellij.execution.ExecutionResult
66
import com.intellij.execution.Executor
7-
import com.intellij.execution.configurations.GeneralCommandLine
87
import com.intellij.execution.configurations.PtyCommandLine
98
import com.intellij.execution.configurations.RunProfileState
10-
import com.intellij.execution.executors.DefaultDebugExecutor
11-
import com.intellij.execution.executors.DefaultRunExecutor
129
import com.intellij.execution.process.KillableProcessHandler
1310
import com.intellij.execution.process.ProcessHandler
1411
import com.intellij.execution.runners.ExecutionEnvironment
1512
import com.intellij.execution.runners.ProgramRunner
1613
import com.intellij.execution.util.ProgramParametersUtil
1714
import com.intellij.openapi.application.readAction
1815
import com.intellij.openapi.diagnostic.logger
19-
import com.intellij.openapi.diagnostic.runAndLogException
2016
import com.intellij.openapi.options.advanced.AdvancedSettings
21-
import com.intellij.openapi.project.Project
2217
import com.intellij.openapi.roots.ProjectRootManager
2318
import com.intellij.openapi.util.io.NioFiles.toPath
2419
import com.intellij.openapi.util.text.StringUtil
2520
import com.intellij.openapi.vfs.LocalFileSystem
26-
import com.intellij.openapi.vfs.VfsUtil
27-
import com.intellij.plugin.powershell.ide.PluginProjectRoot
28-
import com.intellij.plugin.powershell.ide.debugger.PowerShellBreakpointType
29-
import com.intellij.plugin.powershell.ide.debugger.PowerShellDebugSession
30-
import com.intellij.plugin.powershell.lang.debugger.PSDebugClient
21+
import com.intellij.plugin.powershell.ide.runAndLogException
3122
import com.intellij.plugin.powershell.lang.lsp.LSPInitMain
32-
import com.intellij.plugin.powershell.lang.lsp.languagehost.EditorServicesLanguageHostStarter
3323
import com.intellij.plugin.powershell.lang.lsp.languagehost.PowerShellNotInstalled
3424
import com.intellij.terminal.TerminalExecutionConsole
35-
import com.intellij.util.io.await
3625
import com.intellij.util.text.nullize
37-
import com.intellij.xdebugger.XDebugSession
38-
import com.intellij.xdebugger.XDebuggerManager
3926
import kotlinx.coroutines.Dispatchers
40-
import kotlinx.coroutines.runBlocking
4127
import kotlinx.coroutines.withContext
42-
import org.eclipse.lsp4j.debug.*
43-
import org.eclipse.lsp4j.debug.launch.DSPLauncher
44-
import org.eclipse.lsp4j.debug.services.IDebugProtocolServer
45-
import org.eclipse.lsp4j.jsonrpc.Launcher
4628
import org.jetbrains.annotations.TestOnly
4729
import java.io.File
48-
import java.io.InputStream
49-
import java.io.OutputStream
5030
import java.nio.charset.Charset
5131
import java.nio.file.Path
52-
import java.util.concurrent.TimeUnit
5332
import java.util.regex.Pattern
5433

55-
5634
class PowerShellScriptCommandLineState(
5735
val runConfiguration: PowerShellRunConfiguration,
5836
private val environment: ExecutionEnvironment
@@ -134,8 +112,6 @@ class PowerShellScriptCommandLineState(
134112
}
135113
}
136114

137-
138-
139115
private fun getTerminalCharSet(): Charset {
140116
val name = AdvancedSettings.getString("terminal.character.encoding")
141117
return logger.runAndLogException { charset(name) } ?: Charsets.UTF_8

src/main/kotlin/com/intellij/plugin/powershell/lang/lsp/ide/EditorEventManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ package com.intellij.plugin.powershell.lang.lsp.ide
66
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
77
import com.intellij.openapi.application.ApplicationManager
88
import com.intellij.openapi.diagnostic.logger
9-
import com.intellij.openapi.diagnostic.runAndLogException
109
import com.intellij.openapi.editor.Editor
1110
import com.intellij.openapi.editor.event.DocumentEvent
1211
import com.intellij.openapi.project.Project
1312
import com.intellij.openapi.util.Key
1413
import com.intellij.openapi.util.removeUserData
1514
import com.intellij.openapi.util.text.StringUtil
15+
import com.intellij.plugin.powershell.ide.runAndLogException
1616
import com.intellij.plugin.powershell.lang.PowerShellLanguage
1717
import com.intellij.plugin.powershell.lang.lsp.ide.listeners.DocumentListenerImpl
1818
import com.intellij.plugin.powershell.lang.lsp.ide.listeners.EditorMouseListenerImpl

src/main/kotlin/com/intellij/plugin/powershell/lang/lsp/languagehost/LanguageServerEndpoint.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import com.intellij.ide.actions.ShowSettingsUtilImpl
77
import com.intellij.notification.*
88
import com.intellij.openapi.Disposable
99
import com.intellij.openapi.diagnostic.logger
10-
import com.intellij.openapi.diagnostic.runAndLogException
1110
import com.intellij.openapi.editor.Editor
1211
import com.intellij.openapi.fileEditor.FileDocumentManager
1312
import com.intellij.openapi.project.Project
@@ -20,6 +19,7 @@ import com.intellij.openapi.vfs.newvfs.events.VFileEvent
2019
import com.intellij.plugin.powershell.PowerShellIcons
2120
import com.intellij.plugin.powershell.ide.MessagesBundle
2221
import com.intellij.plugin.powershell.ide.PluginProjectRoot
22+
import com.intellij.plugin.powershell.ide.runAndLogException
2323
import com.intellij.plugin.powershell.lang.lsp.client.PSLanguageClientImpl
2424
import com.intellij.plugin.powershell.lang.lsp.ide.DEFAULT_DID_CHANGE_CONFIGURATION_PARAMS
2525
import com.intellij.plugin.powershell.lang.lsp.ide.EditorEventManager

0 commit comments

Comments
 (0)