Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

zeta: Rename data_collection_permission back to can_collect_data (#24225)

Browse source 
This PR renames some bindings from `data_collection_permission` back to
`can_collect_data`, as the latter name is clearer on account of being a
modal verb.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-02-04 16:02:26 -05:00 • committed by GitHub
parent 58db66ef44
commit d6a2a0b04a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/rpc/src/llm.rs
View file

@ -41,7 +41,7 @@ pub struct PredictEditsParams {
pub input_excerpt: String, pub input_excerpt: String,
/// Whether the user provided consent for sampling this interaction. /// Whether the user provided consent for sampling this interaction.
#[serde(default)] #[serde(default)]
pub data_collection_permission: bool, pub can_collect_data: bool,
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]

15
crates/zeta/src/zeta.rs
View file

@ -364,7 +364,7 @@ impl Zeta {
&mut self, &mut self,
buffer: &Entity<Buffer>, buffer: &Entity<Buffer>,
cursor: language::Anchor, cursor: language::Anchor,
data_collection_permission: bool, can_collect_data: bool,
cx: &mut Context<Self>, cx: &mut Context<Self>,
perform_predict_edits: F, perform_predict_edits: F,
) -> Task<Result<Option<InlineCompletion>>> ) -> Task<Result<Option<InlineCompletion>>>
@ -429,7 +429,7 @@ impl Zeta {
input_events: input_events.clone(), input_events: input_events.clone(),
input_excerpt: input_excerpt.clone(), input_excerpt: input_excerpt.clone(),
outline: Some(input_outline.clone()), outline: Some(input_outline.clone()),
data_collection_permission, can_collect_data,
}; };
let response = perform_predict_edits(client, llm_token, is_staff, body).await?; let response = perform_predict_edits(client, llm_token, is_staff, body).await?;
@ -609,13 +609,13 @@ and then another
&mut self, &mut self,
buffer: &Entity<Buffer>, buffer: &Entity<Buffer>,
position: language::Anchor, position: language::Anchor,
data_collection_permission: bool, can_collect_data: bool,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) -> Task<Result<Option<InlineCompletion>>> { ) -> Task<Result<Option<InlineCompletion>>> {
self.request_completion_impl( self.request_completion_impl(
buffer, buffer,
position, position,
data_collection_permission, can_collect_data,
cx, cx,
Self::perform_predict_edits, Self::perform_predict_edits,
) )
@ -1365,7 +1365,7 @@ impl ProviderDataCollection {
.map_or(false, |choice| choice.read(cx).is_enabled()) .map_or(false, |choice| choice.read(cx).is_enabled())
} }
pub fn data_collection_permission(&self, cx: &App) -> bool { pub fn can_collect_data(&self, cx: &App) -> bool {
self.choice self.choice
.as_ref() .as_ref()
.is_some_and(|choice| choice.read(cx).is_enabled()) .is_some_and(|choice| choice.read(cx).is_enabled())
@ -1499,8 +1499,7 @@ impl inline_completion::InlineCompletionProvider for ZetaInlineCompletionProvide
let pending_completion_id = self.next_pending_completion_id; let pending_completion_id = self.next_pending_completion_id;
self.next_pending_completion_id += 1; self.next_pending_completion_id += 1;
let data_collection_permission = let can_collect_data = self.provider_data_collection.can_collect_data(cx);
self.provider_data_collection.data_collection_permission(cx);
let last_request_timestamp = self.last_request_timestamp; let last_request_timestamp = self.last_request_timestamp;
let task = cx.spawn(|this, mut cx| async move { let task = cx.spawn(|this, mut cx| async move {
@ -1513,7 +1512,7 @@ impl inline_completion::InlineCompletionProvider for ZetaInlineCompletionProvide
let completion_request = this.update(&mut cx, |this, cx| { let completion_request = this.update(&mut cx, |this, cx| {
this.last_request_timestamp = Instant::now(); this.last_request_timestamp = Instant::now();
this.zeta.update(cx, |zeta, cx| { this.zeta.update(cx, |zeta, cx| {
zeta.request_completion(&buffer, position, data_collection_permission, cx) zeta.request_completion(&buffer, position, can_collect_data, cx)
}) })
}); });