-
Notifications
You must be signed in to change notification settings - Fork 23
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.
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
Add a service for checking Cody Ignore policy and decorate some UI with ignored status #1379
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 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
19 changes: 18 additions & 1 deletion
19
src/main/kotlin/com/sourcegraph/cody/chat/actions/BaseCommandAction.kt
This file contains 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
34 changes: 34 additions & 0 deletions
34
src/main/kotlin/com/sourcegraph/cody/ignore/ActionInIgnoredFileNotification.kt
This file contains 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,34 @@ | ||
package com.sourcegraph.cody.context.ui | ||
|
||
import com.intellij.ide.BrowserUtil | ||
import com.intellij.notification.Notification | ||
import com.intellij.notification.NotificationAction | ||
import com.intellij.notification.NotificationType | ||
import com.intellij.notification.impl.NotificationFullContent | ||
import com.intellij.openapi.actionSystem.AnActionEvent | ||
import com.sourcegraph.Icons | ||
import com.sourcegraph.cody.ignore.CODY_IGNORE_DOCS_URL | ||
import com.sourcegraph.common.CodyBundle | ||
import com.sourcegraph.common.NotificationGroups | ||
|
||
class ActionInIgnoredFileNotification : | ||
Notification( | ||
NotificationGroups.SOURCEGRAPH_ERRORS, | ||
"", | ||
CodyBundle.getString("ignore.action-in-ignored-file.detail"), | ||
NotificationType.INFORMATION), | ||
NotificationFullContent { | ||
|
||
init { | ||
icon = Icons.CodyLogoSlash | ||
|
||
addAction( | ||
object : | ||
NotificationAction( | ||
CodyBundle.getString("ignore.action-in-ignored-file.learn-more-cta")) { | ||
override fun actionPerformed(event: AnActionEvent, notification: Notification) { | ||
BrowserUtil.browse(CODY_IGNORE_DOCS_URL) | ||
} | ||
}) | ||
} | ||
} |
39 changes: 39 additions & 0 deletions
39
src/main/kotlin/com/sourcegraph/cody/ignore/IgnoreNotificationProvider.kt
This file contains 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,39 @@ | ||
package com.sourcegraph.cody.ignore | ||
|
||
import com.intellij.ide.BrowserUtil | ||
import com.intellij.openapi.fileEditor.FileEditor | ||
import com.intellij.openapi.project.DumbAware | ||
import com.intellij.openapi.project.Project | ||
import com.intellij.openapi.vfs.VirtualFile | ||
import com.intellij.ui.EditorNotificationPanel | ||
import com.intellij.ui.EditorNotificationProvider | ||
import com.sourcegraph.Icons | ||
import com.sourcegraph.cody.agent.protocol.ProtocolTextDocument | ||
import java.util.function.Function | ||
import javax.swing.JComponent | ||
|
||
const val CODY_IGNORE_DOCS_URL = "https://sourcegraph.com/docs/cody/capabilities/ignore-context" | ||
|
||
class IgnoreNotificationProvider : EditorNotificationProvider, DumbAware { | ||
override fun collectNotificationData( | ||
project: Project, | ||
file: VirtualFile | ||
): Function<in FileEditor, out JComponent?> { | ||
val policy = | ||
IgnoreOracle.getInstance(project).policyForUri(ProtocolTextDocument.uriFor(file)).get() | ||
if (policy == IgnorePolicy.USE) { | ||
return Function { null } | ||
} | ||
return Function { | ||
EditorNotificationPanel(it).apply { | ||
icon(Icons.CodyLogoSlash) | ||
// TODO: This message is specific to the enterprise product and needs to be changed when we | ||
// support cody ignore in the self-serve product | ||
text = "Cody ignores this file because of your admin policy" | ||
|
||
createActionLabel( | ||
"Learn more", Runnable { BrowserUtil.browse(CODY_IGNORE_DOCS_URL) }, false) | ||
} | ||
} | ||
} | ||
} |
88 changes: 88 additions & 0 deletions
88
src/main/kotlin/com/sourcegraph/cody/ignore/IgnoreOracle.kt
This file contains 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,88 @@ | ||
package com.sourcegraph.cody.ignore | ||
|
||
import com.intellij.openapi.application.ApplicationManager | ||
import com.intellij.openapi.components.Service | ||
import com.intellij.openapi.components.service | ||
import com.intellij.openapi.project.Project | ||
import com.intellij.ui.EditorNotifications | ||
import com.intellij.util.containers.SLRUMap | ||
import com.sourcegraph.cody.agent.CodyAgentService | ||
import com.sourcegraph.cody.agent.protocol.IgnoreTestParams | ||
import com.sourcegraph.cody.statusbar.CodyStatusService | ||
import java.util.concurrent.CompletableFuture | ||
|
||
enum class IgnorePolicy(val value: String) { | ||
IGNORE("ignore"), | ||
USE("use"), | ||
} | ||
|
||
/** | ||
* Provides details about whether files and repositories must be ignored as chat context, for | ||
* autocomplete, etc. per policy. | ||
*/ | ||
@Service(Service.Level.PROJECT) | ||
class IgnoreOracle(private val project: Project) { | ||
companion object { | ||
fun getInstance(project: Project): IgnoreOracle { | ||
return project.service<IgnoreOracle>() | ||
} | ||
} | ||
|
||
private val cache = SLRUMap<String, IgnorePolicy>(100, 100) | ||
@Volatile private var focusedPolicy: IgnorePolicy? = null | ||
@Volatile private var willFocusUri: String? = null | ||
|
||
val isEditingIgnoredFile: Boolean | ||
get() { | ||
return focusedPolicy == IgnorePolicy.IGNORE | ||
} | ||
|
||
fun focusedFileDidChange(uri: String) { | ||
willFocusUri = uri | ||
ApplicationManager.getApplication().executeOnPooledThread { | ||
val policy = policyForUri(uri).get() | ||
if (focusedPolicy != policy && willFocusUri == uri) { | ||
focusedPolicy = policy | ||
CodyStatusService.resetApplication(project) | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* Notifies the IgnoreOracle that the ignore policy has changed. Called by CodyAgentService's | ||
* client callbacks. | ||
*/ | ||
fun onIgnoreDidChange() { | ||
synchronized(cache) { cache.clear() } | ||
|
||
// Update editor notifications to refresh IgnoreNotificationProvider banners. | ||
EditorNotifications.getInstance(project).updateAllNotifications() | ||
|
||
// Re-set the focused file URI to update the status bar. | ||
val uri = willFocusUri | ||
if (uri != null) { | ||
focusedFileDidChange(uri) | ||
} | ||
} | ||
|
||
/** Gets whether `uri` should be ignored for autocomplete, context, etc. */ | ||
fun policyForUri(uri: String): CompletableFuture<IgnorePolicy> { | ||
val completable = CompletableFuture<IgnorePolicy>() | ||
val result = synchronized(cache) { cache[uri] } | ||
if (result != null) { | ||
completable.complete(result) | ||
return completable | ||
} | ||
CodyAgentService.withAgent(project) { agent -> | ||
val policy = | ||
when (agent.server.ignoreTest(IgnoreTestParams(uri)).get().policy) { | ||
"ignore" -> IgnorePolicy.IGNORE | ||
"use" -> IgnorePolicy.USE | ||
else -> throw IllegalStateException("invalid ignore policy value") | ||
} | ||
synchronized(cache) { cache.put(uri, policy) } | ||
completable.complete(policy) | ||
} | ||
return completable | ||
} | ||
} |
This file contains 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 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 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 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 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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.
Hmph.