Repository navigation
IntelliJ stability update #50
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -5,19 +5,28 @@ | |||||||
| import com.codacy.intellij.plugin.services.api.Api | ||||||||
| import com.codacy.intellij.plugin.services.cli.CodacyCliService | ||||||||
| import com.codacy.intellij.plugin.services.common.Config | ||||||||
| import com.codacy.intellij.plugin.services.common.Logger | ||||||||
| import com.codacy.intellij.plugin.services.common.GitRemoteParser | ||||||||
| import com.codacy.intellij.plugin.services.common.IconUtils | ||||||||
| import com.codacy.intellij.plugin.services.git.GitProvider | ||||||||
| import com.codacy.intellij.plugin.services.git.RepositoryManager | ||||||||
| import com.codacy.intellij.plugin.telemetry.ExtensionInstalledEvent | ||||||||
| import com.codacy.intellij.plugin.telemetry.Telemetry | ||||||||
| import com.codacy.intellij.plugin.views.invalidateAnalysisCacheForHash | ||||||||
| import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer | ||||||||
| import com.intellij.ide.plugins.DynamicPluginListener | ||||||||
| import com.intellij.openapi.Disposable | ||||||||
| import com.intellij.openapi.application.ApplicationManager | ||||||||
| import com.intellij.openapi.components.service | ||||||||
| import com.intellij.openapi.project.Project | ||||||||
| import com.intellij.openapi.util.Disposer | ||||||||
| import com.intellij.openapi.startup.StartupActivity | ||||||||
| import com.intellij.openapi.vfs.VirtualFileManager | ||||||||
| import com.intellij.openapi.vfs.newvfs.BulkFileListener | ||||||||
| import com.intellij.openapi.vfs.newvfs.events.VFileContentChangeEvent | ||||||||
| import com.intellij.openapi.vfs.newvfs.events.VFileEvent | ||||||||
| import com.intellij.psi.PsiDocumentManager | ||||||||
| import com.intellij.psi.PsiManager | ||||||||
| import git4idea.repo.GitRepository | ||||||||
| import git4idea.repo.GitRepositoryChangeListener | ||||||||
| import kotlinx.coroutines.* | ||||||||
|
|
@@ -26,12 +35,26 @@ | |||||||
|
|
||||||||
| companion object { | ||||||||
| private const val MIN_REFRESH_INTERVAL_MS = 5000L | ||||||||
| private val activeScopes = java.util.Collections.synchronizedList(mutableListOf<CoroutineScope>()) | ||||||||
|
|
||||||||
| fun cancelAllScopes() { | ||||||||
| synchronized(activeScopes) { | ||||||||
| activeScopes.forEach { it.cancel() } | ||||||||
| activeScopes.clear() | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| private var lastTriggeredTime = 0L | ||||||||
|
|
||||||||
| override fun runActivity(project: Project) { | ||||||||
| val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO) | ||||||||
| activeScopes.add(scope) | ||||||||
| Disposer.register(project, Disposable { | ||||||||
| scope.cancel() | ||||||||
| activeScopes.remove(scope) | ||||||||
| }) | ||||||||
|
|
||||||||
| // Check for first installation | ||||||||
| val config = Config.instance | ||||||||
| if (config.state.isFirstRun) { | ||||||||
|
|
@@ -48,30 +71,53 @@ | |||||||
| connection.subscribe(DynamicPluginListener.TOPIC, PluginStateListener()) | ||||||||
|
|
||||||||
| connection.subscribe(GitRepository.GIT_REPO_CHANGE, GitRepositoryChangeListener { repository -> | ||||||||
| val gitResult = initializeGit(project, scope) | ||||||||
|
|
||||||||
| if (gitResult == null) { | ||||||||
| Logger.info("No git remote found, initializing services without remote info.") | ||||||||
| CodacyCliService.getServiceWithoutRemote(project) | ||||||||
| AiAgentService.getServiceWithoutRemote(project) | ||||||||
| } else { | ||||||||
| val repositoryManager = gitResult.first | ||||||||
| val gitInfo = gitResult.second | ||||||||
|
|
||||||||
| CodacyCliService.getService( | ||||||||
| Provider.fromString(gitInfo.provider), gitInfo.organization, gitInfo.repository, project, | ||||||||
| ) | ||||||||
|
|
||||||||
| AiAgentService.getService(project) | ||||||||
|
|
||||||||
| scope.launch { | ||||||||
| try { | ||||||||
| service<Api>().listTools() | ||||||||
| } catch (e: Exception) { | ||||||||
| Logger.warn("Failed to load tools: ${e.message}") | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| if (repository.currentBranch != null) { | ||||||||
| scope.launch { | ||||||||
| repositoryManager.handleStateChange() | ||||||||
| } | ||||||||
| } else { | ||||||||
| repositoryManager.notifyDidChangeConfig() | ||||||||
| } | ||||||||
| } | ||||||||
| }) | ||||||||
|
|
||||||||
| // Perform initial startup initialization without waiting for a git change event | ||||||||
| val gitRepository = GitProvider.getRepository(project) | ||||||||
| if (gitRepository != null) { | ||||||||
| val gitResult = initializeGit(project, scope) | ||||||||
| if (gitResult == null) { | ||||||||
| CodacyCliService.getServiceWithoutRemote(project) | ||||||||
| AiAgentService.getServiceWithoutRemote(project) | ||||||||
| } else { | ||||||||
| val (_, gitInfo) = gitResult | ||||||||
| CodacyCliService.getService(Provider.fromString(gitInfo.provider), gitInfo.organization, gitInfo.repository, project) | ||||||||
| AiAgentService.getService(project) | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| connection.subscribe(VirtualFileManager.VFS_CHANGES, object : BulkFileListener { | ||||||||
| private fun handle(events: List<VFileEvent>) { | ||||||||
|
|
@@ -91,20 +137,18 @@ | |||||||
|
|
||||||||
| override fun after(events: List<VFileEvent>) { | ||||||||
| handle(events) | ||||||||
| triggerAnalysisForSavedFiles(project, events) | ||||||||
| } | ||||||||
| }) | ||||||||
| } | ||||||||
|
|
||||||||
| private fun initializeGit(project: Project, scope: CoroutineScope): Pair<RepositoryManager, GitRemoteParser.GitRemoteInfo>? { | ||||||||
| val gitRepository = GitProvider.getRepository(project) | ||||||||
| val repositoryManager = project.service<RepositoryManager>() | ||||||||
| if (gitRepository != null && repositoryManager.currentRepository != gitRepository) | ||||||||
| scope.launch { repositoryManager.open(gitRepository) } | ||||||||
|
|
||||||||
| val remote = gitRepository?.remotes?.firstOrNull() ?: return null | ||||||||
| val gitInfo = GitRemoteParser.parseGitRemote(remote.firstUrl!!) | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
|
|
||||||||
| return Pair(repositoryManager, gitInfo) | ||||||||
|
Comment on lines
+151
to
154
|
||||||||
|
|
@@ -114,7 +158,43 @@ | |||||||
| // E.g. if the user deletes CLI.sh, re-initialization of the project will check for the | ||||||||
| // presence of the CLI and mark its state as not-installed | ||||||||
| private fun onProjectFileSystemChange(project: Project, events: List<VFileEvent>) { | ||||||||
| if (GitProvider.getRepository(project) == null) return | ||||||||
| try { | ||||||||
| CodacyCliService.getService(project) | ||||||||
| AiAgentService.getService(project) | ||||||||
| } catch (e: IllegalStateException) { | ||||||||
| Logger.info("Git provider or remote not available.") | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| private fun triggerAnalysisForSavedFiles(project: Project, events: List<VFileEvent>) { | ||||||||
| val basePath = project.basePath ?: return | ||||||||
| val savedFiles = events | ||||||||
| .filterIsInstance<VFileContentChangeEvent>() | ||||||||
| .mapNotNull { it.file } | ||||||||
| .filter { vf -> | ||||||||
| vf.isValid && | ||||||||
| !vf.isDirectory && | ||||||||
| vf.path.startsWith(basePath) && | ||||||||
| !vf.path.contains("/.codacy/") | ||||||||
| } | ||||||||
|
|
||||||||
| if (savedFiles.isEmpty()) return | ||||||||
|
|
||||||||
| ApplicationManager.getApplication().invokeLater { | ||||||||
| if (project.isDisposed) return@invokeLater | ||||||||
|
Check warning on line 185 in src/main/kotlin/com/codacy/intellij/plugin/listeners/StartupListener.kt
|
||||||||
| val psiManager = PsiManager.getInstance(project) | ||||||||
| val documentManager = PsiDocumentManager.getInstance(project) | ||||||||
| val daemon = DaemonCodeAnalyzer.getInstance(project) | ||||||||
| for (vf in savedFiles) { | ||||||||
| val psiFile = psiManager.findFile(vf) ?: continue | ||||||||
| // cli.analyze reads from disk, so the cached entry (keyed by document hash) | ||||||||
| // reflects the pre-save disk content. Drop it so the next pass re-runs the CLI. | ||||||||
| documentManager.getDocument(psiFile)?.let { doc -> | ||||||||
| invalidateAnalysisCacheForHash(doc.text.hashCode()) | ||||||||
| } | ||||||||
| daemon.restart(psiFile) | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -78,6 +78,13 @@ class AiAgentService { | |
|
|
||
| return service | ||
| } | ||
|
|
||
| fun getServiceWithoutRemote(project: Project): AiAgentService { | ||
| val pathsBehaviour = PathsBehaviour.Factory.build() | ||
| val service = project.getService(AiAgentService::class.java) | ||
| service.initService(Provider.GITHUB, "", "", project, pathsBehaviour) | ||
| return service | ||
|
Comment on lines
+82
to
+86
There was a problem hiding this comment.
|
||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ import java.io.InputStreamReader | |
| import java.net.HttpURLConnection | ||
| import java.net.URL | ||
|
|
||
| @Service(Service.Level.APP) | ||
| class Api { | ||
|
|
||
| private val config = service<Config>() | ||
|
|
@@ -47,15 +47,13 @@ class Api { | |
| Gson().fromJson(response, responseClass) | ||
| } | ||
| } else { | ||
| if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) | ||
| config.storeApiToken("") | ||
| throw Exception("Failed to fetch data: HTTP response code $responseCode") | ||
| } | ||
|
Comment on lines
49
to
53
There was a problem hiding this comment.
|
||
| } | ||
| catch (e: Exception) { | ||
|
lventura-codacy marked this conversation as resolved.
|
||
| throw Exception("Failed to fetch data: ${e.message}", e) | ||
| } | ||
|
lventura-codacy marked this conversation as resolved.
|
||
| } | ||
| } | ||
|
|
@@ -131,7 +129,7 @@ class Api { | |
| return try { | ||
| makeRequest(endpointUrl, GetUserProfileResponse::class.java).data | ||
| } catch (e: Exception) { | ||
| Logger.warn("Failed to fetch user profile: ${e.message}") | ||
| null | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ import com.codacy.intellij.plugin.services.common.Config.Companion.CODACY_TOOLS_ | |
| import com.codacy.intellij.plugin.services.common.Config.Companion.CODACY_YAML_NAME | ||
| import com.codacy.intellij.plugin.services.common.GitRemoteParser | ||
| import com.codacy.intellij.plugin.services.common.IconUtils | ||
| import com.codacy.intellij.plugin.services.common.Logger | ||
| import com.codacy.intellij.plugin.services.common.OsType | ||
| import com.codacy.intellij.plugin.services.common.SystemDetectionService | ||
| import com.codacy.intellij.plugin.services.git.GitProvider | ||
|
|
@@ -83,7 +84,7 @@ class CodacyCliService() { | |
|
|
||
| data object NOT_INSTALLED : CodacyCliState { | ||
| override fun toString() = "Not Installed" | ||
| override val icon: Icon = IconUtils.CodacyIcon | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -96,7 +97,8 @@ class CodacyCliService() { | |
| private lateinit var cliBehaviour: CodacyCliBehaviour | ||
| private lateinit var pathsBehaviour: PathsBehaviour | ||
|
|
||
| var isServiceInstantiated: Boolean = false | ||
| private set | ||
|
|
||
| private val cliStateListeners = mutableListOf<() -> Unit>() | ||
|
|
||
|
|
@@ -168,6 +170,10 @@ class CodacyCliService() { | |
| ) | ||
| } | ||
|
|
||
| fun getServiceWithoutRemote(project: Project): CodacyCliService { | ||
| return getService(Provider.GITHUB, "", "", project) | ||
| } | ||
|
Comment on lines
+173
to
+175
There was a problem hiding this comment.
|
||
|
|
||
| fun getService( | ||
| provider: Provider, | ||
| organization: String, | ||
|
|
@@ -492,16 +498,11 @@ class CodacyCliService() { | |
| } | ||
|
|
||
| if (fileOutput.isFailure) { | ||
| Logger.info("No analysis result file found for file: $file. Is it a supported file type?") | ||
| } | ||
|
|
||
| results = fileOutput.getOrNull() | ||
| ?.let { SarifUtil.readReport(StringReader(it)).runs } | ||
| ?.let(::processSarifResults) | ||
| ?: emptyList() | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Calling
CodacyCliService.getServiceWithoutRemote()/AiAgentService.getServiceWithoutRemote()here can permanently initialize those services with empty org/repo (both services’initServicemethods only set repo context on first initialization). If a remote becomes available later in the session, subsequentgetService(project)calls may not update the context. Consider not instantiating services until remote info exists, or ensure services can be re-initialized with real repo data once available.