Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not run EDT code in CodyFixHighlightPass:doCollectInformation #2289

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Do not run EDT code in CodyFixHighlightPass:doCollectInformation #2289

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ca1c9b
Do not run EDT code in CodyFixHighlightPass:doCollectInformation
pkukielka Sep 13, 2024
fd54e03
Bring back missing severity filtering
pkukielka Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 27 additions & 51 deletions src/main/kotlin/com/sourcegraph/cody/inspections/CodyFixHighlightPass.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import com.sourcegraph.cody.agent.protocol_generated.Diagnostics_PublishParams
import com.sourcegraph.cody.agent.protocol_generated.ProtocolDiagnostic
import com.sourcegraph.cody.agent.protocol_generated.ProtocolLocation
import com.sourcegraph.cody.agent.protocol_generated.Range
import com.sourcegraph.utils.ThreadingUtil
import java.util.concurrent.CompletableFuture

class CodyFixHighlightPass(val file: PsiFile, val editor: Editor) :
Expand All @@ -48,37 +47,27 @@ class CodyFixHighlightPass(val file: PsiFile, val editor: Editor) :
DaemonCodeAnalyzerImpl.getHighlights(editor.document, HighlightSeverity.ERROR, file.project)

val protocolDiagnostics =
ThreadingUtil.runInEdtAndGet {
myHighlights
// TODO: We need to check how Enum comparison works to check if we can do things like
// >=
// HighlightSeverity.INFO
.asSequence()
.filter { it.severity == HighlightSeverity.ERROR }
.filter { it.startOffset <= document.textLength }
.filter { it.endOffset <= document.textLength }
.filter { it.startOffset <= it.endOffset }
.mapNotNull {
try {
ProtocolDiagnostic(
message = it.description,
severity =
"error", // TODO: Wait for CODY-2882. This isn't currently used by the
// agent,
// so we just keep our lives simple.
location =
// TODO: Rik Nauta -- Got incorrect range; see QA report Aug 6 2024.
ProtocolLocation(
uri = uri, range = document.codyRange(it.startOffset, it.endOffset)),
code = it.problemGroup?.problemName)
} catch (x: Exception) {
// Don't allow range errors to throw user-visible exceptions (QA found this).
logger.warn("Failed to convert highlight to protocol diagnostic", x)
null
}
// TODO: We need to check how Enum comparison works to check if we can do things like
// >= HighlightSeverity.INFO
myHighlights
.filter { it.severity == HighlightSeverity.ERROR }
.mapNotNull {
try {
val range = document.codyRange(it.startOffset, it.endOffset)
ProtocolDiagnostic(
message = it.description,
// TODO: Wait for CODY-2882. This isn't currently used by the agent, so we just
// keep our lives simple.
severity = "error",
// TODO: Rik Nauta -- Got incorrect range; see QA report Aug 6 2024.
location = ProtocolLocation(uri = uri, range = range),
code = it.problemGroup?.problemName)
} catch (x: Exception) {
// Don't allow range errors to throw user-visible exceptions (QA found this).
logger.warn("Failed to convert highlight to protocol diagnostic", x)
null
}
.toList()
}
}

if (protocolDiagnostics.isEmpty()) {
return
Expand All @@ -90,32 +79,19 @@ class CodyFixHighlightPass(val file: PsiFile, val editor: Editor) :
agent.server.diagnostics_publish(
Diagnostics_PublishParams(diagnostics = protocolDiagnostics))

for (highlight in myHighlights) {
for (diagnostic in protocolDiagnostics) {
if (progress.isCanceled) {
break
}

val range =
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to recompute the same thing again

ThreadingUtil.runInEdtAndGet {
if (highlight.startOffset > document.textLength ||
highlight.endOffset > document.textLength ||
highlight.startOffset > highlight.endOffset) {
return@runInEdtAndGet null
}

return@runInEdtAndGet document.codyRange(highlight.startOffset, highlight.endOffset)
} ?: break

if (myRangeActions.containsKey(range)) {
val location = diagnostic.location
if (myRangeActions.containsKey(location.range)) {
continue
}
val location = ProtocolLocation(uri = uri, range = range)
val provideResponse =
agent.server
.codeActions_provide(
CodeActions_ProvideParams(triggerKind = "Invoke", location = location))
.get()
myRangeActions[range] =

val provideParam = CodeActions_ProvideParams(triggerKind = "Invoke", location = location)
val provideResponse = agent.server.codeActions_provide(provideParam).get()
myRangeActions[location.range] =
provideResponse.codeActions.map {
CodeActionQuickFixParams(action = it, location = location)
}
Expand Down
Loading