fix a couple more warnings
This commit is contained in:
parent
5dcc32133f
commit
9dedbad34b
4 changed files with 5 additions and 5 deletions
|
@ -45,7 +45,7 @@ class ZigDebugEmitBinaryInstaller<ProfileState: ZigProfileState<*>>(
|
||||||
cli.withCharset(Charsets.UTF_8)
|
cli.withCharset(Charsets.UTF_8)
|
||||||
cli.withRedirectErrorStream(true)
|
cli.withRedirectErrorStream(true)
|
||||||
return profileState.configuration.project.zigCoroutineScope.async{
|
return profileState.configuration.project.zigCoroutineScope.async{
|
||||||
profileState.configuration.patchCommandLine(cli, toolchain)
|
profileState.configuration.patchCommandLine(cli)
|
||||||
}.asCompletableFuture().join()
|
}.asCompletableFuture().join()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -133,7 +133,7 @@ class ZigDebuggerToolchainService {
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequiresEdt
|
@RequiresEdt
|
||||||
private suspend fun doDownloadDebugger(project: Project? = null, debuggerKind: DebuggerKind): DownloadResult {
|
private suspend fun doDownloadDebugger(debuggerKind: DebuggerKind): DownloadResult {
|
||||||
val baseDir = debuggerKind.basePath()
|
val baseDir = debuggerKind.basePath()
|
||||||
val downloadableBinaries = when(debuggerKind) {
|
val downloadableBinaries = when(debuggerKind) {
|
||||||
DebuggerKind.LLDB -> {
|
DebuggerKind.LLDB -> {
|
||||||
|
@ -179,7 +179,7 @@ class ZigDebuggerToolchainService {
|
||||||
|
|
||||||
@RequiresEdt
|
@RequiresEdt
|
||||||
suspend fun downloadDebugger(project: Project? = null, debuggerKind: DebuggerKind): DownloadResult {
|
suspend fun downloadDebugger(project: Project? = null, debuggerKind: DebuggerKind): DownloadResult {
|
||||||
val result = doDownloadDebugger(project, debuggerKind)
|
val result = doDownloadDebugger(debuggerKind)
|
||||||
|
|
||||||
when(result) {
|
when(result) {
|
||||||
is DownloadResult.Ok -> {
|
is DownloadResult.Ok -> {
|
||||||
|
|
|
@ -68,7 +68,7 @@ abstract class ZigExecConfig<T: ZigExecConfig<T>>(project: Project, factory: Con
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
suspend fun patchCommandLine(commandLine: GeneralCommandLine, toolchain: AbstractZigToolchain): GeneralCommandLine {
|
suspend fun patchCommandLine(commandLine: GeneralCommandLine): GeneralCommandLine {
|
||||||
if (direnv.value) {
|
if (direnv.value) {
|
||||||
commandLine.withEnvironment(DirenvCmd.importDirenv(project).env)
|
commandLine.withEnvironment(DirenvCmd.importDirenv(project).env)
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,7 @@ abstract class ZigProfileState<T: ZigExecConfig<T>> (
|
||||||
workingDir.path?.let { cli.withWorkingDirectory(it) }
|
workingDir.path?.let { cli.withWorkingDirectory(it) }
|
||||||
cli.charset = Charsets.UTF_8
|
cli.charset = Charsets.UTF_8
|
||||||
cli.addParameters(configuration.buildCommandLineArgs(debug))
|
cli.addParameters(configuration.buildCommandLineArgs(debug))
|
||||||
return configuration.patchCommandLine(cli, toolchain)
|
return configuration.patchCommandLine(cli)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue