Skip to content

Commit e11a9a5

Browse files
vol0nvol0n
committed
Postpone request building until execution to catch errors
1 parent d98a8b1 commit e11a9a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+680
-312
lines changed

‎clion-plugin/build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ plugins {
4646
kotlin("plugin.serialization") version "1.6.10"
4747
id("com.google.protobuf") version "0.8.15"
4848
// code style
49-
id("io.gitlab.arturbosch.detekt").version("1.21.0")
49+
// id("io.gitlab.arturbosch.detekt").version("1.21.0")
5050
idea
5151
application
5252
}
@@ -84,10 +84,12 @@ sourceSets {
8484
}
8585
}
8686

87+
/*
8788
detekt {
8889
buildUponDefaultConfig = true // preconfigure defaults
8990
allRules = false // activate all available (even unstable) rules.
9091
}
92+
*/
9193

9294
//kotlin {
9395
// jvmToolchain {
@@ -166,12 +168,14 @@ qodana {
166168
}
167169

168170
tasks {
171+
/**
169172
withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
170173
jvmTarget = "1.8"
171174
}
172175
withType<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>().configureEach {
173176
jvmTarget = "1.8"
174177
}
178+
*/
175179

176180
// Set the JVM compatibility versions
177181
properties("javaVersion").let {

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/AskServerToGenerateBuildDir.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ import com.intellij.openapi.actionSystem.AnAction
44
import com.intellij.openapi.actionSystem.AnActionEvent
55
import org.utbot.cpp.clion.plugin.UTBot
66
import org.utbot.cpp.clion.plugin.client.requests.CreateBuildDirRequest
7+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
8+
import org.utbot.cpp.clion.plugin.utils.activeProject
9+
import testsgen.Testgen
710

811
class AskServerToGenerateBuildDir : AnAction(UTBot.message("projectConfigure.generate.buildDir")) {
912

10-
override fun actionPerformed(e: AnActionEvent) = CreateBuildDirRequest(e).executeUsingCurrentClient()
13+
override fun actionPerformed(e: AnActionEvent) = CreateBuildDirRequest(
14+
ParamsBuilder(e.activeProject()).buildProjectConfigRequestParams(Testgen.ConfigMode.CREATE_BUILD_DIR),
15+
e.activeProject()
16+
).executeUsingCurrentClient()
1117

1218
override fun update(e: AnActionEvent) {
1319
e.presentation.isEnabledAndVisible = e.project != null

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/configure/ConfigureProjectAction.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ import com.intellij.openapi.actionSystem.AnAction
44
import com.intellij.openapi.actionSystem.AnActionEvent
55
import org.utbot.cpp.clion.plugin.UTBot
66
import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
7+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
78
import org.utbot.cpp.clion.plugin.utils.activeProject
9+
import testsgen.Testgen
810

911
class ConfigureProjectAction : AnAction(UTBot.message("projectConfigure.configure")) {
1012

11-
override fun actionPerformed(e: AnActionEvent) = CheckProjectConfigurationRequest(e.activeProject()).executeUsingCurrentClient()
13+
override fun actionPerformed(e: AnActionEvent) = CheckProjectConfigurationRequest(
14+
ParamsBuilder(e.activeProject()).buildProjectConfigRequestParams(Testgen.ConfigMode.CHECK),
15+
e.activeProject()
16+
).executeUsingCurrentClient()
1217

1318
override fun update(e: AnActionEvent) {
1419
e.presentation.isEnabledAndVisible = e.project != null

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/configure/ReconfigureProjectAction.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package org.utbot.cpp.clion.plugin.actions.configure
33
import com.intellij.openapi.actionSystem.AnAction
44
import com.intellij.openapi.actionSystem.AnActionEvent
55
import org.utbot.cpp.clion.plugin.UTBot
6-
import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
76
import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
7+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
88
import org.utbot.cpp.clion.plugin.utils.activeProject
99
import testsgen.Testgen
1010

@@ -13,7 +13,7 @@ class ReconfigureProjectAction: AnAction(UTBot.message("projectConfigure.reconfi
1313
override fun actionPerformed(e: AnActionEvent) {
1414
val project = e.activeProject()
1515
CheckProjectConfigurationRequest(
16-
getProjectConfigGrpcRequest(project, Testgen.ConfigMode.ALL),
16+
ParamsBuilder(project).buildProjectConfigRequestParams(Testgen.ConfigMode.ALL),
1717
project,
1818
).executeUsingCurrentClient()
1919
}

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForAssertionAction.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.AssertionRequest
6-
import org.utbot.cpp.clion.plugin.grpc.getAssertionGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
9+
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
810

911
class GenerateForAssertionAction : BaseGenerateTestsAction() {
1012
override fun actionPerformed(e: AnActionEvent) =
1113
AssertionRequest(
12-
getAssertionGrpcRequest(e),
14+
ParamsBuilder(e.activeProject()).buildAssertionRequestParams(e.getLineNumberUnsafe(), e.getFilePathUnsafe()),
1315
e.activeProject(),
1416
).executeUsingCurrentClient()
1517

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForClassAction.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.ClassRequest
6-
import org.utbot.cpp.clion.plugin.grpc.getClassGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
9+
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
810
import org.utbot.cpp.clion.plugin.utils.isCPPFileName
911

1012
class GenerateForClassAction : BaseGenerateTestsAction() {
1113
override fun actionPerformed(e: AnActionEvent) =
1214
ClassRequest(
13-
getClassGrpcRequest(e),
15+
ParamsBuilder(e.activeProject()).buildClassRequestParams(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
1416
e.activeProject(),
1517
).executeUsingCurrentClient()
1618

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForFileAction.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.FileRequest
6-
import org.utbot.cpp.clion.plugin.grpc.getFileGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
89
import org.utbot.cpp.clion.plugin.utils.isCPPorCFileName
910

1011
class GenerateForFileAction : BaseGenerateTestsAction() {
1112
override fun actionPerformed(e: AnActionEvent) =
1213
FileRequest(
13-
getFileGrpcRequest(e),
14+
ParamsBuilder(e.activeProject()).buildFileRequestParams(e.getFilePathUnsafe()),
1415
e.activeProject(),
1516
).executeUsingCurrentClient()
1617

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForFolderAction.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.FolderRequest
6-
import org.utbot.cpp.clion.plugin.grpc.getFolderGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.IllegalActionEventException
7+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
78
import org.utbot.cpp.clion.plugin.utils.activeProject
9+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
810

911
class GenerateForFolderAction : BaseGenerateTestsAction() {
1012
override fun actionPerformed(e: AnActionEvent) =
11-
FolderRequest(
12-
getFolderGrpcRequest(e),
13-
e.activeProject()
14-
).executeUsingCurrentClient()
13+
try {
14+
FolderRequest(
15+
ParamsBuilder(e.activeProject()).buildFolderRequestParams(e.getFilePathUnsafe()),
16+
e.activeProject()
17+
).executeUsingCurrentClient()
18+
} catch (exception: IllegalActionEventException) {
19+
// should never happen, all keys should be checked in update
20+
exception.notifyUser()
21+
}
1522

1623
override fun isDefined(e: AnActionEvent): Boolean {
1724
val project = e.project

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForFunctionAction.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.FunctionRequest
6-
import org.utbot.cpp.clion.plugin.grpc.getFunctionGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
9+
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
810

911
class GenerateForFunctionAction : BaseGenerateTestsAction() {
1012

11-
override fun actionPerformed(e: AnActionEvent) =
13+
override fun actionPerformed(e: AnActionEvent) {
1214
FunctionRequest(
13-
getFunctionGrpcRequest(e),
15+
ParamsBuilder(e.activeProject()).buildFunctionRequestParams(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
1416
e.activeProject()
1517
).executeUsingCurrentClient()
18+
}
1619

1720
override fun isDefined(e: AnActionEvent): Boolean {
1821
val project = e.project

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForLineAction.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.LineRequest
6-
import org.utbot.cpp.clion.plugin.grpc.getLineGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
77
import org.utbot.cpp.clion.plugin.utils.activeProject
88

99
class GenerateForLineAction : BaseGenerateTestsAction() {
10-
override fun actionPerformed(e: AnActionEvent) =
10+
override fun actionPerformed(e: AnActionEvent) {
11+
val filePath = e.getRequiredData(CommonDataKeys.VIRTUAL_FILE).path
12+
val editor = e.getRequiredData(CommonDataKeys.EDITOR)
13+
val lineNumber = editor.caretModel.logicalPosition.line + 1
1114
LineRequest(
12-
getLineGrpcRequest(e),
15+
ParamsBuilder(e.activeProject()).buildLineRequestBuilder(lineNumber, filePath),
1316
e.activeProject(),
1417
).executeUsingCurrentClient()
18+
}
1519

1620
override fun isDefined(e: AnActionEvent): Boolean {
1721
val project = e.project

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForPredicateAction.kt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import com.intellij.ui.DocumentAdapter
99
import com.intellij.ui.components.fields.ExtendableTextField
1010
import javax.swing.ListSelectionModel
1111
import javax.swing.event.DocumentEvent
12-
import org.utbot.cpp.clion.plugin.grpc.getFunctionGrpcRequest
13-
import org.utbot.cpp.clion.plugin.grpc.getPredicateGrpcRequest
1412
import org.utbot.cpp.clion.plugin.client.requests.test.FunctionReturnTypeRequest
1513
import org.utbot.cpp.clion.plugin.client.requests.test.PredicateRequest
14+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
1615
import org.utbot.cpp.clion.plugin.utils.activeProject
1716
import org.utbot.cpp.clion.plugin.utils.currentClient
17+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
18+
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
1819
import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
1920
import org.utbot.cpp.clion.plugin.utils.notifyError
2021
import testsgen.Util.ValidationType
@@ -46,7 +47,13 @@ class GenerateForPredicateAction : BaseGenerateTestsAction() {
4647
// when we gathered all needed information for predicate request, assemble it and execute it.
4748
fun sendPredicateToServer(validationType: ValidationType, valueToCompare: String, comparisonOperator: String) =
4849
PredicateRequest(
49-
getPredicateGrpcRequest(e, comparisonOperator, validationType, valueToCompare),
50+
ParamsBuilder(e.activeProject()).buildPredicateRequestParams(
51+
comparisonOperator,
52+
validationType,
53+
valueToCompare,
54+
e.getLineNumberUnsafe(),
55+
e.getFilePathUnsafe()
56+
),
5057
e.activeProject()
5158
).apply {
5259
e.currentClient.executeRequestIfNotDisposed(this)
@@ -101,7 +108,7 @@ class GenerateForPredicateAction : BaseGenerateTestsAction() {
101108
}
102109
//ask server for return type
103110
FunctionReturnTypeRequest(
104-
getFunctionGrpcRequest(e),
111+
ParamsBuilder(e.activeProject()).buildFunctionRequestParams(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
105112
e.activeProject(),
106113
) { functionReturnType ->
107114
val validationType = functionReturnType.validationType

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForProjectAction.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package org.utbot.cpp.clion.plugin.actions.generate
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
4-
import org.utbot.cpp.clion.plugin.grpc.getProjectGrpcRequest
54
import org.utbot.cpp.clion.plugin.client.requests.test.ProjectRequest
5+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
66
import org.utbot.cpp.clion.plugin.utils.activeProject
77
import org.utbot.cpp.clion.plugin.utils.currentClient
88

99
class GenerateForProjectAction : BaseGenerateTestsAction() {
1010
override fun actionPerformed(e: AnActionEvent) {
1111
ProjectRequest(
12-
getProjectGrpcRequest(e),
12+
ParamsBuilder(e.activeProject()).buildProjectRequestParams(),
1313
e.activeProject(),
1414
).apply {
1515
e.currentClient.executeRequestIfNotDisposed(this)

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForSnippetAction.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.SnippetRequest
6-
import org.utbot.cpp.clion.plugin.grpc.getSnippetGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
89

910
class GenerateForSnippetAction : BaseGenerateTestsAction() {
1011
override fun actionPerformed(e: AnActionEvent) {
1112
SnippetRequest(
12-
getSnippetGrpcRequest(e),
13+
ParamsBuilder(e.activeProject()).buildSnippetRequestParams(e.getFilePathUnsafe()),
1314
e.activeProject(),
1415
).executeUsingCurrentClient()
1516
}

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/RunAllTestsWithCoverageAction.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ package org.utbot.cpp.clion.plugin.actions.generate
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import org.utbot.cpp.clion.plugin.client.requests.RunAllTestsWithCoverageRequest
5+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
6+
import org.utbot.cpp.clion.plugin.utils.activeProject
57

6-
class RunAllTestsWithCoverageAction: BaseGenerateTestsAction() {
8+
class RunAllTestsWithCoverageAction : BaseGenerateTestsAction() {
79
override fun actionPerformed(e: AnActionEvent) {
8-
RunAllTestsWithCoverageRequest(e).executeUsingCurrentClient()
10+
RunAllTestsWithCoverageRequest(
11+
ParamsBuilder(e.activeProject()).buildCoverageAndResultsRequestParams(null),
12+
e.activeProject()
13+
).executeUsingCurrentClient()
914
}
1015

1116
override fun isDefined(e: AnActionEvent): Boolean {

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/RunWithCoverageAction.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,18 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
55
import com.intellij.openapi.diagnostic.Logger
66
import com.intellij.psi.PsiElement
77
import org.utbot.cpp.clion.plugin.client.requests.RunWithCoverageRequest
8-
import org.utbot.cpp.clion.plugin.grpc.getCoverageAndResultsGrpcRequest
9-
import org.utbot.cpp.clion.plugin.ui.testsResults.TestNameAndTestSuite
8+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
109
import org.utbot.cpp.clion.plugin.utils.activeProject
1110

1211

1312
class RunWithCoverageAction(val element: PsiElement) : BaseGenerateTestsAction() {
1413
override fun actionPerformed(e: AnActionEvent) {
1514
logger.debug("Action RunWithCoverageAction was called")
1615

17-
val testArgs = TestNameAndTestSuite.create(element)
18-
val suiteName = testArgs.suite
19-
val testedMethodName = testArgs.name
20-
val filePath = e.getRequiredData(CommonDataKeys.VIRTUAL_FILE).path
2116
val project = e.activeProject()
2217

2318
RunWithCoverageRequest(
24-
getCoverageAndResultsGrpcRequest(project, filePath, suiteName, testedMethodName),
19+
ParamsBuilder(project).buildCoverageAndResultsRequestParams(element),
2520
project,
2621
).executeUsingCurrentClient()
2722
}

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/Client.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import org.jetbrains.annotations.TestOnly
2020
import org.utbot.cpp.clion.plugin.UTBot
2121
import org.utbot.cpp.clion.plugin.client.channels.LogChannel
2222
import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
23-
import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
23+
import org.utbot.cpp.clion.plugin.grpc.IllegalPathException
24+
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
2425
import org.utbot.cpp.clion.plugin.listeners.ConnectionStatus
2526
import org.utbot.cpp.clion.plugin.listeners.UTBotEventsListener
2627
import org.utbot.cpp.clion.plugin.settings.projectIndependentSettings
@@ -86,13 +87,15 @@ class Client(
8687
request.execute(stub, coroutineContext[Job])
8788
} catch (e: io.grpc.StatusException) {
8889
handleGRPCStatusException(e, "Exception when executing server request")
90+
} catch (e: IllegalPathException) {
91+
e.notifyUser()
8992
}
9093
}
9194
}
9295

9396
fun configureProject() {
9497
CheckProjectConfigurationRequest(
95-
getProjectConfigGrpcRequest(project, Testgen.ConfigMode.CHECK),
98+
ParamsBuilder(project).buildProjectConfigRequestParams(Testgen.ConfigMode.CHECK),
9699
project,
97100
).also {
98101
this.executeRequestIfNotDisposed(it)

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/GTestLogChannelImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package org.utbot.cpp.clion.plugin.client.channels
22

33
import com.intellij.openapi.components.service
44
import com.intellij.openapi.project.Project
5+
import getDummyGrpcRequest
6+
import getLogChannelGrpcRequest
57
import kotlinx.coroutines.flow.Flow
6-
import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
7-
import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
88
import org.utbot.cpp.clion.plugin.ui.services.OutputProvider
99
import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
1010
import testsgen.Testgen

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/ServerLogChannelImpl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package org.utbot.cpp.clion.plugin.client.channels
22

33
import com.intellij.openapi.components.service
44
import com.intellij.openapi.project.Project
5+
import getDummyGrpcRequest
6+
import getLogChannelGrpcRequest
57
import kotlinx.coroutines.flow.Flow
6-
import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
7-
import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
88
import org.utbot.cpp.clion.plugin.ui.services.OutputProvider
99
import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
1010
import testsgen.Testgen

0 commit comments

Comments
 (0)