sourcegraph · pkukielka · Sep 2, 2024 · Sep 2, 2024
diff --git a/src/main/java/com/sourcegraph/config/CodyAuthNotificationActivity.java b/src/main/java/com/sourcegraph/config/CodyAuthNotificationActivity.java
@@ -25,7 +25,7 @@ public class CodyAuthNotificationActivity implements Activity {
 
   @Override
   public void runActivity(@NotNull Project project) {
-    CodyAccount activeAccount = CodyAuthenticationManager.getInstance(project).getAccount();
+    CodyAccount activeAccount = CodyAuthenticationManager.getInstance().getAccount();
     CodyAccountManager service =
         ApplicationManager.getApplication().getService(CodyAccountManager.class);
 

diff --git a/src/main/java/com/sourcegraph/find/browser/JSToJavaBridgeRequestHandler.java b/src/main/java/com/sourcegraph/find/browser/JSToJavaBridgeRequestHandler.java
@@ -42,7 +42,7 @@ public JBCefJSQuery.Response handle(@NotNull JsonObject request) {
     try {
       switch (action) {
         case "getConfig":
-          return createSuccessResponse(ConfigUtil.getConfigAsJson(project));
+          return createSuccessResponse(ConfigUtil.getConfigAsJson());
         case "getTheme":
           JsonObject currentThemeAsJson = ThemeUtil.getCurrentThemeAsJson();
           return createSuccessResponse(currentThemeAsJson);

diff --git a/src/main/java/com/sourcegraph/telemetry/GraphQlLogger.java b/src/main/java/com/sourcegraph/telemetry/GraphQlLogger.java
@@ -16,8 +16,7 @@ public static CompletableFuture<Boolean> logInstallEvent(@NotNull Project projec
     CodyApplicationSettings codyApplicationSettings = CodyApplicationSettings.getInstance();
     if (codyApplicationSettings.getAnonymousUserId() != null && !project.isDisposed()) {
       var event =
-          createEvent(
-              project, ConfigUtil.getServerPath(project), "CodyInstalled", new JsonObject());
+          createEvent(project, ConfigUtil.getServerPath(), "CodyInstalled", new JsonObject());
       return logEvent(project, event);
     }
     return CompletableFuture.completedFuture(false);
@@ -27,8 +26,7 @@ public static void logUninstallEvent(@NotNull Project project) {
     CodyApplicationSettings codyApplicationSettings = CodyApplicationSettings.getInstance();
     if (codyApplicationSettings.getAnonymousUserId() != null) {
       Event event =
-          createEvent(
-              project, ConfigUtil.getServerPath(project), "CodyUninstalled", new JsonObject());
+          createEvent(project, ConfigUtil.getServerPath(), "CodyUninstalled", new JsonObject());
       logEvent(project, event);
     }
   }
@@ -37,8 +35,7 @@ public static void logCodyEvent(
       @NotNull Project project, @NotNull String componentName, @NotNull String action) {
     var eventName = "CodyJetBrainsPlugin:" + componentName + ":" + action;
     logEvent(
-        project,
-        createEvent(project, ConfigUtil.getServerPath(project), eventName, new JsonObject()));
+        project, createEvent(project, ConfigUtil.getServerPath(), eventName, new JsonObject()));
   }
 
   public static void logCodeGenerationEvent(
@@ -54,9 +51,7 @@ public static void logCodeGenerationEvent(
     eventParameters.addProperty("source", "chat");
 
     var eventName = "CodyJetBrainsPlugin:" + componentName + ":" + action;
-    logEvent(
-        project,
-        createEvent(project, ConfigUtil.getServerPath(project), eventName, eventParameters));
+    logEvent(project, createEvent(project, ConfigUtil.getServerPath(), eventName, eventParameters));
   }
 
   @NotNull
@@ -65,8 +60,7 @@ private static Event createEvent(
       @NotNull SourcegraphServerPath sourcegraphServerPath,
       @NotNull String eventName,
       @NotNull JsonObject eventParameters) {
-    var updatedEventParameters =
-        addGlobalEventParameters(project, eventParameters, sourcegraphServerPath);
+    var updatedEventParameters = addGlobalEventParameters(eventParameters, sourcegraphServerPath);
     CodyApplicationSettings codyApplicationSettings = CodyApplicationSettings.getInstance();
     String anonymousUserId = codyApplicationSettings.getAnonymousUserId();
     return new Event(
@@ -75,13 +69,11 @@ private static Event createEvent(
 
   @NotNull
   private static JsonObject addGlobalEventParameters(
-      @NotNull Project project,
-      @NotNull JsonObject eventParameters,
-      @NotNull SourcegraphServerPath sourcegraphServerPath) {
+      @NotNull JsonObject eventParameters, @NotNull SourcegraphServerPath sourcegraphServerPath) {
     // project specific properties
     var updatedEventParameters = eventParameters.deepCopy();
     var activeAccountTier =
-        CodyAuthenticationManager.getInstance(project).getActiveAccountTier().getNow(null);
+        CodyAuthenticationManager.getInstance().getActiveAccountTier().getNow(null);
     if (activeAccountTier != null) {
       updatedEventParameters.addProperty("tier", activeAccountTier.getValue());
     }

diff --git a/src/main/java/com/sourcegraph/website/FileActionBase.java b/src/main/java/com/sourcegraph/website/FileActionBase.java
@@ -45,7 +45,6 @@ public void actionPerformed(@NotNull AnActionEvent event) {
       handleFileUri(
           project,
           URLBuilder.buildSourcegraphBlobUrl(
-              project,
               sourcegraphFile.getRepoUrl(),
               sourcegraphFile.getCommit(),
               sourcegraphFile.getRelativePath(),
@@ -70,7 +69,6 @@ public void actionPerformed(@NotNull AnActionEvent event) {
                   // need, so we'll go to the final URL directly.
                   url =
                       URLBuilder.buildSourcegraphBlobUrl(
-                          project,
                           repoInfo.getCodeHostUrl() + "/" + repoInfo.getRepoName(),
                           null,
                           repoInfo.relativePath,
@@ -106,7 +104,6 @@ public void actionPerformedFromPreviewContent(
     handleFileUri(
         project,
         URLBuilder.buildSourcegraphBlobUrl(
-            project,
             previewContent.getRepoUrl(),
             previewContent.getCommit(),
             previewContent.getPath(),

diff --git a/src/main/java/com/sourcegraph/website/OpenRevisionAction.java b/src/main/java/com/sourcegraph/website/OpenRevisionAction.java
@@ -84,15 +84,15 @@ public void actionPerformed(@NotNull AnActionEvent event) {
               try {
                 url =
                     URLBuilder.buildCommitUrl(
-                        ConfigUtil.getServerPath(project).getUrl(),
+                        ConfigUtil.getServerPath().getUrl(),
                         context.getRevisionNumber(),
                         remoteUrl,
                         productName,
                         productVersion);
               } catch (IllegalArgumentException e) {
                 logger.warn(
                     "Unable to build commit view URI for url "
-                        + ConfigUtil.getServerPath(project).getUrl()
+                        + ConfigUtil.getServerPath().getUrl()
                         + ", revision "
                         + context.getRevisionNumber()
                         + ", product "

diff --git a/src/main/java/com/sourcegraph/website/SearchActionBase.java b/src/main/java/com/sourcegraph/website/SearchActionBase.java
@@ -41,7 +41,7 @@ public void actionPerformedMode(@NotNull AnActionEvent event, @NotNull Scope sco
       String url;
       SourcegraphVirtualFile sourcegraphFile = (SourcegraphVirtualFile) currentFile;
       String repoUrl = (scope == Scope.REPOSITORY) ? sourcegraphFile.getRepoUrl() : null;
-      url = URLBuilder.buildEditorSearchUrl(project, selectedText, repoUrl, null);
+      url = URLBuilder.buildEditorSearchUrl(selectedText, repoUrl, null);
       BrowserOpener.INSTANCE.openInBrowser(project, url);
     } else {
       // This cannot run on EDT (Event Dispatch Thread) because it may block for a long time.
@@ -62,9 +62,7 @@ public void actionPerformedMode(@NotNull AnActionEvent event, @NotNull Scope sco
                   url =
                       URLBuilder.buildDirectSearchUrl(project, selectedText, codeHostUrl, repoName);
                 } else {
-                  url =
-                      URLBuilder.buildEditorSearchUrl(
-                          project, selectedText, remoteUrl, remoteBranchName);
+                  url = URLBuilder.buildEditorSearchUrl(selectedText, remoteUrl, remoteBranchName);
                 }
                 BrowserOpener.INSTANCE.openInBrowser(project, url);
               });

diff --git a/src/main/java/com/sourcegraph/website/URLBuilder.java b/src/main/java/com/sourcegraph/website/URLBuilder.java
@@ -19,7 +19,7 @@ public static String buildEditorFileUrl(
       @NotNull String relativePath,
       @Nullable LogicalPosition start,
       @Nullable LogicalPosition end) {
-    return ConfigUtil.getServerPath(project).getUrl()
+    return ConfigUtil.getServerPath().getUrl()
         + "-/editor"
         + "?remote_url="
         + URLEncoder.encode(remoteUrl, StandardCharsets.UTF_8)
@@ -45,12 +45,9 @@ public static String buildEditorFileUrl(
 
   @NotNull
   public static String buildEditorSearchUrl(
-      @NotNull Project project,
-      @NotNull String search,
-      @Nullable String remoteUrl,
-      @Nullable String remoteBranchName) {
+      @NotNull String search, @Nullable String remoteUrl, @Nullable String remoteBranchName) {
     String url =
-        ConfigUtil.getServerPath(project).getUrl()
+        ConfigUtil.getServerPath().getUrl()
             + "-/editor"
             + "?"
             + buildVersionParams()
@@ -77,7 +74,7 @@ public static String buildDirectSearchUrl(
         (codeHost != null && repoName != null)
             ? "repo:^" + RegexEscaper.INSTANCE.escapeRegexChars(codeHost + "/" + repoName) + "$"
             : null;
-    return ConfigUtil.getServerPath(project).getUrl()
+    return ConfigUtil.getServerPath().getUrl()
         + "/search"
         + "?patternType=literal"
         + "&q="
@@ -124,13 +121,12 @@ public static String buildCommitUrl(
   @NotNull
   // repoUrl should be like "github.com/sourcegraph/sourcegraph"
   public static String buildSourcegraphBlobUrl(
-      @NotNull Project project,
       @NotNull String repoUrl,
       @Nullable String commit,
       @NotNull String path,
       @Nullable LogicalPosition start,
       @Nullable LogicalPosition end) {
-    return ConfigUtil.getServerPath(project).getUrl()
+    return ConfigUtil.getServerPath().getUrl()
         + repoUrl
         + (commit != null ? "@" + commit : "")
         + "/-/blob/"

diff --git a/src/main/kotlin/com/sourcegraph/cody/CodyToolWindowContent.kt b/src/main/kotlin/com/sourcegraph/cody/CodyToolWindowContent.kt
@@ -37,7 +37,7 @@ class CodyToolWindowContent(private val project: Project) {
 
   @RequiresEdt
   fun refreshPanelsVisibility() {
-    val codyAuthenticationManager = CodyAuthenticationManager.getInstance(project)
+    val codyAuthenticationManager = CodyAuthenticationManager.getInstance()
     if (codyAuthenticationManager.hasNoActiveAccount() ||
         codyAuthenticationManager.showInvalidAccessTokenError()) {
       allContentLayout.show(allContentPanel, SIGN_IN_PANEL)

diff --git a/src/main/kotlin/com/sourcegraph/cody/auth/ui/SignInWithEnterpriseInstanceAction.kt b/src/main/kotlin/com/sourcegraph/cody/auth/ui/SignInWithEnterpriseInstanceAction.kt
@@ -16,7 +16,7 @@ class SignInWithEnterpriseInstanceAction(
   override fun actionPerformed(e: AnActionEvent) {
     val project = e.project ?: return
     val accountsHost = CodyPersistentAccountsHost(project)
-    val authManager = CodyAuthenticationManager.getInstance(project)
+    val authManager = CodyAuthenticationManager.getInstance()
     val serverUrl = authManager.account?.server?.url ?: defaultServer
     val dialog =
         SourcegraphInstanceLoginDialog(

diff --git a/src/main/kotlin/com/sourcegraph/cody/autocomplete/CodyAutocompleteManager.kt b/src/main/kotlin/com/sourcegraph/cody/autocomplete/CodyAutocompleteManager.kt
@@ -172,8 +172,7 @@ class CodyAutocompleteManager {
 
     val textDocument: TextDocument = IntelliJTextDocument(editor, project)
 
-    if (isTriggeredExplicitly &&
-        CodyAuthenticationManager.getInstance(project).hasNoActiveAccount()) {
+    if (isTriggeredExplicitly && CodyAuthenticationManager.getInstance().hasNoActiveAccount()) {
       HintManager.getInstance().showErrorHint(editor, "Cody: Sign in to use autocomplete")
       return
     }

diff --git a/src/main/kotlin/com/sourcegraph/cody/chat/actions/NewChatAction.kt b/src/main/kotlin/com/sourcegraph/cody/chat/actions/NewChatAction.kt
@@ -12,8 +12,7 @@ class NewChatAction : DumbAwareEDTAction() {
   }
 
   override fun update(event: AnActionEvent) {
-    val project = event.project ?: return
-    val hasActiveAccount = CodyAuthenticationManager.getInstance(project).hasActiveAccount()
+    val hasActiveAccount = CodyAuthenticationManager.getInstance().hasActiveAccount()
     event.presentation.isEnabled = hasActiveAccount
     if (!event.presentation.isEnabled) {
       event.presentation.description =

diff --git a/src/main/kotlin/com/sourcegraph/cody/chat/ui/LlmDropdown.kt b/src/main/kotlin/com/sourcegraph/cody/chat/ui/LlmDropdown.kt
@@ -85,7 +85,7 @@ class LlmDropdown(
         } ?: models.firstOrNull()
 
     val isEnterpriseAccount =
-        CodyAuthenticationManager.getInstance(project).account?.isEnterpriseAccount() ?: false
+        CodyAuthenticationManager.getInstance().account?.isEnterpriseAccount() ?: false
 
     // If the dropdown is already disabled, don't change it. It can happen
     // in the case of the legacy commands (updateAfterFirstMessage happens before this call).
@@ -119,7 +119,7 @@ class LlmDropdown(
   }
 
   fun isCurrentUserFree(): Boolean =
-      CodyAuthenticationManager.getInstance(project)
+      CodyAuthenticationManager.getInstance()
           .getActiveAccountTier()
           .getNow(AccountTier.DOTCOM_FREE) == AccountTier.DOTCOM_FREE
 }
diff --git a/src/main/kotlin/com/sourcegraph/cody/config/CodyAccountListModel.kt b/src/main/kotlin/com/sourcegraph/cody/config/CodyAccountListModel.kt
@@ -31,8 +31,9 @@ class CodyAccountListModel(private val project: Project) :
   override fun editAccount(parentComponent: JComponent, account: CodyAccount) {
     val token = newCredentials[account] ?: getOldToken(account)
     val authData =
-        CodyAuthenticationManager.getInstance(project)
+        CodyAuthenticationManager.getInstance()
             .login(
+                project,
                 parentComponent,
                 CodyLoginRequest(
                     title = "Edit Sourcegraph Account",
@@ -53,7 +54,7 @@ class CodyAccountListModel(private val project: Project) :
   }
 
   private fun getOldToken(account: CodyAccount) =
-      CodyAuthenticationManager.getInstance(project).getTokenForAccount(account)
+      CodyAuthenticationManager.getInstance().getTokenForAccount(account)
 
   override fun addAccount(
       server: SourcegraphServerPath,