diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3226997656..617fdaf00e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: - name: Build other binaries and features run: cargo build --workspace --bins --all-features; cargo check -p gpui --features "macos-blade" - # todo!(linux): Actually run the tests + # todo(linux): Actually run the tests linux_tests: name: (Linux) Run Clippy and tests runs-on: ubuntu-latest @@ -126,7 +126,7 @@ jobs: - name: Build Zed run: cargo build -p zed - # todo!(windows): Actually run the tests + # todo(windows): Actually run the tests windows_tests: name: (Windows) Run Clippy and tests runs-on: windows-latest diff --git a/Cargo.toml b/Cargo.toml index 2757fed05d..5f87027887 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -310,7 +310,7 @@ pathfinder_simd = { git = "https://github.com/servo/pathfinder.git", rev = "e4fc split-debuginfo = "unpacked" debug = "limited" -# todo!(linux) - Remove this +# todo(linux) - Remove this [profile.dev.package.blade-graphics] split-debuginfo = "off" debug = "full" diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index 4af201b9e3..8f78a5dd09 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -73,7 +73,7 @@ "ctrl-n": "editor::MoveDown", "ctrl-b": "editor::MoveLeft", "ctrl-f": "editor::MoveRight", - "ctrl-shift-l": "editor::NextScreen", // todo!(linux): What is this + "ctrl-shift-l": "editor::NextScreen", // todo(linux): What is this "alt-left": "editor::MoveToPreviousWordStart", "alt-b": "editor::MoveToPreviousWordStart", "alt-right": "editor::MoveToNextWordEnd", @@ -388,7 +388,7 @@ } }, // Bindings from Sublime Text - // todo!(linux) make sure these match linux bindings or remove above comment? + // todo(linux) make sure these match linux bindings or remove above comment? { "context": "Editor", "bindings": { @@ -412,7 +412,7 @@ } }, // Bindings from Atom - // todo!(linux) make sure these match linux bindings or remove above comment? + // todo(linux) make sure these match linux bindings or remove above comment? { "context": "Pane", "bindings": { diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs index cbe9edf8e5..2826b93c3a 100644 --- a/crates/assistant/src/assistant_panel.rs +++ b/crates/assistant/src/assistant_panel.rs @@ -774,7 +774,7 @@ impl AssistantPanel { } else { editor.highlight_background::( background_ranges, - |theme| theme.editor_active_line_background, // todo!("use the appropriate color") + |theme| theme.editor_active_line_background, // todo("use the appropriate color") cx, ); } diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index e4750eb352..e6ec1e559d 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -156,7 +156,7 @@ mod linux { } } -// todo!("windows") +// todo("windows") #[cfg(target_os = "windows")] mod windows { use std::path::Path; diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs index e2b04bb8ac..ac086ea89c 100644 --- a/crates/collab/src/main.rs +++ b/crates/collab/src/main.rs @@ -130,7 +130,7 @@ async fn main() -> Result<()> { }) .await?; - // todo!("windows") + // todo("windows") #[cfg(windows)] unimplemented!(); } diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs index da3301ecc9..54efde8c3c 100644 --- a/crates/collab_ui/src/collab_panel.rs +++ b/crates/collab_ui/src/collab_panel.rs @@ -1052,7 +1052,7 @@ impl CollabPanel { .indent_step_size(px(20.)) .selected(is_selected) .on_click(cx.listener(move |_this, _, _cx| { - // todo!() + // todo() })) .start_slot( h_flex() @@ -1531,7 +1531,7 @@ impl CollabPanel { id: _id, name: _name, } => { - // todo!() + // todo() } ListEntry::OutgoingRequest(_) => {} diff --git a/crates/color/src/color.rs b/crates/color/src/color.rs index 43bbc1c032..307b211e61 100644 --- a/crates/color/src/color.rs +++ b/crates/color/src/color.rs @@ -197,7 +197,7 @@ pub struct ColorStates { /// Returns a set of colors for different states of an element. /// -/// todo!("This should take a theme and use appropriate colors from it") +/// todo("This should take a theme and use appropriate colors from it") pub fn states_for_color(color: RGBAColor, is_light: bool) -> ColorStates { let adjustment_factor = if is_light { 0.1 } else { -0.1 }; let hover_adjustment = 1.0 - adjustment_factor; diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs index a94b38df7b..9d0b70f5a1 100644 --- a/crates/editor/src/hover_popover.rs +++ b/crates/editor/src/hover_popover.rs @@ -117,7 +117,7 @@ pub fn hover_at_inlay(editor: &mut Editor, inlay_hover: InlayHover, cx: &mut Vie // Highlight the selected symbol using a background highlight this.highlight_inlay_background::( vec![inlay_hover.range], - |theme| theme.element_hover, // todo!("use a proper background here") + |theme| theme.element_hover, // todo("use a proper background here") cx, ); this.hover_state.info_popover = Some(hover_popover); @@ -332,7 +332,7 @@ fn show_hover( // Highlight the selected symbol using a background highlight this.highlight_background::( vec![symbol_range], - |theme| theme.element_hover, // todo! update theme + |theme| theme.element_hover, // todo update theme cx, ); } else { diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs index 632247f57e..2041ebb468 100644 --- a/crates/fs/src/fs.rs +++ b/crates/fs/src/fs.rs @@ -1343,7 +1343,7 @@ pub fn copy_recursive<'a>( .boxed() } -// todo!(windows) +// todo(windows) // can we get file id not open the file twice? // https://github.com/rust-lang/rust/issues/63010 #[cfg(target_os = "windows")] diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index 8431dd5599..9c9e22d9fc 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -96,7 +96,7 @@ objc = "0.2" flume = "0.11" open = "5.0.1" ashpd = "0.7.0" -# todo!(linux) - Technically do not use `randr`, but it doesn't compile otherwise +# todo(linux) - Technically do not use `randr`, but it doesn't compile otherwise xcb = { version = "1.3", features = ["as-raw-xcb-connection", "present", "randr", "xkb"] } wayland-client= { version = "0.31.2" } wayland-protocols = { version = "0.31.2", features = ["client", "staging", "unstable"] } diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs index b02d521a8c..346687bbf2 100644 --- a/crates/gpui/src/platform.rs +++ b/crates/gpui/src/platform.rs @@ -1,6 +1,6 @@ -// todo!(linux): remove +// todo(linux): remove #![cfg_attr(target_os = "linux", allow(dead_code))] -// todo!("windows"): remove +// todo("windows"): remove #![cfg_attr(windows, allow(dead_code))] mod app_menu; @@ -63,7 +63,7 @@ pub(crate) fn current_platform() -> Rc { pub(crate) fn current_platform() -> Rc { Rc::new(LinuxPlatform::new()) } -// todo!("windows") +// todo("windows") #[cfg(target_os = "windows")] pub(crate) fn current_platform() -> Rc { unimplemented!() diff --git a/crates/gpui/src/platform/blade/blade_renderer.rs b/crates/gpui/src/platform/blade/blade_renderer.rs index f73f668260..554479ef1c 100644 --- a/crates/gpui/src/platform/blade/blade_renderer.rs +++ b/crates/gpui/src/platform/blade/blade_renderer.rs @@ -564,7 +564,7 @@ impl BladeRenderer { } PrimitiveBatch::Paths(paths) => { let mut encoder = pass.with(&self.pipelines.paths); - //todo!(linux): group by texture ID + // todo(linux): group by texture ID for path in paths { let tile = &self.path_tiles[&path.id]; let tex_info = self.atlas.get_texture_info(tile.texture_id); diff --git a/crates/gpui/src/platform/linux/dispatcher.rs b/crates/gpui/src/platform/linux/dispatcher.rs index 4f2b27dce3..9dc0442035 100644 --- a/crates/gpui/src/platform/linux/dispatcher.rs +++ b/crates/gpui/src/platform/linux/dispatcher.rs @@ -1,7 +1,7 @@ #![allow(non_upper_case_globals)] #![allow(non_camel_case_types)] #![allow(non_snake_case)] -//todo!(linux): remove +// todo(linux): remove #![allow(unused_variables)] use crate::{PlatformDispatcher, TaskLabel}; diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs index 1195859ef3..f6e80d1c94 100644 --- a/crates/gpui/src/platform/linux/platform.rs +++ b/crates/gpui/src/platform/linux/platform.rs @@ -141,19 +141,19 @@ impl Platform for LinuxPlatform { self.inner.loop_signal.stop(); } - //todo!(linux) + // todo(linux) fn restart(&self) {} - //todo!(linux) + // todo(linux) fn activate(&self, ignoring_other_apps: bool) {} - //todo!(linux) + // todo(linux) fn hide(&self) {} - //todo!(linux) + // todo(linux) fn hide_other_apps(&self) {} - //todo!(linux) + // todo(linux) fn unhide_other_apps(&self) {} fn displays(&self) -> Vec> { @@ -164,7 +164,7 @@ impl Platform for LinuxPlatform { self.client.display(id) } - //todo!(linux) + // todo(linux) fn active_window(&self) -> Option { None } @@ -328,7 +328,7 @@ impl Platform for LinuxPlatform { unimplemented!() } - //todo!(linux) + // todo(linux) fn set_menus(&self, menus: Vec, keymap: &Keymap) {} fn local_timezone(&self) -> UtcOffset { @@ -339,18 +339,18 @@ impl Platform for LinuxPlatform { unimplemented!() } - //todo!(linux) + // todo(linux) fn set_cursor_style(&self, style: CursorStyle) {} - //todo!(linux) + // todo(linux) fn should_auto_hide_scrollbars(&self) -> bool { false } - //todo!(linux) + // todo(linux) fn write_to_clipboard(&self, item: ClipboardItem) {} - //todo!(linux) + // todo(linux) fn read_from_clipboard(&self) -> Option { None } diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs index 497d615588..8fd1be323b 100644 --- a/crates/gpui/src/platform/linux/text_system.rs +++ b/crates/gpui/src/platform/linux/text_system.rs @@ -32,7 +32,7 @@ impl LinuxTextSystem { pub(crate) fn new() -> Self { let mut font_system = FontSystem::new(); - // todo!(linux) make font loading non-blocking + // todo(linux) make font loading non-blocking font_system.db_mut().load_system_fonts(); Self(RwLock::new(LinuxTextSystemState { @@ -59,7 +59,7 @@ impl PlatformTextSystem for LinuxTextSystem { self.0.write().add_fonts(fonts) } - // todo!(linux) ensure that this integrates with platform font loading + // todo(linux) ensure that this integrates with platform font loading // do we need to do more than call load_system_fonts()? fn all_font_names(&self) -> Vec { self.0 @@ -71,13 +71,13 @@ impl PlatformTextSystem for LinuxTextSystem { .collect() } - // todo!(linux) + // todo(linux) fn all_font_families(&self) -> Vec { Vec::new() } fn font_id(&self, font: &Font) -> Result { - // todo!(linux): Do we need to use CosmicText's Font APIs? Can we consolidate this to use font_kit? + // todo(linux): Do we need to use CosmicText's Font APIs? Can we consolidate this to use font_kit? let lock = self.0.upgradable_read(); if let Some(font_id) = lock.font_selections.get(font) { Ok(*font_id) @@ -127,13 +127,13 @@ impl PlatformTextSystem for LinuxTextSystem { FontMetrics { units_per_em: metrics.units_per_em as u32, ascent: metrics.ascent, - descent: -metrics.descent, // todo!(linux) confirm this is correct + descent: -metrics.descent, // todo(linux) confirm this is correct line_gap: metrics.leading, underline_position: metrics.underline_offset, underline_thickness: metrics.stroke_size, cap_height: metrics.cap_height, x_height: metrics.x_height, - // todo!(linux): Compute this correctly + // todo(linux): Compute this correctly bounding_box: Bounds { origin: point(0.0, 0.0), size: size(metrics.max_width, metrics.ascent + metrics.descent), @@ -146,7 +146,7 @@ impl PlatformTextSystem for LinuxTextSystem { let metrics = lock.fonts[font_id.0].as_swash().metrics(&[]); let glyph_metrics = lock.fonts[font_id.0].as_swash().glyph_metrics(&[]); let glyph_id = glyph_id.0 as u16; - // todo!(linux): Compute this correctly + // todo(linux): Compute this correctly // see https://github.com/servo/font-kit/blob/master/src/loaders/freetype.rs#L614-L620 Ok(Bounds { origin: point(0.0, 0.0), @@ -181,7 +181,7 @@ impl PlatformTextSystem for LinuxTextSystem { self.0.write().layout_line(text, font_size, runs) } - // todo!(linux) Confirm that this has been superseded by the LineWrapper + // todo(linux) Confirm that this has been superseded by the LineWrapper fn wrap_line( &self, text: &str, @@ -256,7 +256,7 @@ impl LinuxTextSystemState { } fn is_emoji(&self, font_id: FontId) -> bool { - // todo!(linux): implement this correctly + // todo(linux): implement this correctly self.postscript_names_by_font_id .get(&font_id) .map_or(false, |postscript_name| { @@ -264,7 +264,7 @@ impl LinuxTextSystemState { }) } - // todo!(linux) both raster functions have problems because I am not sure this is the correct mapping from cosmic text to gpui system + // todo(linux) both raster functions have problems because I am not sure this is the correct mapping from cosmic text to gpui system fn raster_bounds(&mut self, params: &RenderGlyphParams) -> Result> { let font = &self.fonts[params.font_id.0]; let font_system = &mut self.font_system; @@ -297,7 +297,7 @@ impl LinuxTextSystemState { if glyph_bounds.size.width.0 == 0 || glyph_bounds.size.height.0 == 0 { Err(anyhow!("glyph bounds are empty")) } else { - // todo!(linux) handle subpixel variants + // todo(linux) handle subpixel variants let bitmap_size = glyph_bounds.size; let font = &self.fonts[params.font_id.0]; let font_system = &mut self.font_system; @@ -320,13 +320,13 @@ impl LinuxTextSystemState { } } - // todo!(linux) This is all a quick first pass, maybe we should be using cosmic_text::Buffer + // todo(linux) This is all a quick first pass, maybe we should be using cosmic_text::Buffer #[profiling::function] fn layout_line(&mut self, text: &str, font_size: Pixels, font_runs: &[FontRun]) -> LineLayout { let mut attrs_list = AttrsList::new(Attrs::new()); let mut offs = 0; for run in font_runs { - // todo!(linux) We need to check we are doing utf properly + // todo(linux) We need to check we are doing utf properly let font = &self.fonts[run.font_id.0]; let font = self.font_system.db().face(font.id()).unwrap(); attrs_list.add_span( @@ -343,11 +343,11 @@ impl LinuxTextSystemState { let layout = line.layout( &mut self.font_system, font_size.0, - f32::MAX, // todo!(linux) we don't have a width cause this should technically not be wrapped I believe + f32::MAX, // todo(linux) we don't have a width cause this should technically not be wrapped I believe cosmic_text::Wrap::None, ); let mut runs = Vec::new(); - // todo!(linux) what I think can happen is layout returns possibly multiple lines which means we should be probably working with it higher up in the text rendering + // todo(linux) what I think can happen is layout returns possibly multiple lines which means we should be probably working with it higher up in the text rendering let layout = layout.first().unwrap(); for glyph in &layout.glyphs { let font_id = glyph.font_id; @@ -358,7 +358,7 @@ impl LinuxTextSystemState { .unwrap(), ); let mut glyphs = SmallVec::new(); - // todo!(linux) this is definitely wrong, each glyph in glyphs from cosmic-text is a cluster with one glyph, ShapedRun takes a run of glyphs with the same font and direction + // todo(linux) this is definitely wrong, each glyph in glyphs from cosmic-text is a cluster with one glyph, ShapedRun takes a run of glyphs with the same font and direction glyphs.push(ShapedGlyph { id: GlyphId(glyph.glyph_id as u32), position: point((glyph.x).into(), glyph.y.into()), diff --git a/crates/gpui/src/platform/linux/wayland.rs b/crates/gpui/src/platform/linux/wayland.rs index 63e106cc6d..79f3aa223c 100644 --- a/crates/gpui/src/platform/linux/wayland.rs +++ b/crates/gpui/src/platform/linux/wayland.rs @@ -1,4 +1,4 @@ -//todo!(linux): remove this once the relevant functionality has been implemented +// todo(linux): remove this once the relevant functionality has been implemented #![allow(unused_variables)] pub(crate) use client::*; diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs index 55e5670110..957515c8ff 100644 --- a/crates/gpui/src/platform/linux/wayland/client.rs +++ b/crates/gpui/src/platform/linux/wayland/client.rs @@ -183,7 +183,7 @@ impl Client for WaylandClient { let decoration = decoration_manager.get_toplevel_decoration(&toplevel, &self.qh, xdg_surface.id()); - // todo!(linux) - options.titlebar is lacking information required for wayland. + // todo(linux) - options.titlebar is lacking information required for wayland. // Especially, whether a titlebar is wanted in itself. // // Removing the titlebar also removes the entire window frame (ie. the ability to @@ -482,7 +482,7 @@ impl Dispatch for WaylandClientState { wl_keyboard::KeyState::Pressed => { let input = PlatformInput::KeyDown(KeyDownEvent { keystroke: Keystroke::from_xkb(keymap_state, state.modifiers, keycode), - is_held: false, // todo!(linux) + is_held: false, // todo(linux) }); focused_window.handle_input(input.clone()); diff --git a/crates/gpui/src/platform/linux/wayland/display.rs b/crates/gpui/src/platform/linux/wayland/display.rs index 0d8b6dbd3f..0b76a4b7dc 100644 --- a/crates/gpui/src/platform/linux/wayland/display.rs +++ b/crates/gpui/src/platform/linux/wayland/display.rs @@ -8,17 +8,17 @@ use crate::{Bounds, DisplayId, GlobalPixels, PlatformDisplay, Size}; pub(crate) struct WaylandDisplay {} impl PlatformDisplay for WaylandDisplay { - // todo!(linux) + // todo(linux) fn id(&self) -> DisplayId { DisplayId(123) // return some fake data so it doesn't panic } - // todo!(linux) + // todo(linux) fn uuid(&self) -> anyhow::Result { Ok(Uuid::from_bytes([0; 16])) // return some fake data so it doesn't panic } - // todo!(linux) + // todo(linux) fn bounds(&self) -> Bounds { Bounds { origin: Default::default(), diff --git a/crates/gpui/src/platform/linux/wayland/window.rs b/crates/gpui/src/platform/linux/wayland/window.rs index 8ad1b81cd6..11e1743b03 100644 --- a/crates/gpui/src/platform/linux/wayland/window.rs +++ b/crates/gpui/src/platform/linux/wayland/window.rs @@ -132,7 +132,7 @@ impl WaylandWindowState { size: Size { width: 500, height: 500, - }, //todo!(implement) + }, // todo(implement) }, WindowBounds::Fixed(bounds) => bounds.map(|p| p.0 as i32), }; @@ -200,7 +200,7 @@ impl WaylandWindowState { pub fn set_decoration_state(&self, state: WaylandDecorationState) { self.inner.borrow_mut().decoration_state = state; log::trace!("Window decorations are now handled by {:?}", state); - // todo!(linux) - Handle this properly + // todo(linux) - Handle this properly } pub fn close(&self) { @@ -250,7 +250,7 @@ impl HasDisplayHandle for WaylandWindow { } impl PlatformWindow for WaylandWindow { - //todo!(linux) + // todo(linux) fn bounds(&self) -> WindowBounds { WindowBounds::Maximized } @@ -267,32 +267,32 @@ impl PlatformWindow for WaylandWindow { self.0.inner.borrow_mut().scale } - //todo!(linux) + // todo(linux) fn titlebar_height(&self) -> Pixels { unimplemented!() } - // todo!(linux) + // todo(linux) fn appearance(&self) -> WindowAppearance { WindowAppearance::Light } - // todo!(linux) + // todo(linux) fn display(&self) -> Rc { Rc::new(WaylandDisplay {}) } - // todo!(linux) + // todo(linux) fn mouse_position(&self) -> Point { Point::default() } - //todo!(linux) + // todo(linux) fn modifiers(&self) -> Modifiers { crate::Modifiers::default() } - //todo!(linux) + // todo(linux) fn as_any_mut(&mut self) -> &mut dyn Any { unimplemented!() } @@ -305,7 +305,7 @@ impl PlatformWindow for WaylandWindow { self.0.inner.borrow_mut().input_handler.take() } - //todo!(linux) + // todo(linux) fn prompt( &self, level: PromptLevel, @@ -317,7 +317,7 @@ impl PlatformWindow for WaylandWindow { } fn activate(&self) { - //todo!(linux) + // todo(linux) } fn set_title(&mut self, title: &str) { @@ -325,23 +325,23 @@ impl PlatformWindow for WaylandWindow { } fn set_edited(&mut self, edited: bool) { - //todo!(linux) + // todo(linux) } fn show_character_palette(&self) { - //todo!(linux) + // todo(linux) } fn minimize(&self) { - //todo!(linux) + // todo(linux) } fn zoom(&self) { - //todo!(linux) + // todo(linux) } fn toggle_full_screen(&self) { - //todo!(linux) + // todo(linux) } fn on_request_frame(&self, callback: Box) { @@ -361,7 +361,7 @@ impl PlatformWindow for WaylandWindow { } fn on_fullscreen(&self, callback: Box) { - //todo!(linux) + // todo(linux) } fn on_moved(&self, callback: Box) { @@ -377,10 +377,10 @@ impl PlatformWindow for WaylandWindow { } fn on_appearance_changed(&self, callback: Box) { - //todo!(linux) + // todo(linux) } - // todo!(linux) + // todo(linux) fn is_topmost_for_position(&self, position: Point) -> bool { false } diff --git a/crates/gpui/src/platform/linux/x11/window.rs b/crates/gpui/src/platform/linux/x11/window.rs index cfacca9d2b..171c9ca3e1 100644 --- a/crates/gpui/src/platform/linux/x11/window.rs +++ b/crates/gpui/src/platform/linux/x11/window.rs @@ -1,4 +1,4 @@ -//todo!(linux): remove +// todo(linux): remove #![allow(unused)] use crate::{ @@ -99,7 +99,7 @@ pub(crate) struct X11WindowState { #[derive(Clone)] pub(crate) struct X11Window(pub(crate) Rc); -//todo!(linux): Remove other RawWindowHandle implementation +// todo(linux): Remove other RawWindowHandle implementation unsafe impl blade_rwh::HasRawWindowHandle for RawWindow { fn raw_window_handle(&self) -> blade_rwh::RawWindowHandle { let mut wh = blade_rwh::XcbWindowHandle::empty(); @@ -301,7 +301,7 @@ impl X11WindowState { let mut inner = self.inner.borrow_mut(); let old_bounds = mem::replace(&mut inner.bounds, bounds); do_move = old_bounds.origin != bounds.origin; - //todo!(linux): use normal GPUI types here, refactor out the double + // todo(linux): use normal GPUI types here, refactor out the double // viewport check and extra casts ( ) let gpu_size = query_render_extent(&self.xcb_connection, self.x_window); if inner.renderer.viewport_size() != gpu_size { @@ -377,12 +377,12 @@ impl PlatformWindow for X11Window { self.0.inner.borrow_mut().scale_factor } - //todo!(linux) + // todo(linux) fn titlebar_height(&self) -> Pixels { unimplemented!() } - //todo!(linux) + // todo(linux) fn appearance(&self) -> WindowAppearance { WindowAppearance::Light } @@ -402,7 +402,7 @@ impl PlatformWindow for X11Window { ) } - //todo!(linux) + // todo(linux) fn modifiers(&self) -> Modifiers { Modifiers::default() } @@ -419,7 +419,7 @@ impl PlatformWindow for X11Window { self.0.inner.borrow_mut().input_handler.take() } - //todo!(linux) + // todo(linux) fn prompt( &self, _level: PromptLevel, @@ -447,10 +447,10 @@ impl PlatformWindow for X11Window { }); } - //todo!(linux) + // todo(linux) fn set_edited(&mut self, edited: bool) {} - //todo!(linux), this corresponds to `orderFrontCharacterPalette` on macOS, + // todo(linux), this corresponds to `orderFrontCharacterPalette` on macOS, // but it looks like the equivalent for Linux is GTK specific: // // https://docs.gtk.org/gtk3/signal.Entry.insert-emoji.html @@ -460,17 +460,17 @@ impl PlatformWindow for X11Window { unimplemented!() } - //todo!(linux) + // todo(linux) fn minimize(&self) { unimplemented!() } - //todo!(linux) + // todo(linux) fn zoom(&self) { unimplemented!() } - //todo!(linux) + // todo(linux) fn toggle_full_screen(&self) { unimplemented!() } @@ -511,7 +511,7 @@ impl PlatformWindow for X11Window { self.0.callbacks.borrow_mut().appearance_changed = Some(callback); } - //todo!(linux) + // todo(linux) fn is_topmost_for_position(&self, _position: Point) -> bool { unimplemented!() } diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs index 0c86e0627e..d97a4fc5ab 100644 --- a/crates/gpui/src/platform/test/platform.rs +++ b/crates/gpui/src/platform/test/platform.rs @@ -126,7 +126,7 @@ impl Platform for TestPlatform { #[cfg(target_os = "macos")] return Arc::new(crate::platform::mac::MacTextSystem::new()); - // todo!("windows") + // todo("windows") #[cfg(target_os = "windows")] unimplemented!() } diff --git a/crates/gpui/src/platform/test/text_system.rs b/crates/gpui/src/platform/test/text_system.rs index 0e877aabbd..ca3a9e3a33 100644 --- a/crates/gpui/src/platform/test/text_system.rs +++ b/crates/gpui/src/platform/test/text_system.rs @@ -7,7 +7,7 @@ use std::borrow::Cow; pub(crate) struct TestTextSystem {} -//todo!(linux) +// todo(linux) #[allow(unused)] impl PlatformTextSystem for TestTextSystem { fn add_fonts(&self, fonts: Vec>) -> Result<()> { diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs index 9597be71b5..1f7088ddfb 100644 --- a/crates/gpui/src/scene.rs +++ b/crates/gpui/src/scene.rs @@ -1,4 +1,4 @@ -// todo!("windows"): remove +// todo("windows"): remove #![cfg_attr(windows, allow(dead_code))] use crate::{ diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs index 71dccaf170..7e7b0d304a 100644 --- a/crates/gpui/src/style.rs +++ b/crates/gpui/src/style.rs @@ -208,7 +208,7 @@ impl Default for TextStyle { fn default() -> Self { TextStyle { color: black(), - // todo!(linux) make this configurable or choose better default + // todo(linux) make this configurable or choose better default font_family: if cfg!(target_os = "linux") { "FreeMono".into() } else { diff --git a/crates/install_cli/src/install_cli.rs b/crates/install_cli/src/install_cli.rs index 52a6656b90..61c5aa2fb9 100644 --- a/crates/install_cli/src/install_cli.rs +++ b/crates/install_cli/src/install_cli.rs @@ -18,7 +18,7 @@ pub async fn install_cli(cx: &AsyncAppContext) -> Result<()> { // If the symlink is not there or is outdated, first try replacing it // without escalating. smol::fs::remove_file(link_path).await.log_err(); - // todo!("windows") + // todo("windows") #[cfg(not(windows))] { if smol::fs::unix::symlink(&cli_path, link_path) diff --git a/crates/languages/src/csharp.rs b/crates/languages/src/csharp.rs index fabd0a1952..149aa754c7 100644 --- a/crates/languages/src/csharp.rs +++ b/crates/languages/src/csharp.rs @@ -81,7 +81,7 @@ impl super::LspAdapter for OmniSharpAdapter { archive.unpack(container_dir).await?; } - // todo!("windows") + // todo("windows") #[cfg(not(windows))] { fs::set_permissions( diff --git a/crates/languages/src/elixir.rs b/crates/languages/src/elixir.rs index 3ebf05caad..a70543f9d3 100644 --- a/crates/languages/src/elixir.rs +++ b/crates/languages/src/elixir.rs @@ -358,7 +358,7 @@ impl LspAdapter for NextLspAdapter { } futures::io::copy(response.body_mut(), &mut file).await?; - // todo!("windows") + // todo("windows") #[cfg(not(windows))] { fs::set_permissions( diff --git a/crates/languages/src/lua.rs b/crates/languages/src/lua.rs index eeb9b7639d..9a3447e678 100644 --- a/crates/languages/src/lua.rs +++ b/crates/languages/src/lua.rs @@ -83,7 +83,7 @@ impl super::LspAdapter for LuaLspAdapter { archive.unpack(container_dir).await?; } - // todo!("windows") + // todo("windows") #[cfg(not(windows))] { fs::set_permissions( diff --git a/crates/languages/src/purescript.rs b/crates/languages/src/purescript.rs index 0aea798041..931809a1ed 100644 --- a/crates/languages/src/purescript.rs +++ b/crates/languages/src/purescript.rs @@ -26,7 +26,7 @@ pub struct PurescriptLspAdapter { } impl PurescriptLspAdapter { - // todo!(linux): remove + // todo(linux): remove #[cfg_attr(target_os = "linux", allow(dead_code))] pub fn new(node: Arc) -> Self { Self { node } diff --git a/crates/languages/src/rust.rs b/crates/languages/src/rust.rs index e375e5e831..51914ee3fa 100644 --- a/crates/languages/src/rust.rs +++ b/crates/languages/src/rust.rs @@ -74,7 +74,7 @@ impl LspAdapter for RustLspAdapter { let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut())); let mut file = File::create(&destination_path).await?; futures::io::copy(decompressed_bytes, &mut file).await?; - // todo!("windows") + // todo("windows") #[cfg(not(windows))] { fs::set_permissions( diff --git a/crates/languages/src/toml.rs b/crates/languages/src/toml.rs index f008cbf197..c8eda04800 100644 --- a/crates/languages/src/toml.rs +++ b/crates/languages/src/toml.rs @@ -72,7 +72,7 @@ impl LspAdapter for TaploLspAdapter { futures::io::copy(decompressed_bytes, &mut file).await?; - // todo!("windows") + // todo("windows") #[cfg(not(windows))] { fs::set_permissions( diff --git a/crates/languages/src/zig.rs b/crates/languages/src/zig.rs index 3c830fba4c..d60d829a6f 100644 --- a/crates/languages/src/zig.rs +++ b/crates/languages/src/zig.rs @@ -86,7 +86,7 @@ impl LspAdapter for ZlsAdapter { archive.unpack(container_dir).await?; } - // todo!("windows") + // todo("windows") #[cfg(not(windows))] { fs::set_permissions( diff --git a/crates/live_kit_client/src/test.rs b/crates/live_kit_client/src/test.rs index 45f5ac1d1d..bfe36cece1 100644 --- a/crates/live_kit_client/src/test.rs +++ b/crates/live_kit_client/src/test.rs @@ -73,7 +73,7 @@ impl TestServer { } pub async fn create_room(&self, room: String) -> Result<()> { - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] self.executor.simulate_random_delay().await; let mut server_rooms = self.rooms.lock(); @@ -87,7 +87,7 @@ impl TestServer { async fn delete_room(&self, room: String) -> Result<()> { // TODO: clear state associated with all `Room`s. - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] self.executor.simulate_random_delay().await; let mut server_rooms = self.rooms.lock(); @@ -98,7 +98,7 @@ impl TestServer { } async fn join_room(&self, token: String, client_room: Arc) -> Result<()> { - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] self.executor.simulate_random_delay().await; @@ -147,7 +147,7 @@ impl TestServer { } async fn leave_room(&self, token: String) -> Result<()> { - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] self.executor.simulate_random_delay().await; let claims = live_kit_server::token::validate(&token, &self.secret_key)?; @@ -169,7 +169,7 @@ impl TestServer { async fn remove_participant(&self, room_name: String, identity: String) -> Result<()> { // TODO: clear state associated with the `Room`. - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] self.executor.simulate_random_delay().await; @@ -193,7 +193,7 @@ impl TestServer { identity: String, permission: proto::ParticipantPermission, ) -> Result<()> { - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] self.executor.simulate_random_delay().await; let mut server_rooms = self.rooms.lock(); @@ -205,7 +205,7 @@ impl TestServer { } pub async fn disconnect_client(&self, client_identity: String) { - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] self.executor.simulate_random_delay().await; let mut server_rooms = self.rooms.lock(); @@ -221,7 +221,7 @@ impl TestServer { token: String, local_track: LocalVideoTrack, ) -> Result { - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] self.executor.simulate_random_delay().await; let claims = live_kit_server::token::validate(&token, &self.secret_key)?; @@ -276,7 +276,7 @@ impl TestServer { token: String, _local_track: &LocalAudioTrack, ) -> Result { - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] self.executor.simulate_random_delay().await; @@ -559,7 +559,7 @@ impl Room { pub fn display_sources(self: &Arc) -> impl Future>> { let this = self.clone(); async move { - //todo!(linux): Remove this once the cross-platform LiveKit implementation is merged + // todo(linux): Remove this once the cross-platform LiveKit implementation is merged #[cfg(any(test, feature = "test-support"))] { let server = this.test_server(); diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs index c396bf6d1f..8dbf32a026 100644 --- a/crates/terminal/src/terminal.rs +++ b/crates/terminal/src/terminal.rs @@ -399,7 +399,7 @@ impl TerminalBuilder { #[cfg(unix)] let (fd, shell_pid) = (pty.file().as_raw_fd(), pty.child().id()); - // todo!("windows") + // todo("windows") #[cfg(windows)] let (fd, shell_pid) = (-1, 0); @@ -667,7 +667,7 @@ impl Terminal { fn update_process_info(&mut self) -> bool { #[cfg(unix)] let mut pid = unsafe { libc::tcgetpgrp(self.shell_fd as i32) }; - // todo!("windows") + // todo("windows") #[cfg(windows)] let mut pid = -1; if pid < 0 { diff --git a/crates/theme/src/one_themes.rs b/crates/theme/src/one_themes.rs index c461779bd1..73104b07c1 100644 --- a/crates/theme/src/one_themes.rs +++ b/crates/theme/src/one_themes.rs @@ -100,7 +100,7 @@ pub(crate) fn one_dark() -> Theme { editor_document_highlight_write_background: gpui::red(), terminal_background: bg, - // todo!("Use one colors for terminal") + // todo("Use one colors for terminal") terminal_foreground: crate::white().dark().step_12(), terminal_bright_foreground: crate::white().dark().step_11(), terminal_dim_foreground: crate::white().dark().step_10(), diff --git a/crates/theme/src/styles/colors.rs b/crates/theme/src/styles/colors.rs index 17910ef973..b4bdc8f342 100644 --- a/crates/theme/src/styles/colors.rs +++ b/crates/theme/src/styles/colors.rs @@ -130,7 +130,7 @@ pub struct ThemeColors { /// The border color of the scrollbar track. pub scrollbar_track_border: Hsla, // /// The opacity of the scrollbar status marks, like diagnostic states and git status. - // todo!() + // todo() // pub scrollbar_status_opacity: Hsla, // === diff --git a/crates/time_format/src/time_format.rs b/crates/time_format/src/time_format.rs index 0084802aae..1a6002b700 100644 --- a/crates/time_format/src/time_format.rs +++ b/crates/time_format/src/time_format.rs @@ -25,8 +25,8 @@ pub fn format_localized_timestamp( } #[cfg(not(target_os = "macos"))] { - //todo!(linux) respect user's date/time preferences - //todo!(windows) respect user's date/time preferences + // todo(linux) respect user's date/time preferences + // todo(windows) respect user's date/time preferences format_timestamp_fallback(reference, timestamp, timezone) } } diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index c509a8d0c1..27e3a8ef50 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -268,7 +268,7 @@ fn main() { initialize_workspace(app_state.clone(), cx); if stdout_is_a_pty() { - //todo!(linux): unblock this + // todo(linux): unblock this #[cfg(not(target_os = "linux"))] upload_panics_and_crashes(http.clone(), cx); cx.activate(true); @@ -997,7 +997,7 @@ fn load_user_themes_in_background(fs: Arc, cx: &mut AppContext) { .detach_and_log_err(cx); } -//todo!(linux): Port fsevents to linux +// todo(linux): Port fsevents to linux /// Spawns a background task to watch the themes directory for changes. #[cfg(target_os = "macos")] fn watch_themes(fs: Arc, cx: &mut AppContext) {