Merge pull request #141 from codacy/fix-codacy-cloud-initializing

fix: codacy cloud stuck in initializing CF-1888

Author: nedaKaighobadi

src/extension.ts

@@ -95,11 +95,13 @@ const registerGitProvider = async (context: vscode.ExtensionContext, codacyCloud
     })
 
     git.onDidChangeState(async (state: APIState) => {
+      Logger.debug(`Git API state changed to: ${state}`)
       if (state === 'initialized') {
         if (git.repositories.length > 0) {
+          Logger.debug(`Git API initialized with ${git.repositories.length} repositories`)
           codacyCloud.open(git.repositories[0])
         } else {
-          Logger.appendLine('No Git Repositories found')
+          Logger.appendLine('Git API initialized but no repositories found')
           codacyCloud.clear()
         }
       }
@@ -216,8 +218,13 @@ export async function activate(context: vscode.ExtensionContext) {
     )
 
     // check for open repository
-    if (gitProvider.repositories.length > 0) {
+    if (gitProvider.state === 'initialized' && gitProvider.repositories.length > 0) {
+      Logger.debug(`Found ${gitProvider.repositories.length} repositories, opening first one`)
       codacyCloud.open(gitProvider.repositories[0])
+    } else if (gitProvider.state === 'uninitialized') {
+      Logger.debug('Git API is still initializing, will wait for state change event')
+    } else {
+      Logger.appendLine('No Git repositories found in workspace')
     }
 
     // coverage decoration

src/git/CodacyCloud.ts

@@ -90,6 +90,7 @@ export class CodacyCloud implements vscode.Disposable {
   private _cli: CodacyCli | undefined
 
   private _disposables: vscode.Disposable[] = []
+  private _stateChangeDisposable: vscode.Disposable | undefined
 
   constructor() {
     vscode.commands.executeCommand('setContext', RM_STATE_CONTEXT_KEY, this._state)
@@ -103,7 +104,56 @@ export class CodacyCloud implements vscode.Disposable {
       this._current = gitRepository
 
       try {
+        // Check if repository state is fully populated
+        if (!gitRepository.state.HEAD && gitRepository.state.remotes?.length === 0) {
+          Logger.debug('Repository state is not fully populated yet, waiting for state change...')
+          this.state = CodacyCloudState.Initializing
+
+          // Clean up any existing state change listener
+          if (this._stateChangeDisposable) {
+            this._stateChangeDisposable.dispose()
+            this._stateChangeDisposable = undefined
+          }
+
+          // Set up timeout to prevent memory leak
+          const timeoutMs = 30000
+          let hasRepositoryStateTimedOut = false
+          const repositoryStateTimeout = setTimeout(() => {
+            hasRepositoryStateTimedOut = true
+            Logger.appendLine(`Repository state change timeout after ${timeoutMs}ms, assuming repository is not valid`)
+            if (this._stateChangeDisposable) {
+              this._stateChangeDisposable.dispose()
+              this._stateChangeDisposable = undefined
+            }
+            this.state = CodacyCloudState.NoGitRepository
+          }, timeoutMs)
+
+          // Listen for state changes to detect when repository is fully loaded
+          this._stateChangeDisposable = gitRepository.state.onDidChange(() => {
+            if (hasRepositoryStateTimedOut) return // Don't process if we've already timed out
+
+            Logger.appendLine(
+              `Repository state changed - HEAD: ${gitRepository.state.HEAD?.name || 'undefined'}, Remotes: ${
+                gitRepository.state.remotes?.length || 0
+              }`
+            )
+            if (gitRepository.state.HEAD || gitRepository.state.remotes?.length > 0) {
+              clearTimeout(repositoryStateTimeout)
+              if (this._stateChangeDisposable) {
+                this._stateChangeDisposable.dispose()
+                this._stateChangeDisposable = undefined
+              }
+              openRepository()
+            }
+          })
+
+          // Add to disposables for cleanup
+          this._disposables.push(this._stateChangeDisposable)
+          return
+        }
+
         if (gitRepository.state.HEAD === undefined) {
+          Logger.appendLine('Repository HEAD is undefined but remotes are available')
           this.state = CodacyCloudState.Initializing
         } else {
           const remotesWithPushUrl = gitRepository.state.remotes.filter((remote) => remote.pushUrl)
@@ -473,6 +523,14 @@ export class CodacyCloud implements vscode.Disposable {
 
   public close(repository: GitRepository) {
     if (this._current === repository) {
+      Logger.appendLine(`CodacyCloud close: ${repository.rootUri.fsPath}`)
+
+      // Clean up state change listener when repository is closed
+      if (this._stateChangeDisposable) {
+        this._stateChangeDisposable.dispose()
+        this._stateChangeDisposable = undefined
+      }
+
       this.clear()
     }
   }
@@ -491,7 +549,6 @@ export class CodacyCloud implements vscode.Disposable {
 
   public refresh() {
     if (!this._current) return
-
     switch (this._state) {
       case CodacyCloudState.Loaded:
       case CodacyCloudState.IsAnalyzing:

src/git/GitProvider.ts

@@ -67,10 +67,18 @@ export class GitProvider implements IGitProvider {
   static async init(): Promise<GitProvider | undefined> {
     const extension = vscode.extensions.getExtension<GitExtension>('vscode.git')
     if (extension) {
-      await extension.activate()
-      GitProvider._instance = new GitProvider(extension)
+      try {
+        await extension.activate()
+        GitProvider._instance = new GitProvider(extension)
+        Logger.appendLine(`GitProvider initialized successfully. Extension enabled: ${extension.exports?.enabled}`)
 
-      return GitProvider._instance
+        return GitProvider._instance
+      } catch (error) {
+        Logger.error(`Failed to initialize GitProvider: ${error}`)
+        return undefined
+      }
+    } else {
+      Logger.error('VS Code Git extension not found')
     }
     return undefined
   }