Skip to content

Commit ea894a9

Browse files
committed
Merge remote-tracking branch 'upstream/autoMerge/feature/q-lsp-chat' into lsp-chat
2 parents f4ec121 + c9aba71 commit ea894a9

File tree

1 file changed

+8
-10
lines changed
  • plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts

1 file changed

+8
-10
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@ import software.aws.toolkits.jetbrains.services.amazonq.project.manifest.Manifes
2121
import software.aws.toolkits.resources.AwsCoreBundle
2222
import java.nio.file.Files
2323
import java.nio.file.Path
24+
import java.nio.file.Paths
2425
import java.util.concurrent.atomic.AtomicInteger
2526

26-
class ArtifactHelper internal constructor(
27-
private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH,
28-
private val maxDownloadAttempts: Int = MAX_DOWNLOAD_ATTEMPTS,
29-
) {
27+
class ArtifactHelper(private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH, private val maxDownloadAttempts: Int = MAX_DOWNLOAD_ATTEMPTS) {
28+
29+
companion object {
30+
private val DEFAULT_ARTIFACT_PATH = getToolkitsCommonCacheRoot().resolve(Paths.get("aws", "toolkits", "language-servers", "AmazonQ"))
31+
private val logger = getLogger<ArtifactHelper>()
32+
private const val MAX_DOWNLOAD_ATTEMPTS = 3
33+
}
3034
private val currentAttempt = AtomicInteger(0)
3135

3236
fun removeDelistedVersions(delistedVersions: List<ManifestManager.Version>) {
@@ -211,10 +215,4 @@ class ArtifactHelper internal constructor(
211215
throw LspException(errorMessage, LspException.ErrorCode.DOWNLOAD_FAILED)
212216
}
213217
}
214-
215-
companion object {
216-
private val DEFAULT_ARTIFACT_PATH = getToolkitsCommonCacheRoot().resolve("aws").resolve("toolkits").resolve("language-servers")
217-
private val logger = getLogger<ArtifactHelper>()
218-
private const val MAX_DOWNLOAD_ATTEMPTS = 3
219-
}
220218
}

0 commit comments

Comments
 (0)