Skip to content

Conversation

@aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/q-lsp
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/q-lsp

@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners March 25, 2025 18:38
rli and others added 7 commits March 25, 2025 14:37
Add __CODEWHISPERER_ENDPOINT environment variable support to override
endpoint during testing. Falls back to registry value if not set. This environment variable is consistent with VS Code implementation.
    integ / ui failing due to missing / conflicting classpath issues
    251 ui failing since useRelease filters out non-release builds
API signature changed in 251 beta
 Conflicts:
	plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
@github-actions
Copy link

Qodana Community for JVM

6 new problems were found

Inspection name Severity Problems
Unstable API Usage 🔶 Warning 3
Unused symbol 🔶 Warning 1
Function or property has platform type ◽️ Notice 1
Package name does not match containing directory ◽️ Notice 1

💡 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]

class DidChangeDependencyPathsParams(
val moduleName: String,
val programmingLanguage: String,
val runtimeLanguage: String,

Check warning

Code scanning / QDJVMC

Unused symbol Warning

Property "runtimeLanguage" is never used
@@ -0,0 +1,10 @@
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package compat.com.jetbrains.gateway.thinClientLink

Check notice

Code scanning / QDJVMC

Package name does not match containing directory Note

Package directive does not match the file location
import java.net.URI

fun startNewClient(lifetime: Lifetime, initialLink: URI, remoteIdentity: String?, onStarted: () -> Unit) =
LinkedClientManager.getInstance().startNewClient(lifetime, initialLink, remoteIdentity, null, onStarted)

Check warning

Code scanning / QDJVMC

Unstable API Usage Warning

'com.jetbrains.gateway.thinClientLink.LinkedClientManager.Companion' is declared in unstable 'com.jetbrains.gateway.thinClientLink.LinkedClientManager' marked with @ApiStatus.Experimental
import java.net.URI

fun startNewClient(lifetime: Lifetime, initialLink: URI, remoteIdentity: String?, onStarted: () -> Unit) =
LinkedClientManager.getInstance().startNewClient(lifetime, initialLink, remoteIdentity, null, onStarted)

Check warning

Code scanning / QDJVMC

Unstable API Usage Warning

'getInstance()' is declared in unstable 'com.jetbrains.gateway.thinClientLink.LinkedClientManager' marked with @ApiStatus.Experimental
import java.net.URI

fun startNewClient(lifetime: Lifetime, initialLink: URI, remoteIdentity: String?, onStarted: () -> Unit) =
LinkedClientManager.getInstance().startNewClient(lifetime, initialLink, remoteIdentity, null, onStarted)

Check warning

Code scanning / QDJVMC

Unstable API Usage Warning

'startNewClient(com.jetbrains.rd.util.lifetime.Lifetime, java.net.URI, java.lang.String, java.lang.String, kotlin.jvm.functions.Function0)' is declared in unstable 'com.jetbrains.gateway.thinClientLink.LinkedClientManager' marked with @ApiStatus.Experimental
}

val uiTestImplementation by configurations.getting
val uiTestRuntimeOnly by configurations.getting

Check notice

Code scanning / QDJVMC

Function or property has platform type Note

Declaration has type inferred from a platform call, which can lead to unchecked nullability issues. Specify type explicitly as nullable or non-nullable.
@rli rli merged commit 9046a85 into feature/q-lsp Mar 26, 2025
15 of 18 checks passed
@rli rli deleted the autoMerge/feature/q-lsp branch March 26, 2025 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants