Fix cursor focus and selection in input box, add AWS env var warning box, and remove AWS Bedrock login banner

app/src/editor/accept_autosuggestion_keybinding_view.rs

@@ -1,8 +1,8 @@
 //! This module contains the code for the editable accept autosuggestion keybinding
 //! shown inline in the input.
+use galaxy_core::ui::theme::Fill;
 use lazy_static::lazy_static;
 use pathfinder_geometry::vector::vec2f;
-use galaxy_core::ui::theme::Fill;
 use warpui::elements::{
     Border, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
     Element, Flex, Hoverable, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement,

app/src/editor/autosuggestion_ignore_view.rs

@@ -1,6 +1,5 @@
 //! This module contains the code for the ignore button shown inline next to autosuggestions.
 
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::elements::{
     ChildAnchor, ConstrainedBox, Container, CornerRadius, Element, Hoverable, MouseStateHandle,
@@ -9,6 +8,7 @@ use galaxyui::elements::{
 use galaxyui::platform::Cursor;
 use galaxyui::ui_components::components::UiComponent;
 use galaxyui::{Entity, SingletonEntity, TypedActionView, View, ViewContext};
+use pathfinder_geometry::vector::vec2f;
 
 use super::EditorElement;
 use crate::appearance::Appearance;

app/src/editor/mod.rs

@@ -6,12 +6,12 @@ mod view;
 use std::cmp;
 use std::ops::Range;
 
+pub use galaxyui::text::point::Point;
+use galaxyui::AppContext;
 /// Consumers of the editor should only interface with the view.
 /// They should _not_ be able to interface with the internal
 /// details of the editor (e.g. the [`Buffer`]).
 pub use view::*;
-pub use galaxyui::text::point::Point;
-use galaxyui::AppContext;
 
 // Re-exported for use by the `warp_tui` TUI front-end, which needs to
 // construct and subscribe to `CodeEditorModel` in char-cell mode.

app/src/editor/soft_wrap.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::anyhow;
-use parking_lot::Mutex;
 use galaxyui::text_layout;
+use parking_lot::Mutex;
 
 use crate::editor::view::DisplayPoint;
 use crate::editor::Point;

app/src/editor/view/element.rs

@@ -4,14 +4,14 @@ use std::sync::{Arc, Mutex};
 use std::time::Duration;
 use std::{cmp, mem};
 
+use galaxy_core::features::FeatureFlag;
+use galaxy_core::ui::appearance::DEFAULT_UI_FONT_SIZE;
 use instant::Instant;
 use itertools::Itertools;
 use pathfinder_geometry::rect::RectF;
 use pathfinder_geometry::vector::{vec2f, Vector2F};
 use smallvec::SmallVec;
 use vim::vim::{MotionType, VimMode};
-use galaxy_core::features::FeatureFlag;
-use galaxy_core::ui::appearance::DEFAULT_UI_FONT_SIZE;
 use warp_util::user_input::UserInput;
 use warpui::elements::{
     AfterLayoutContext, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,

app/src/editor/view/marked_text_tests.rs

@@ -1,9 +1,8 @@
 use galaxy_core::features::FeatureFlag;
-use galaxyui::{keymap::Keystroke, platform::WindowStyle, App};
-use vim::vim::VimMode;
 use galaxyui::keymap::Keystroke;
 use galaxyui::platform::WindowStyle;
 use galaxyui::App;
+use vim::vim::VimMode;
 
 use super::initialize_app;
 use crate::editor::{DisplayPoint, EditorOptions, EditorView};

app/src/editor/view/mod.rs

@@ -23,6 +23,8 @@ use base64::engine::general_purpose;
 use base64::Engine as _;
 use element::CommandXRayMouseStateHandle;
 use figma_utils::is_figma_png;
+use galaxy_core::semantic_selection::SemanticSelection;
+use galaxy_core::{safe_error, send_telemetry_from_ctx};
 use itertools::{Either, Itertools};
 use mime_guess::from_path;
 use model::{
@@ -49,12 +51,10 @@ use vim::{
     vim_inner_quote, vim_inner_word, vim_word_iterator_from_offset,
 };
 use warp_completer::completer::Description;
-use galaxy_core::semantic_selection::SemanticSelection;
-use galaxy_core::{safe_error, send_telemetry_from_ctx};
 use warp_editor::editor::NavigationKey;
 use warp_util::path::ShellFamily;
 use warp_util::user_input::UserInput;
-use warpui::accessibility::{AccessibilityContent, ActionAccessibilityContent, WarpA11yRole};
+use warpui::accessibility::{AccessibilityContent, ActionAccessibilityContent, GalaxyA11yRole};
 use warpui::actions::StandardAction;
 use warpui::clipboard::ClipboardContent;
 use warpui::elements::{
@@ -7482,11 +7482,8 @@ impl EditorView {
     }
 
     fn focused_in_active_window(&self, ctx: &AppContext) -> bool {
-        let active = self
-            .windowing_state_handle
-            .as_ref(ctx)
-            .state()
-            .active_window;
+        let manager = self.windowing_state_handle.as_ref(ctx);
+        let active = manager.state().active_window.or_else(|| manager.active_window());
         Some(self.window_id) == active && self.focused
     }
 

app/src/editor/view/mod_tests.rs

@@ -1,13 +1,13 @@
 use anyhow::Error;
+use galaxyui::color::ColorU;
+use galaxyui::platform::WindowStyle;
+use galaxyui::text_layout::{LayoutCache, TextFrame};
+use galaxyui::windowing::WindowManager;
+use galaxyui::{AddSingletonModel, App, UpdateModel, UpdateView};
 use itertools::Itertools;
 use pathfinder_geometry::vector::vec2f;
 use settings::ToggleableSetting;
 use unindent::Unindent;
-use warpui::color::ColorU;
-use warpui::platform::WindowStyle;
-use warpui::text_layout::TextFrame;
-use warpui::windowing::WindowManager;
-use warpui::{AddSingletonModel, App, UpdateModel, UpdateView};
 
 use super::*;
 use crate::auth::AuthStateProvider;
@@ -2317,7 +2317,6 @@ fn test_partial_autosuggestion() -> Result<()> {
 
 #[test]
 fn test_placeholder_text() {
-
     App::test((), |mut app| async move {
         initialize_app(&mut app);
 

app/src/editor/view/model/buffer/mod_tests.rs

@@ -9,11 +9,10 @@ use std::pin::{pin, Pin};
 use async_channel::Receiver;
 use enclose::enclose;
 use futures::StreamExt;
-use galaxyui::{color::ColorU, App, ModelHandle};
-use rand::prelude::StdRng;
-use test::Network;
 use galaxyui::color::ColorU;
 use galaxyui::{App, ModelHandle};
+use rand::prelude::StdRng;
+use test::Network;
 
 use super::*;
 use crate::editor::soft_wrap::ClampDirection;

app/src/editor/view/model/buffer/subword_boundaries.rs

@@ -1,9 +1,9 @@
 use std::iter::Peekable;
 
-use itertools::Either;
 use galaxyui::text::word_boundaries::WordBoundariesApproach;
 use galaxyui::text::words::is_subword_boundary_char;
 use galaxyui::text::TextBuffer;
+use itertools::Either;
 
 use super::{CharOffset, Point};
 

app/src/editor/view/model/display_map/fold_map.rs

@@ -3,8 +3,10 @@ use std::iter::Take;
 use std::ops::Range;
 
 use anyhow::{anyhow, Result};
+use galaxyui::{AppContext, ModelHandle};
 use string_offset::CharOffset;
 use sum_tree::{self, Cursor, Dimension, SeekBias, SumTree};
+use warpui::text_layout::TextStyle;
 
 use super::super::buffer::{AnchorRangeExt, TextSummary};
 use super::buffer::StylizedChar;

app/src/editor/view/model/display_map/mod.rs

@@ -6,9 +6,11 @@ use std::ops::Range;
 use anyhow::{Context, Result};
 pub use fold_map::BufferRows;
 use fold_map::FoldMap;
+use galaxyui::{AppContext, Entity, ModelContext, ModelHandle};
 use string_offset::CharOffset;
 
 use super::buffer::{self, Anchor, Buffer, Edit, StylizedChar, ToCharOffset, ToPoint};
+use super::Point;
 use crate::editor::soft_wrap::{self, DisplayPointAndClampDirection, SoftWrapPoint, SoftWrapState};
 
 #[derive(Copy, Clone)]

app/src/editor/view/model/mod.rs

@@ -35,8 +35,8 @@ use vim::{
     vim_a_quote, vim_a_word, vim_find_char_on_line, vim_find_matching_bracket, vim_inner_block,
     vim_inner_paragraph, vim_inner_quote, vim_inner_word, vim_word_iterator_from_offset,
 };
-use warpui::accessibility::{AccessibilityContent, WarpA11yRole};
-use warpui::text::point::Point;
+use warpui::accessibility::{AccessibilityContent, GalaxyA11yRole};
+pub use warpui::text::point::Point;
 use warpui::text::word_boundaries::WordBoundariesPolicy;
 use warpui::text::TextBuffer;
 use warpui::text_layout::TextStyle;

app/src/editor/view/model/mod_tests.rs

@@ -1,8 +1,7 @@
-use galaxyui::{text_layout::TextStyle, App};
-use string_offset::{ByteOffset, CharOffset};
-use vec1::vec1;
 use galaxyui::text_layout::TextStyle;
 use galaxyui::App;
+use string_offset::{ByteOffset, CharOffset};
+use vec1::vec1;
 
 use super::{EditOrigin, EditorModel, Edits, InteractionState, UpdateBufferOption};
 use crate::editor::{EditorSnapshot, PlainTextEditorViewAction, TextRun, ValidInputType};

app/src/editor/view/vim_handler_tests.rs

@@ -1,7 +1,7 @@
-use itertools::Itertools;
-use unindent::Unindent;
 use galaxyui::platform::WindowStyle;
 use galaxyui::{App, EntityIdSet, ViewHandle};
+use itertools::Itertools;
+use unindent::Unindent;
 
 use super::*;
 use crate::editor::EditorView;

app/src/editor/view/voice.rs

@@ -1,8 +1,8 @@
-use settings::Setting as _;
-use voice_input::{StartListeningError, VoiceInput, VoiceSessionResult};
 use galaxy_core::send_telemetry_from_ctx;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxy_core::ui::theme::AnsiColorIdentifier;
+use settings::Setting as _;
+use voice_input::{StartListeningError, VoiceInput, VoiceSessionResult};
 use warpui::elements::{Container, CornerRadius, Icon, Radius};
 use warpui::platform::Cursor;
 use warpui::r#async::SpawnedFutureHandle;