fixup! removed copilot from generated schema and command palette

Mikayla Maki created 2 years ago

Change summary

crates/copilot/src/copilot.rs       |  4 ++--
crates/staff_mode/src/staff_mode.rs | 18 ++++--------------
2 files changed, 6 insertions(+), 16 deletions(-)

Detailed changes

crates/copilot/src/copilot.rs

@@ -37,7 +37,7 @@ const COPILOT_NAMESPACE: &'static str = "copilot";
 actions!(copilot, [NextSuggestion, PreviousSuggestion, Reinstall]);
 
 pub fn init(client: Arc<Client>, node_runtime: Arc<NodeRuntime>, cx: &mut MutableAppContext) {
-    staff_mode::<staff_mode::Copilot, _>(cx, {
+    staff_mode(cx, {
         move |cx| {
             cx.update_global::<collections::CommandPaletteFilter, _, _>(|filter, _cx| {
                 filter.filtered_namespaces.remove(COPILOT_NAMESPACE);
@@ -56,7 +56,7 @@ pub fn init(client: Arc<Client>, node_runtime: Arc<NodeRuntime>, cx: &mut Mutabl
             sign_in::init(cx);
         }
     });
-    not_staff_mode::<staff_mode::Copilot, _>(cx, |cx| {
+    not_staff_mode(cx, |cx| {
         cx.update_global::<collections::CommandPaletteFilter, _, _>(|filter, _cx| {
             filter.filtered_namespaces.insert(COPILOT_NAMESPACE);
             filter.filtered_namespaces.insert(COPILOT_AUTH_NAMESPACE);

crates/staff_mode/src/staff_mode.rs

@@ -13,11 +13,11 @@ impl std::ops::Deref for StaffMode {
 
 /// Despite what the type system requires me to tell you, the init function will only be called a once
 /// as soon as we know that the staff mode is enabled.
-pub fn staff_mode<S: StaffModeConfiguration, F: FnMut(&mut MutableAppContext) + 'static>(
+pub fn staff_mode<F: FnMut(&mut MutableAppContext) + 'static>(
     cx: &mut MutableAppContext,
     mut init: F,
 ) {
-    if !S::staff_only() || **cx.default_global::<StaffMode>() {
+    if **cx.default_global::<StaffMode>() {
         init(cx)
     } else {
         let mut once = Some(());
@@ -31,21 +31,11 @@ pub fn staff_mode<S: StaffModeConfiguration, F: FnMut(&mut MutableAppContext) +
 }
 
 /// Immediately checks and runs the init function if the staff mode is not enabled.
-pub fn not_staff_mode<S: StaffModeConfiguration, F: FnOnce(&mut MutableAppContext) + 'static>(
+pub fn not_staff_mode<F: FnOnce(&mut MutableAppContext) + 'static>(
     cx: &mut MutableAppContext,
     init: F,
 ) {
-    if !S::staff_only() || !**cx.default_global::<StaffMode>() {
+    if !**cx.default_global::<StaffMode>() {
         init(cx)
     }
 }
-
-pub trait StaffModeConfiguration {
-    fn staff_only() -> bool {
-        true
-    }
-}
-
-pub enum Copilot {}
-
-impl StaffModeConfiguration for Copilot {}