Skip to content

Commit c14839f

Browse files
committed
hack for bugbash
1 parent 37d60c0 commit c14839f

File tree

2 files changed

+6
-4
lines changed
  • plugins/amazonq
    • chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow
    • shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp

2 files changed

+6
-4
lines changed

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package software.aws.toolkits.jetbrains.services.amazonq.toolwindow
55

66
import com.intellij.idea.AppMode
77
import com.intellij.openapi.Disposable
8-
import com.intellij.openapi.components.service
98
import com.intellij.openapi.project.Project
109
import com.intellij.openapi.util.Disposer
1110
import com.intellij.ui.components.JBLoadingPanel
@@ -20,13 +19,13 @@ import kotlinx.coroutines.CoroutineScope
2019
import kotlinx.coroutines.flow.first
2120
import kotlinx.coroutines.launch
2221
import kotlinx.coroutines.withContext
22+
import software.amazon.awssdk.utils.UserHomeDirectoryUtils
2323
import software.aws.toolkits.jetbrains.core.coroutines.EDT
2424
import software.aws.toolkits.jetbrains.isDeveloperMode
2525
import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
2626
import software.aws.toolkits.jetbrains.services.amazonq.apps.AppConnection
2727
import software.aws.toolkits.jetbrains.services.amazonq.commands.MessageTypeRegistry
2828
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
29-
import software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts.ArtifactManager
3029
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener
3130
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
3231
import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
@@ -42,6 +41,7 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestA
4241
import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable
4342
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
4443
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
44+
import java.nio.file.Paths
4545
import java.util.concurrent.CompletableFuture
4646
import javax.swing.JButton
4747

@@ -111,7 +111,7 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
111111
wrapper.setContent(loadingPanel)
112112

113113
scope.launch {
114-
val webUri = service<ArtifactManager>().fetchArtifact(project).resolve("amazonq-ui.js").toUri()
114+
val webUri = Paths.get(UserHomeDirectoryUtils.userHomeDirectory(), "amazonq-ui.js").toAbsolutePath().toUri()
115115
// wait for server to be running
116116
AmazonQLspService.getInstance(project).instanceFlow.first()
117117

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import org.eclipse.lsp4j.jsonrpc.json.JsonRpcMethod
5959
import org.eclipse.lsp4j.jsonrpc.messages.ResponseMessage
6060
import org.eclipse.lsp4j.launch.LSPLauncher
6161
import org.slf4j.event.Level
62+
import software.amazon.awssdk.utils.UserHomeDirectoryUtils
6263
import software.aws.toolkits.core.utils.debug
6364
import software.aws.toolkits.core.utils.getLogger
6465
import software.aws.toolkits.core.utils.info
@@ -92,6 +93,7 @@ import java.net.URI
9293
import java.nio.charset.StandardCharsets
9394
import java.nio.file.Files
9495
import java.nio.file.Path
96+
import java.nio.file.Paths
9597
import java.util.concurrent.Future
9698
import java.util.concurrent.TimeUnit
9799
import kotlin.time.Duration.Companion.seconds
@@ -389,7 +391,7 @@ private class AmazonQServerInstance(private val project: Project, private val cs
389391

390392
val cmd = NodeExePatcher.patch(nodePath)
391393
.withParameters(
392-
LspSettings.getInstance().getArtifactPath() ?: artifact.resolve("aws-lsp-codewhisperer.js").toString(),
394+
Paths.get(UserHomeDirectoryUtils.userHomeDirectory(), "aws-lsp-codewhisperer.js").toAbsolutePath().toString(),
393395
"--stdio",
394396
"--set-credentials-encryption-key",
395397
).withEnvironment(

0 commit comments

Comments
 (0)