Update org.jetbrains.intellij 1.15.0 -> 1.17.0

build.gradle.kts

@@ -22,10 +22,10 @@ val isForceCodeSearchBuild = isForceBuild || properties("forceCodeSearchBuild")
 plugins {
   id("java")
   // Dependencies are locked at this version to work with JDK 11 on CI.
-  id("org.jetbrains.kotlin.jvm") version "1.9.10"
-  id("org.jetbrains.intellij") version "1.15.0"
+  id("org.jetbrains.kotlin.jvm") version "1.9.22"
+  id("org.jetbrains.intellij") version "1.17.0"
   id("org.jetbrains.changelog") version "1.3.1"
-  id("com.diffplug.spotless") version "6.21.0"
+  id("com.diffplug.spotless") version "6.25.0"
 }
 
 group = properties("pluginGroup")

src/main/java/com/sourcegraph/cody/SubscriptionTabUtils.kt

@@ -22,8 +22,9 @@ fun fetchSubscriptionPanelData(
   if (activeAccountType != null) {
     ensureUserIdMatchInAgent(activeAccountType.id, server)
     return if (activeAccountType.isDotcomAccount()) {
-      val codyProFeatureFlag = server.evaluateFeatureFlag(GetFeatureFlag("CodyProJetBrains"))
-      if (codyProFeatureFlag.get() != null && codyProFeatureFlag.get()!!) {
+      val codyProFeatureFlag =
+          server.evaluateFeatureFlag(GetFeatureFlag.CodyProJetBrains).get() == true
+      if (codyProFeatureFlag) {
         val isCurrentUserPro = getIsCurrentUserPro(server) ?: false
         CompletableFuture.completedFuture(
             SubscriptionTabPanelData(

src/main/java/com/sourcegraph/vcs/RepoUtil.java

@@ -161,14 +161,17 @@ private static String doReplacements(
                         agent.getServer().convertGitCloneURLToCodebaseName(new CloneURL(cloneURL)))
                 .completeOnTimeout(/* value= */ null, /* timeout= */ 4, TimeUnit.SECONDS)
                 .get();
-      }
 
-      if (codebaseName == null) {
-        logger.warn(
-            "Failed to convert git clone URL to codebase name for cloneURL via agent: " + cloneURL);
-        codebaseName = convertGitCloneURLToCodebaseNameOrError(cloneURL);
+        if (codebaseName == null) {
+          logger.warn(
+              "Failed to convert git clone URL to codebase name for cloneURL via agent for cloneUrl="
+                  + cloneURL);
+        }
       }
-      return codebaseName;
+
+      return codebaseName != null
+          ? codebaseName
+          : convertGitCloneURLToCodebaseNameOrError(cloneURL);
     }
 
     if (vcsType == VCSType.PERFORCE) {

src/main/kotlin/com/sourcegraph/cody/CodyToolWindowContent.kt

@@ -11,7 +11,6 @@ import com.intellij.util.IconUtil
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import com.intellij.util.concurrency.annotations.RequiresEdt
 import com.intellij.xml.util.XmlStringUtil
-import com.sourcegraph.cody.agent.CodyAgentServer
 import com.sourcegraph.cody.agent.CodyAgentService
 import com.sourcegraph.cody.agent.protocol.ChatMessage
 import com.sourcegraph.cody.agent.protocol.ContextMessage
@@ -130,7 +129,6 @@ class CodyToolWindowContent(private val project: Project) : UpdatableChat {
     CodyAgentService.applyAgentOnBackgroundThread(project) { agent ->
       fetchSubscriptionPanelData(project, agent.server).thenAccept {
         if (it != null) {
-
           ApplicationManager.getApplication().invokeLater { refreshSubscriptionTab(it) }
         }
       }
@@ -183,16 +181,6 @@ class CodyToolWindowContent(private val project: Project) : UpdatableChat {
     }
   }
 
-  private fun getUserId(server: CodyAgentServer): String? {
-    return server
-        .currentUserId()
-        .exceptionally {
-          logger.warn("Unable to fetch user id from agent")
-          null
-        }
-        .get()
-  }
-
   @RequiresEdt
   override fun refreshPanelsVisibility() {
     val codyAuthenticationManager = CodyAuthenticationManager.instance

src/main/kotlin/com/sourcegraph/cody/agent/protocol/GetFeatureFlag.kt

@@ -1,3 +1,7 @@
 package com.sourcegraph.cody.agent.protocol
 
-data class GetFeatureFlag(val flagName: String)
+data class GetFeatureFlag(val flagName: String) {
+  companion object {
+    val CodyProJetBrains = GetFeatureFlag("CodyProJetBrains")
+  }
+}

src/main/kotlin/com/sourcegraph/cody/autocomplete/render/CodyAutocompleteElementRenderer.kt

@@ -28,8 +28,7 @@ abstract class CodyAutocompleteElementRenderer(
         if (isCustomAutocompleteColorEnabled())
             getCustomAutocompleteColor()?.let {
               AutocompleteRenderUtil.getCustomTextAttributes(editor, it)
-            }
-                ?: textAttributesFallback.get()
+            } ?: textAttributesFallback.get()
         else textAttributesFallback.get()
   }
 

src/main/kotlin/com/sourcegraph/cody/chat/Chat.kt

@@ -43,8 +43,7 @@ class Chat {
           val contextMessages =
               agentChatMessage.contextFiles?.map { contextFile: ContextFile ->
                 ContextMessage(Speaker.ASSISTANT, agentChatMessageText, contextFile)
-              }
-                  ?: emptyList()
+              } ?: emptyList()
           chat.displayUsedContext(contextMessages)
           chat.addMessageToChat(chatMessage)
         } else {

src/main/kotlin/com/sourcegraph/cody/config/CodyTokenCredentialsUi.kt

@@ -82,7 +82,7 @@ internal class CodyTokenCredentialsUi(
   override fun getValidator(): () -> ValidationInfo? = {
     getServerPathValidationInfo()
         ?: notBlank(tokenTextField, "Token cannot be empty")
-            ?: custom(tokenTextField, "Invalid access token") {
+        ?: custom(tokenTextField, "Invalid access token") {
           AuthorizationUtil.isValidAccessToken(tokenTextField.text)
         }
   }

src/main/kotlin/com/sourcegraph/cody/config/SettingsMigration.kt

@@ -324,7 +324,7 @@ class SettingsMigration : Activity {
   private fun extractAccountType(project: Project): AccountType {
     return project.service<CodyProjectService>().getInstanceType()?.let { toAccountType(it) }
         ?: service<CodyApplicationService>().getInstanceType()?.let { toAccountType(it) }
-            ?: AccountType.DOTCOM
+        ?: AccountType.DOTCOM
   }
 
   private fun toAccountType(it: String): AccountType? {

src/main/kotlin/com/sourcegraph/common/UpgradeToCodyProNotification.kt

@@ -88,7 +88,7 @@ private constructor(title: String, content: String, shouldShowUpgradeOption: Boo
       if (activeAccountType != null && activeAccountType.isDotcomAccount()) {
         return CodyAgentService.getAgent(project)
             .thenCompose { agent ->
-              agent.server.evaluateFeatureFlag(GetFeatureFlag("CodyProJetBrains"))
+              agent.server.evaluateFeatureFlag(GetFeatureFlag.CodyProJetBrains)
             }
             .thenApply { it == true }
       }