feat(amazonq): Implement aws/syncModuleDependencies call #5414

samgst-amazon · 2025-02-26T19:35:59Z

Implement the bare structure of the syncModuleDependencies service to make the call from the client to the server

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)

Description

added interface for the service handler as well as the data class for the params.

aws/syncModuleDependencies added to AmazonQLanguageServer interface to handle sending the JSONRequests

Checklist

My code follows the code style of this project
I have added tests to cover my changes
A short description of the change has been added to the CHANGELOG if the change is customer-facing in the IDE.
I have added metrics for my changes (if required)

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

github-actions · 2025-02-26T20:08:23Z

Qodana Community for JVM

7 new problems were found

Inspection name	Severity	Problems
`Unused symbol`	🔶 Warning	4
`Unstable API Usage`	🔶 Warning	3

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at [email protected]

Or via our issue tracker: https://jb.gg/qodana-issue
Or share your feedback: https://jb.gg/qodana-discussions

...aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

...olkits/jetbrains/services/amazonq/lsp/model/aws/dependencies/SyncModuleDependenciesParams.kt

+package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies
+
+public class SyncModuleDependenciesParams(
+    val moduleName: String,


...olkits/jetbrains/services/amazonq/lsp/model/aws/dependencies/SyncModuleDependenciesParams.kt

+    val moduleName: String,
+    val programmingLanguage: String,
+    val files: List<String>,
+    val dirs: List<String>,


...olkits/jetbrains/services/amazonq/lsp/model/aws/dependencies/SyncModuleDependenciesParams.kt

+    val programmingLanguage: String,
+    val files: List<String>,
+    val dirs: List<String>,
+    val includePatterns: List<String>,


...olkits/jetbrains/services/amazonq/lsp/model/aws/dependencies/SyncModuleDependenciesParams.kt

+    val files: List<String>,
+    val dirs: List<String>,
+    val includePatterns: List<String>,
+    val excludePatterns: List<String>,


...aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

…ndencies

rli · 2025-03-05T18:18:30Z

...aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

+import com.jetbrains.python.packaging.management.PythonPackageManager
+import com.jetbrains.python.sdk.PythonSdkUtil


with this service we should define a generic interface that is registered with the extension point system and register them dynamically through optional depends. otherwise this will all fail if user is missing the java/python plugin

...aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

...olkits/jetbrains/services/amazonq/lsp/dependencies/providers/JavaModuleDependencyProvider.kt

...kits/jetbrains/services/amazonq/lsp/dependencies/providers/PythonModuleDependencyProvider.kt

+        val dependencies = mutableListOf<String>()
+
+        PythonSdkUtil.findPythonSdk(module)?.let { sdk ->
+            val packageManager = PythonPackageManager.forSdk(module.project, sdk)


...kits/jetbrains/services/amazonq/lsp/dependencies/providers/PythonModuleDependencyProvider.kt

+        val dependencies = mutableListOf<String>()
+
+        PythonSdkUtil.findPythonSdk(module)?.let { sdk ->
+            val packageManager = PythonPackageManager.forSdk(module.project, sdk)


...kits/jetbrains/services/amazonq/lsp/dependencies/providers/PythonModuleDependencyProvider.kt

+
+        PythonSdkUtil.findPythonSdk(module)?.let { sdk ->
+            val packageManager = PythonPackageManager.forSdk(module.project, sdk)
+            packageManager.installedPackages.forEach { pkg ->


...mmunity/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/ExtensionPointUtils.kt

...aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

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

rli · 2025-03-07T01:58:46Z

plugins/amazonq/shared/jetbrains-community/resources/META-INF/module-amazonq.xml

+    <depends optional="true" config-file="java-support.xml">com.intellij.modules.java</depends>
+    <depends optional="true" config-file="python-support.xml">com.intellij.modules.python</depends>
+


depends should be on top-level plugin.xml, so use existing amazon-ext-java.xml

rli · 2025-03-07T17:59:18Z

...aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/DefaultModuleDependenciesService.kt

+        CompletableFuture<Unit>().also { completableFuture ->
+            AmazonQLspService.executeIfRunning(project) { languageServer ->
+                languageServer.syncModuleDependencies(params)
+                completableFuture.complete(null)
+            } ?: completableFuture.completeExceptionally(IllegalStateException("LSP Server not running"))
+        }


simplifies to

Suggested change

CompletableFuture<Unit>().also { completableFuture ->

AmazonQLspService.executeIfRunning(project) { languageServer ->

languageServer.syncModuleDependencies(params)

completableFuture.complete(null)

} ?: completableFuture.completeExceptionally(IllegalStateException("LSP Server not running"))

}

AmazonQLspService.executeIfRunning(project) { languageServer ->

languageServer.syncModuleDependencies(params)

}?.toCompletableFuture() ?: CompletableFuture.failedFuture(IllegalStateException("LSP Server not running"))

rli · 2025-03-07T18:33:41Z

...-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageServer.kt

 */
 @Suppress("unused")
 interface AmazonQLanguageServer : LanguageServer {
+    @JsonRequest("aws/syncModuleDependencies")


could you see if @JsonNotification works

* syncModuleDependencies call barebones * implement syncModuleDependencies logic * detekt * return completableFuture * ExtensionPoint impl * detekt * fix EachExtensionSafe * update ExtensionPoint namespace * private functions not needed * detekt * cs.launch for the ModuleDependencyServiceHandler * Tests * update xml * move xml impl to src root * feedback * change message to notification instead of Request

samgst-amazon added 2 commits February 26, 2025 11:32

syncModuleDependencies call barebones

9d71b4c

Merge branch 'feature/q-lsp' into samgst/q-lsp-module-dependencies

1f1c2ac

github-advanced-security bot found potential problems Feb 26, 2025

View reviewed changes

samgst-amazon added 2 commits February 26, 2025 14:35

Merge branch 'feature/q-lsp' into samgst/q-lsp-module-dependencies

f92ab4d

Merge branch 'feature/q-lsp' into samgst/q-lsp-module-dependencies

58e3ea2

samgst-amazon marked this pull request as ready for review March 3, 2025 19:25

Merge branch 'feature/q-lsp' into samgst/q-lsp-module-dependencies

060f64a

samgst-amazon requested a review from a team as a code owner March 3, 2025 19:25

samgst-amazon marked this pull request as draft March 3, 2025 23:16

samgst-amazon added 4 commits March 3, 2025 15:17

Merge branch 'feature/q-lsp' into samgst/q-lsp-module-dependencies

63eb25c

Merge branch 'feature/q-lsp' into samgst/q-lsp-module-dependencies

f5f4c87

implement syncModuleDependencies logic

10ddb2d

detekt

44c794e

github-advanced-security bot found potential problems Mar 4, 2025

View reviewed changes

samgst-amazon added 4 commits March 4, 2025 16:00

Merge branch 'refs/heads/feature/q-lsp' into samgst/q-lsp-module-depe…

90d5365

…ndencies

return completableFuture

9edbfac

Merge branch 'feature/q-lsp' into samgst/q-lsp-module-dependencies

b9ba38f

Merge branch 'feature/q-lsp' into samgst/q-lsp-module-dependencies

a461559

rli reviewed Mar 5, 2025

View reviewed changes

samgst-amazon added 2 commits March 5, 2025 14:55

ExtensionPoint impl

5ff55ca

detekt

b2d5cc3

github-advanced-security bot found potential problems Mar 5, 2025

View reviewed changes

samgst-amazon added 4 commits March 5, 2025 15:38

fix EachExtensionSafe

a1c08a5

update ExtensionPoint namespace

f254b7a

private functions not needed

c9d7ab3

detekt

7b77a6f

github-advanced-security bot found potential problems Mar 6, 2025

View reviewed changes

samgst-amazon added 2 commits March 6, 2025 09:33

class visibility

3263ac9

cs.launch for the ModuleDependencyServiceHandler

7e74c9e

github-advanced-security bot found potential problems Mar 6, 2025

View reviewed changes

Tests

e35e956

rli reviewed Mar 7, 2025

View reviewed changes

Merge branch 'feature/q-lsp' into samgst/q-lsp-module-dependencies

d14bfe4

samgst-amazon marked this pull request as ready for review March 7, 2025 17:15

update xml

2edaba4

rli reviewed Mar 7, 2025

View reviewed changes

samgst-amazon added 2 commits March 7, 2025 10:00

move xml impl to src root

6d9eb85

feedback

db03df1

rli approved these changes Mar 7, 2025

View reviewed changes

rli reviewed Mar 7, 2025

View reviewed changes

change message to notification instead of Request

2fd9ee6

samgst-amazon merged commit ac81a2f into feature/q-lsp Mar 7, 2025
15 of 18 checks passed

samgst-amazon deleted the samgst/q-lsp-module-dependencies branch March 7, 2025 21:04

		import com.jetbrains.python.packaging.management.PythonPackageManager
		import com.jetbrains.python.sdk.PythonSdkUtil

		<depends optional="true" config-file="java-support.xml">com.intellij.modules.java</depends>
		<depends optional="true" config-file="python-support.xml">com.intellij.modules.python</depends>

feat(amazonq): Implement aws/syncModuleDependencies call #5414

feat(amazonq): Implement aws/syncModuleDependencies call #5414

Uh oh!

Conversation

samgst-amazon commented Feb 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

Description

Checklist

License

Uh oh!

github-actions bot commented Feb 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Qodana Community for JVM

Uh oh!

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Check warning

Uh oh!

Uh oh!

Uh oh!

rli Mar 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rli Mar 7, 2025

Choose a reason for hiding this comment

Uh oh!

rli Mar 7, 2025

Choose a reason for hiding this comment

Uh oh!

rli Mar 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

samgst-amazon commented Feb 26, 2025 •

edited

Loading

github-actions bot commented Feb 26, 2025 •

edited

Loading