SLI-2850 Decouple editor highlighting from the Current File tool window #1876
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
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 |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * SonarLint for IntelliJ IDEA | ||
| * Copyright (C) SonarSource Sàrl | ||
| * sonarlint@sonarsource.com | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 3 of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 | ||
| */ | ||
| package org.sonarlint.intellij.analysis | ||
|
|
||
| import com.intellij.openapi.components.Service | ||
| import com.intellij.openapi.fileEditor.FileEditorManager | ||
| import com.intellij.openapi.project.Project | ||
| import com.intellij.openapi.vfs.VirtualFile | ||
| import org.sonarlint.intellij.actions.SonarLintToolWindow | ||
| import org.sonarlint.intellij.common.util.SonarLintUtils | ||
| import org.sonarlint.intellij.common.util.SonarLintUtils.getService | ||
| import org.sonarlint.intellij.editor.CodeAnalyzerRestarter | ||
| import org.sonarlint.intellij.editor.EditorHighlightRefresh | ||
| import org.sonarlint.intellij.ui.currentfile.CurrentFileDisplayedFindingsRefresher | ||
|
|
||
| /** | ||
| * Resolves an [EditorHighlightRefresh] into a set of files, refreshes the filtered findings snapshot used by | ||
| * [org.sonarlint.intellij.editor.DirectHighlighter], and triggers editor markup refresh independently of the | ||
| * Current File tool window UI lifecycle. | ||
| * | ||
| * The [OnTheFlyFindingsHolder] owns the unfiltered per-open-file maps. Editor squiggles follow the Current File tab | ||
| * filters via [org.sonarlint.intellij.ui.currentfile.CurrentFileDisplayedFindingsStore]. [SonarLintToolWindow.refreshViews] | ||
| * rebuilds panels only; callers that need markup plus panels use [applyHighlightRefreshAndRefreshPanels]. | ||
| */ | ||
| @Service(Service.Level.PROJECT) | ||
| class OnTheFlyFindingsCoordinator(private val project: Project) { | ||
|
|
||
| fun applyHighlightRefresh(highlightRefresh: EditorHighlightRefresh) { | ||
| if (!highlightRefresh.enabled || project.isDisposed) { | ||
| return | ||
| } | ||
| val files = resolveFiles(highlightRefresh).filter { it.isValid } | ||
| if (files.isEmpty()) { | ||
| return | ||
| } | ||
| getService(project, CurrentFileDisplayedFindingsRefresher::class.java) | ||
| .refreshDisplayedFindings(SonarLintUtils.getSelectedFile(project)) | ||
| getService(project, CodeAnalyzerRestarter::class.java).refreshFiles(files) | ||
| } | ||
|
|
||
| /** | ||
| * Refreshes editor markup, then rebuilds tool-window panels. Use when findings caches changed outside the | ||
| * holder's analysis publish path (taints, CAYC, resolve actions, binding changes). | ||
| */ | ||
| fun applyHighlightRefreshAndRefreshPanels(highlightRefresh: EditorHighlightRefresh) { | ||
| applyHighlightRefresh(highlightRefresh) | ||
| if (!project.isDisposed) { | ||
| getService(project, SonarLintToolWindow::class.java).refreshViews() | ||
| } | ||
| } | ||
|
Comment on lines
+62
to
+67
There was a problem hiding this comment. 💡 Performance: Highlight refresh and filtering run twice per resolve/CAYC/binding event
Let the coordinator own the markup pass so panel rebuilds do not duplicate it:
Check the box to apply the fix or reply for a change | Was this helpful? React with 👍 / 👎 |
||
|
|
||
| private fun resolveFiles(highlightRefresh: EditorHighlightRefresh): Collection<VirtualFile> { | ||
| return when { | ||
| highlightRefresh.allOpenFiles -> openEditors() | ||
| highlightRefresh.changedFiles != null -> highlightRefresh.changedFiles | ||
| else -> openEditors() | ||
| } | ||
| } | ||
|
|
||
| private fun openEditors(): List<VirtualFile> = | ||
| FileEditorManager.getInstance(project).openFiles.toList() | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.