Skip to content

fix(amazonq) should not install and try run encoderserver in test env #5003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 23, 2024
Merged

fix(amazonq) should not install and try run encoderserver in test env #5003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b69b9c6
patch don't try init encodeerserver in test env
Will-ShaoHua Oct 23, 2024
1b2bd51
don't try init encodeerserver in test env
Will-ShaoHua Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...s-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/EncoderServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.intellij.execution.configurations.GeneralCommandLine
import com.intellij.execution.process.KillableProcessHandler
import com.intellij.openapi.Disposable
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.util.process.ProcessCloseUtil
import com.intellij.util.io.HttpRequests
Expand Down Expand Up @@ -56,6 +57,9 @@ class EncoderServer(val project: Project) : Disposable {
private val mapper = jacksonObjectMapper()

fun downloadArtifactsAndStartServer() {
if (ApplicationManager.getApplication().isUnitTestMode) {
return
}
downloadArtifactsIfNeeded()
start()
}
Expand Down
5 changes: 5 additions & 0 deletions ...ty/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import com.intellij.openapi.Disposable
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.BaseProjectDirectories.Companion.getBaseDirectories
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VfsUtilCore
Expand Down Expand Up @@ -41,6 +42,10 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En

init {
cs.launch {
if (ApplicationManager.getApplication().isUnitTestMode) {
return@launch
}

while (true) {
if (encoderServer.isNodeProcessRunning()) {
// TODO: need better solution for this
Expand Down
Loading