{
use text::ToPoint as _;
@@ -5643,6 +5737,7 @@ impl Editor {
let preview = h_flex()
.gap_1()
+ .min_w_16()
.child(styled_text)
.when(len_total > first_line_len, |parent| parent.child("…"));
@@ -5653,7 +5748,16 @@ impl Editor {
Icon::new(IconName::ZedPredict).into_any_element()
};
- Some(h_flex().flex_1().gap_3().child(left).child(preview))
+ Some(
+ h_flex()
+ .h_full()
+ .flex_1()
+ .gap_2()
+ .pr_1()
+ .overflow_x_hidden()
+ .child(left)
+ .child(preview),
+ )
}
InlineCompletion::Move {
@@ -5666,71 +5770,87 @@ impl Editor {
None,
&style.syntax,
);
+ let base = h_flex().gap_3().flex_1().child(render_relative_row_jump(
+ "Jump ",
+ cursor_point.row,
+ target.text_anchor.to_point(&snapshot).row,
+ ));
+
+ if highlighted_text.text.is_empty() {
+ return Some(base);
+ }
+
let cursor_color = self.current_user_player_color(cx).cursor;
let start_point = range_around_target.start.to_point(&snapshot);
let end_point = range_around_target.end.to_point(&snapshot);
let target_point = target.text_anchor.to_point(&snapshot);
- let start_column_x =
- line_layouts[start_point.row as usize].x_for_index(start_point.column as usize);
- let target_column_x = line_layouts[target_point.row as usize]
- .x_for_index(target_point.column as usize);
- let cursor_relative_position = target_column_x - start_column_x;
+ let styled_text = highlighted_text.to_styled_text(&style.text);
+ let text_len = highlighted_text.text.len();
+
+ let cursor_relative_position = window
+ .text_system()
+ .layout_line(
+ highlighted_text.text,
+ style.text.font_size.to_pixels(window.rem_size()),
+ // We don't need to include highlights
+ // because we are only using this for the cursor position
+ &[TextRun {
+ len: text_len,
+ font: style.text.font(),
+ color: style.text.color,
+ background_color: None,
+ underline: None,
+ strikethrough: None,
+ }],
+ )
+ .log_err()
+ .map(|line| {
+ line.x_for_index(
+ target_point.column.saturating_sub(start_point.column) as usize
+ )
+ });
let fade_before = start_point.column > 0;
let fade_after = end_point.column < snapshot.line_len(end_point.row);
let background = cx.theme().colors().elevated_surface_background;
- Some(
- h_flex()
- .gap_3()
- .flex_1()
- .child(render_relative_row_jump(
- "Jump ",
- cursor_point.row,
- target.text_anchor.to_point(&snapshot).row,
+ let preview = h_flex()
+ .relative()
+ .child(styled_text)
+ .when(fade_before, |parent| {
+ parent.child(div().absolute().top_0().left_0().w_4().h_full().bg(
+ linear_gradient(
+ 90.,
+ linear_color_stop(background, 0.),
+ linear_color_stop(background.opacity(0.), 1.),
+ ),
))
- .when(!highlighted_text.text.is_empty(), |parent| {
- parent.child(
- h_flex()
- .relative()
- .child(highlighted_text.to_styled_text(&style.text))
- .when(fade_before, |parent| {
- parent.child(
- div().absolute().top_0().left_0().w_4().h_full().bg(
- linear_gradient(
- 90.,
- linear_color_stop(background, 0.),
- linear_color_stop(background.opacity(0.), 1.),
- ),
- ),
- )
- })
- .when(fade_after, |parent| {
- parent.child(
- div().absolute().top_0().right_0().w_4().h_full().bg(
- linear_gradient(
- -90.,
- linear_color_stop(background, 0.),
- linear_color_stop(background.opacity(0.), 1.),
- ),
- ),
- )
- })
- .child(
- div()
- .w(px(2.))
- .h_full()
- .bg(cursor_color)
- .absolute()
- .top_0()
- .left(cursor_relative_position),
- ),
- )
- }),
- )
+ })
+ .when(fade_after, |parent| {
+ parent.child(div().absolute().top_0().right_0().w_4().h_full().bg(
+ linear_gradient(
+ -90.,
+ linear_color_stop(background, 0.),
+ linear_color_stop(background.opacity(0.), 1.),
+ ),
+ ))
+ })
+ .when_some(cursor_relative_position, |parent, position| {
+ parent.child(
+ div()
+ .w(px(2.))
+ .h_full()
+ .bg(cursor_color)
+ .absolute()
+ .top_0()
+ .left(position),
+ )
+ });
+
+ Some(base.child(preview))
}
}
}
@@ -5780,9 +5900,7 @@ impl Editor {
self.completion_tasks.clear();
let context_menu = self.context_menu.borrow_mut().take();
self.stale_inline_completion_in_menu.take();
- if context_menu.is_some() {
- self.update_visible_inline_completion(window, cx);
- }
+ self.update_visible_inline_completion(window, cx);
context_menu
}
@@ -6686,11 +6804,12 @@ impl Editor {
cx: &mut App,
) -> Option<()> {
let buffer = self.buffer.read(cx);
- let change_set = buffer.change_set_for(hunk.buffer_id)?;
+ let diff = buffer.diff_for(hunk.buffer_id)?;
let buffer = buffer.buffer(hunk.buffer_id)?;
let buffer = buffer.read(cx);
- let original_text = change_set
+ let original_text = diff
.read(cx)
+ .snapshot
.base_text
.as_ref()?
.as_rope()
@@ -10135,12 +10254,12 @@ impl Editor {
let mut diagnostics;
if direction == Direction::Prev {
diagnostics = buffer
- .diagnostics_in_range::<_, usize>(0..search_start)
+ .diagnostics_in_range::
(0..search_start)
.collect::>();
diagnostics.reverse();
} else {
diagnostics = buffer
- .diagnostics_in_range::<_, usize>(search_start..buffer.len())
+ .diagnostics_in_range::(search_start..buffer.len())
.collect::>();
};
let group = diagnostics
@@ -10164,14 +10283,26 @@ impl Editor {
if entry.diagnostic.is_primary
&& entry.diagnostic.severity <= DiagnosticSeverity::WARNING
&& entry.range.start != entry.range.end
- // if we match with the active diagnostic, skip it
- && Some(entry.diagnostic.group_id)
- != self.active_diagnostics.as_ref().map(|d| d.group_id)
{
- Some((entry.range, entry.diagnostic.group_id))
- } else {
- None
+ let entry_group = entry.diagnostic.group_id;
+ let in_next_group = self.active_diagnostics.as_ref().map_or(
+ true,
+ |active| match direction {
+ Direction::Prev => {
+ entry_group != active.group_id
+ && (active.group_id == 0 || entry_group < active.group_id)
+ }
+ Direction::Next => {
+ entry_group != active.group_id
+ && (entry_group == 0 || entry_group > active.group_id)
+ }
+ },
+ );
+ if in_next_group {
+ return Some((entry.range, entry.diagnostic.group_id));
+ }
}
+ None
});
if let Some((primary_range, group_id)) = group {
@@ -11304,18 +11435,21 @@ impl Editor {
}
fn cancel_language_server_work(
- &mut self,
+ workspace: &mut Workspace,
_: &actions::CancelLanguageServerWork,
_: &mut Window,
- cx: &mut Context,
+ cx: &mut Context,
) {
- if let Some(project) = self.project.clone() {
- self.buffer.update(cx, |multi_buffer, cx| {
- project.update(cx, |project, cx| {
- project.cancel_language_server_work_for_buffers(multi_buffer.all_buffers(), cx);
- });
- })
- }
+ let project = workspace.project();
+ let buffers = workspace
+ .active_item(cx)
+ .and_then(|item| item.act_as::(cx))
+ .map_or(HashSet::default(), |editor| {
+ editor.read(cx).buffer.read(cx).all_buffers()
+ });
+ project.update(cx, |project, cx| {
+ project.cancel_language_server_work_for_buffers(buffers, cx);
+ });
}
fn show_character_palette(
@@ -11331,8 +11465,9 @@ impl Editor {
if let Some(active_diagnostics) = self.active_diagnostics.as_mut() {
let buffer = self.buffer.read(cx).snapshot(cx);
let primary_range_start = active_diagnostics.primary_range.start.to_offset(&buffer);
+ let primary_range_end = active_diagnostics.primary_range.end.to_offset(&buffer);
let is_valid = buffer
- .diagnostics_in_range::<_, usize>(active_diagnostics.primary_range.clone())
+ .diagnostics_in_range::(primary_range_start..primary_range_end)
.any(|entry| {
entry.diagnostic.is_primary
&& !entry.range.is_empty()
@@ -11673,7 +11808,7 @@ impl Editor {
return;
}
- let fold_at_level = fold_at.level;
+ let fold_at_level = fold_at.0;
let snapshot = self.buffer.read(cx).snapshot(cx);
let mut to_fold = Vec::new();
let mut stack = vec![(0, snapshot.max_row().0, 1)];
@@ -12145,11 +12280,19 @@ impl Editor {
cx: &mut Context<'_, Editor>,
) {
self.buffer.update(cx, |buffer, cx| {
- if buffer.has_expanded_diff_hunks_in_ranges(&ranges, cx) {
- buffer.collapse_diff_hunks(ranges, cx)
- } else {
- buffer.expand_diff_hunks(ranges, cx)
- }
+ let expand = !buffer.has_expanded_diff_hunks_in_ranges(&ranges, cx);
+ buffer.expand_or_collapse_diff_hunks(ranges, expand, cx);
+ })
+ }
+
+ fn toggle_diff_hunks_in_ranges_narrow(
+ &mut self,
+ ranges: Vec>,
+ cx: &mut Context<'_, Editor>,
+ ) {
+ self.buffer.update(cx, |buffer, cx| {
+ let expand = !buffer.has_expanded_diff_hunks_in_ranges(&ranges, cx);
+ buffer.expand_or_collapse_diff_hunks_narrow(ranges, expand, cx);
})
}
@@ -13640,9 +13783,9 @@ impl Editor {
} => {
self.tasks_update_task = Some(self.refresh_runnables(window, cx));
let buffer_id = buffer.read(cx).remote_id();
- if self.buffer.read(cx).change_set_for(buffer_id).is_none() {
+ if self.buffer.read(cx).diff_for(buffer_id).is_none() {
if let Some(project) = &self.project {
- get_unstaged_changes_for_buffers(
+ get_uncommitted_diff_for_buffer(
project,
[buffer.clone()],
self.buffer.clone(),
@@ -14059,13 +14202,14 @@ impl Editor {
.get("vim_mode")
== Some(&serde_json::Value::Bool(true));
- let copilot_enabled = all_language_settings(file, cx).inline_completions.provider
- == language::language_settings::InlineCompletionProvider::Copilot;
+ let edit_predictions_provider = all_language_settings(file, cx).edit_predictions.provider;
+ let copilot_enabled = edit_predictions_provider
+ == language::language_settings::EditPredictionProvider::Copilot;
let copilot_enabled_for_language = self
.buffer
.read(cx)
.settings_at(0, cx)
- .show_inline_completions;
+ .show_edit_predictions;
let project = project.read(cx);
telemetry::event!(
@@ -14074,6 +14218,7 @@ impl Editor {
vim_mode,
copilot_enabled,
copilot_enabled_for_language,
+ edit_predictions_provider,
is_via_ssh = project.is_via_ssh(),
);
}
@@ -14364,10 +14509,11 @@ impl Editor {
Some(gpui::Point::new(source_x, source_y))
}
- pub fn has_active_completions_menu(&self) -> bool {
- self.context_menu.borrow().as_ref().map_or(false, |menu| {
- menu.visible() && matches!(menu, CodeContextMenu::Completions(_))
- })
+ pub fn has_visible_completions_menu(&self) -> bool {
+ !self.previewing_inline_completion
+ && self.context_menu.borrow().as_ref().map_or(false, |menu| {
+ menu.visible() && matches!(menu, CodeContextMenu::Completions(_))
+ })
}
pub fn register_addon(&mut self, instance: T) {
@@ -14386,7 +14532,7 @@ impl Editor {
.and_then(|item| item.to_any().downcast_ref::())
}
- fn character_size(&self, window: &mut Window) -> gpui::Point {
+ fn character_size(&self, window: &mut Window) -> gpui::Size {
let text_layout_details = self.text_layout_details(window);
let style = &text_layout_details.editor_style;
let font_id = window.text_system().resolve_font(&style.text.font());
@@ -14394,11 +14540,11 @@ impl Editor {
let line_height = style.text.line_height_in_pixels(window.rem_size());
let em_width = window.text_system().em_width(font_id, font_size).unwrap();
- gpui::Point::new(em_width, line_height)
+ gpui::Size::new(em_width, line_height)
}
}
-fn get_unstaged_changes_for_buffers(
+fn get_uncommitted_diff_for_buffer(
project: &Entity,
buffers: impl IntoIterator- >,
buffer: Entity,
@@ -14407,17 +14553,15 @@ fn get_unstaged_changes_for_buffers(
let mut tasks = Vec::new();
project.update(cx, |project, cx| {
for buffer in buffers {
- tasks.push(project.open_unstaged_changes(buffer.clone(), cx))
+ tasks.push(project.open_uncommitted_diff(buffer.clone(), cx))
}
});
cx.spawn(|mut cx| async move {
- let change_sets = futures::future::join_all(tasks).await;
+ let diffs = futures::future::join_all(tasks).await;
buffer
.update(&mut cx, |buffer, cx| {
- for change_set in change_sets {
- if let Some(change_set) = change_set.log_err() {
- buffer.add_change_set(change_set, cx);
- }
+ for diff in diffs.into_iter().flatten() {
+ buffer.add_diff(diff, cx);
}
})
.ok();
@@ -15902,9 +16046,9 @@ impl EntityInputHandler for Editor {
cx: &mut Context,
) -> Option> {
let text_layout_details = self.text_layout_details(window);
- let gpui::Point {
- x: em_width,
- y: line_height,
+ let gpui::Size {
+ width: em_width,
+ height: line_height,
} = self.character_size(window);
let snapshot = self.snapshot(window, cx);
@@ -15922,6 +16066,24 @@ impl EntityInputHandler for Editor {
size: size(em_width, line_height),
})
}
+
+ fn character_index_for_point(
+ &mut self,
+ point: gpui::Point,
+ _window: &mut Window,
+ _cx: &mut Context,
+ ) -> Option {
+ let position_map = self.last_position_map.as_ref()?;
+ if !position_map.text_hitbox.contains(&point) {
+ return None;
+ }
+ let display_point = position_map.point_for_position(point).previous_valid;
+ let anchor = position_map
+ .snapshot
+ .display_point_to_anchor(display_point, Bias::Left);
+ let utf16_offset = anchor.to_offset_utf16(&position_map.snapshot.buffer_snapshot);
+ Some(utf16_offset.0)
+ }
}
trait SelectionExt {
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 098ff62dae5f5d03642fdb943a3d3273348aab5b..9203a8f95366dbd3bde7cb95f63d2bd78c7ed7a6 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -35,7 +35,7 @@ pub struct EditorSettings {
pub auto_signature_help: bool,
pub show_signature_help_after_edits: bool,
pub jupyter: Jupyter,
- pub show_inline_completions_in_menu: bool,
+ pub show_edit_predictions_in_menu: bool,
}
#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
@@ -372,7 +372,7 @@ pub struct EditorSettingsContent {
/// Only has an effect if edit prediction provider supports it.
///
/// Default: true
- pub show_inline_completions_in_menu: Option,
+ pub show_edit_predictions_in_menu: Option,
/// Jupyter REPL settings.
pub jupyter: Option,
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 2ce221fbda6d80a0fb056095abcf02c1e95365d3..5247c629c06919ce503c02545193de7143e7cafc 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -7,6 +7,7 @@ use crate::{
},
JoinLines,
};
+use diff::{BufferDiff, DiffHunkStatus};
use futures::StreamExt;
use gpui::{
div, BackgroundExecutor, SemanticVersion, TestAppContext, UpdateGlobal, VisualTestContext,
@@ -26,7 +27,7 @@ use language_settings::{Formatter, FormatterList, IndentGuideSettings};
use multi_buffer::IndentGuide;
use parking_lot::Mutex;
use pretty_assertions::{assert_eq, assert_ne};
-use project::{buffer_store::BufferChangeSet, FakeFs};
+use project::FakeFs;
use project::{
lsp_command::SIGNATURE_HELP_HIGHLIGHT_CURRENT,
project_settings::{LspSettings, ProjectSettings},
@@ -40,8 +41,9 @@ use std::{
use test::{build_editor_with_project, editor_lsp_test_context::rust_lang};
use unindent::Unindent;
use util::{
- assert_set_eq,
+ assert_set_eq, path,
test::{marked_text_ranges, marked_text_ranges_by, sample_text, TextRangeMarker},
+ uri,
};
use workspace::{
item::{FollowEvent, FollowableItem, Item, ItemHandle},
@@ -1157,7 +1159,7 @@ fn test_fold_at_level(cx: &mut TestAppContext) {
});
_ = editor.update(cx, |editor, window, cx| {
- editor.fold_at_level(&FoldAtLevel { level: 2 }, window, cx);
+ editor.fold_at_level(&FoldAtLevel(2), window, cx);
assert_eq!(
editor.display_text(cx),
"
@@ -1181,7 +1183,7 @@ fn test_fold_at_level(cx: &mut TestAppContext) {
.unindent(),
);
- editor.fold_at_level(&FoldAtLevel { level: 1 }, window, cx);
+ editor.fold_at_level(&FoldAtLevel(1), window, cx);
assert_eq!(
editor.display_text(cx),
"
@@ -1196,7 +1198,7 @@ fn test_fold_at_level(cx: &mut TestAppContext) {
);
editor.unfold_all(&UnfoldAll, window, cx);
- editor.fold_at_level(&FoldAtLevel { level: 0 }, window, cx);
+ editor.fold_at_level(&FoldAtLevel(0), window, cx);
assert_eq!(
editor.display_text(cx),
"
@@ -5619,13 +5621,13 @@ async fn test_fold_function_bodies(cx: &mut gpui::TestAppContext) {
let base_text = r#"
impl A {
- // this is an unstaged comment
+ // this is an uncommitted comment
fn b() {
c();
}
- // this is another unstaged comment
+ // this is another uncommitted comment
fn d() {
// e
@@ -5668,13 +5670,13 @@ async fn test_fold_function_bodies(cx: &mut gpui::TestAppContext) {
cx.assert_state_with_diff(
"
ˇimpl A {
- - // this is an unstaged comment
+ - // this is an uncommitted comment
fn b() {
c();
}
- - // this is another unstaged comment
+ - // this is another uncommitted comment
-
fn d() {
// e
@@ -5691,13 +5693,13 @@ async fn test_fold_function_bodies(cx: &mut gpui::TestAppContext) {
let expected_display_text = "
impl A {
- // this is an unstaged comment
+ // this is an uncommitted comment
fn b() {
⋯
}
- // this is another unstaged comment
+ // this is another uncommitted comment
fn d() {
⋯
@@ -7074,9 +7076,9 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
init_test(cx, |_| {});
let fs = FakeFs::new(cx.executor());
- fs.insert_file("/file.rs", Default::default()).await;
+ fs.insert_file(path!("/file.rs"), Default::default()).await;
- let project = Project::test(fs, ["/file.rs".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/file.rs").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(rust_lang());
@@ -7092,7 +7094,9 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
);
let buffer = project
- .update(cx, |project, cx| project.open_local_buffer("/file.rs", cx))
+ .update(cx, |project, cx| {
+ project.open_local_buffer(path!("/file.rs"), cx)
+ })
.await
.unwrap();
@@ -7117,7 +7121,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
.handle_request::(move |params, _| async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/file.rs").unwrap()
+ lsp::Url::from_file_path(path!("/file.rs")).unwrap()
);
assert_eq!(params.options.tab_size, 4);
Ok(Some(vec![lsp::TextEdit::new(
@@ -7145,7 +7149,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
fake_server.handle_request::(move |params, _| async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/file.rs").unwrap()
+ lsp::Url::from_file_path(path!("/file.rs")).unwrap()
);
futures::future::pending::<()>().await;
unreachable!()
@@ -7202,7 +7206,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
.handle_request::(move |params, _| async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/file.rs").unwrap()
+ lsp::Url::from_file_path(path!("/file.rs")).unwrap()
);
assert_eq!(params.options.tab_size, 8);
Ok(Some(vec![]))
@@ -7237,7 +7241,7 @@ async fn test_multibuffer_format_during_save(cx: &mut gpui::TestAppContext) {
let fs = FakeFs::new(cx.executor());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": sample_text_1,
"other.rs": sample_text_2,
@@ -7246,7 +7250,7 @@ async fn test_multibuffer_format_during_save(cx: &mut gpui::TestAppContext) {
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
@@ -7421,20 +7425,20 @@ async fn test_multibuffer_format_during_save(cx: &mut gpui::TestAppContext) {
assert!(cx.read(|cx| !multi_buffer_editor.is_dirty(cx)));
assert_eq!(
multi_buffer_editor.update(cx, |editor, cx| editor.text(cx)),
- "a|o[file:///a/main.rs formatted]bbbb\ncccc\n\nffff\ngggg\n\njjjj\n\nlll[file:///a/other.rs formatted]mmmm\nnnnn|four|five|six|\nr\n\nuuuu\n\nvvvv\nwwww\nxxxx\n\n{{{{\n||||\n\n\u{7f}\u{7f}\u{7f}\u{7f}",
+ uri!("a|o[file:///a/main.rs formatted]bbbb\ncccc\n\nffff\ngggg\n\njjjj\n\nlll[file:///a/other.rs formatted]mmmm\nnnnn|four|five|six|\nr\n\nuuuu\n\nvvvv\nwwww\nxxxx\n\n{{{{\n||||\n\n\u{7f}\u{7f}\u{7f}\u{7f}"),
);
buffer_1.update(cx, |buffer, _| {
assert!(!buffer.is_dirty());
assert_eq!(
buffer.text(),
- "a|o[file:///a/main.rs formatted]bbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj\n",
+ uri!("a|o[file:///a/main.rs formatted]bbbb\ncccc\ndddd\neeee\nffff\ngggg\nhhhh\niiii\njjjj\n"),
)
});
buffer_2.update(cx, |buffer, _| {
assert!(!buffer.is_dirty());
assert_eq!(
buffer.text(),
- "lll[file:///a/other.rs formatted]mmmm\nnnnn|four|five|six|oooo\npppp\nr\nssss\ntttt\nuuuu\n",
+ uri!("lll[file:///a/other.rs formatted]mmmm\nnnnn|four|five|six|oooo\npppp\nr\nssss\ntttt\nuuuu\n"),
)
});
buffer_3.update(cx, |buffer, _| {
@@ -7448,9 +7452,9 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
init_test(cx, |_| {});
let fs = FakeFs::new(cx.executor());
- fs.insert_file("/file.rs", Default::default()).await;
+ fs.insert_file(path!("/file.rs"), Default::default()).await;
- let project = Project::test(fs, ["/file.rs".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(rust_lang());
@@ -7466,7 +7470,9 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
);
let buffer = project
- .update(cx, |project, cx| project.open_local_buffer("/file.rs", cx))
+ .update(cx, |project, cx| {
+ project.open_local_buffer(path!("/file.rs"), cx)
+ })
.await
.unwrap();
@@ -7491,7 +7497,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
.handle_request::(move |params, _| async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/file.rs").unwrap()
+ lsp::Url::from_file_path(path!("/file.rs")).unwrap()
);
assert_eq!(params.options.tab_size, 4);
Ok(Some(vec![lsp::TextEdit::new(
@@ -7519,7 +7525,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
move |params, _| async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/file.rs").unwrap()
+ lsp::Url::from_file_path(path!("/file.rs")).unwrap()
);
futures::future::pending::<()>().await;
unreachable!()
@@ -7577,7 +7583,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
.handle_request::(move |params, _| async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/file.rs").unwrap()
+ lsp::Url::from_file_path(path!("/file.rs")).unwrap()
);
assert_eq!(params.options.tab_size, 8);
Ok(Some(vec![]))
@@ -7597,9 +7603,9 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
});
let fs = FakeFs::new(cx.executor());
- fs.insert_file("/file.rs", Default::default()).await;
+ fs.insert_file(path!("/file.rs"), Default::default()).await;
- let project = Project::test(fs, ["/file.rs".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(Arc::new(Language::new(
@@ -7633,7 +7639,9 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
);
let buffer = project
- .update(cx, |project, cx| project.open_local_buffer("/file.rs", cx))
+ .update(cx, |project, cx| {
+ project.open_local_buffer(path!("/file.rs"), cx)
+ })
.await
.unwrap();
@@ -7663,7 +7671,7 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
.handle_request::(move |params, _| async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/file.rs").unwrap()
+ lsp::Url::from_file_path(path!("/file.rs")).unwrap()
);
assert_eq!(params.options.tab_size, 4);
Ok(Some(vec![lsp::TextEdit::new(
@@ -7687,7 +7695,7 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
fake_server.handle_request::(move |params, _| async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/file.rs").unwrap()
+ lsp::Url::from_file_path(path!("/file.rs")).unwrap()
);
futures::future::pending::<()>().await;
unreachable!()
@@ -8727,14 +8735,14 @@ async fn test_multiline_completion(cx: &mut gpui::TestAppContext) {
let fs = FakeFs::new(cx.executor());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.ts": "a",
}),
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
let typescript_language = Arc::new(Language::new(
LanguageConfig {
@@ -8794,7 +8802,7 @@ async fn test_multiline_completion(cx: &mut gpui::TestAppContext) {
.unwrap();
let _buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer_with_lsp("/a/main.ts", cx)
+ project.open_local_buffer_with_lsp(path!("/a/main.ts"), cx)
})
.await
.unwrap();
@@ -10570,7 +10578,7 @@ async fn go_to_prev_overlapping_diagnostic(
.update_diagnostics(
LanguageServerId(0),
lsp::PublishDiagnosticsParams {
- uri: lsp::Url::from_file_path("/root/file").unwrap(),
+ uri: lsp::Url::from_file_path(path!("/root/file")).unwrap(),
version: None,
diagnostics: vec![
lsp::Diagnostic {
@@ -10645,6 +10653,176 @@ async fn go_to_prev_overlapping_diagnostic(
"});
}
+#[gpui::test]
+async fn cycle_through_same_place_diagnostics(
+ executor: BackgroundExecutor,
+ cx: &mut gpui::TestAppContext,
+) {
+ init_test(cx, |_| {});
+
+ let mut cx = EditorTestContext::new(cx).await;
+ let lsp_store =
+ cx.update_editor(|editor, _, cx| editor.project.as_ref().unwrap().read(cx).lsp_store());
+
+ cx.set_state(indoc! {"
+ ˇfn func(abc def: i32) -> u32 {
+ }
+ "});
+
+ cx.update(|_, cx| {
+ lsp_store.update(cx, |lsp_store, cx| {
+ lsp_store
+ .update_diagnostics(
+ LanguageServerId(0),
+ lsp::PublishDiagnosticsParams {
+ uri: lsp::Url::from_file_path(path!("/root/file")).unwrap(),
+ version: None,
+ diagnostics: vec![
+ lsp::Diagnostic {
+ range: lsp::Range::new(
+ lsp::Position::new(0, 11),
+ lsp::Position::new(0, 12),
+ ),
+ severity: Some(lsp::DiagnosticSeverity::ERROR),
+ ..Default::default()
+ },
+ lsp::Diagnostic {
+ range: lsp::Range::new(
+ lsp::Position::new(0, 12),
+ lsp::Position::new(0, 15),
+ ),
+ severity: Some(lsp::DiagnosticSeverity::ERROR),
+ ..Default::default()
+ },
+ lsp::Diagnostic {
+ range: lsp::Range::new(
+ lsp::Position::new(0, 12),
+ lsp::Position::new(0, 15),
+ ),
+ severity: Some(lsp::DiagnosticSeverity::ERROR),
+ ..Default::default()
+ },
+ lsp::Diagnostic {
+ range: lsp::Range::new(
+ lsp::Position::new(0, 25),
+ lsp::Position::new(0, 28),
+ ),
+ severity: Some(lsp::DiagnosticSeverity::ERROR),
+ ..Default::default()
+ },
+ ],
+ },
+ &[],
+ cx,
+ )
+ .unwrap()
+ });
+ });
+ executor.run_until_parked();
+
+ //// Backward
+
+ // Fourth diagnostic
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_prev_diagnostic(&GoToPrevDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abc def: i32) -> ˇu32 {
+ }
+ "});
+
+ // Third diagnostic
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_prev_diagnostic(&GoToPrevDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abc ˇdef: i32) -> u32 {
+ }
+ "});
+
+ // Second diagnostic, same place
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_prev_diagnostic(&GoToPrevDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abc ˇdef: i32) -> u32 {
+ }
+ "});
+
+ // First diagnostic
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_prev_diagnostic(&GoToPrevDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abcˇ def: i32) -> u32 {
+ }
+ "});
+
+ // Wrapped over, fourth diagnostic
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_prev_diagnostic(&GoToPrevDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abc def: i32) -> ˇu32 {
+ }
+ "});
+
+ cx.update_editor(|editor, window, cx| {
+ editor.move_to_beginning(&MoveToBeginning, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ ˇfn func(abc def: i32) -> u32 {
+ }
+ "});
+
+ //// Forward
+
+ // First diagnostic
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_diagnostic(&GoToDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abcˇ def: i32) -> u32 {
+ }
+ "});
+
+ // Second diagnostic
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_diagnostic(&GoToDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abc ˇdef: i32) -> u32 {
+ }
+ "});
+
+ // Third diagnostic, same place
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_diagnostic(&GoToDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abc ˇdef: i32) -> u32 {
+ }
+ "});
+
+ // Fourth diagnostic
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_diagnostic(&GoToDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abc def: i32) -> ˇu32 {
+ }
+ "});
+
+ // Wrapped around, first diagnostic
+ cx.update_editor(|editor, window, cx| {
+ editor.go_to_diagnostic(&GoToDiagnostic, window, cx);
+ });
+ cx.assert_editor_state(indoc! {"
+ fn func(abcˇ def: i32) -> u32 {
+ }
+ "});
+}
+
#[gpui::test]
async fn test_diagnostics_with_links(cx: &mut TestAppContext) {
init_test(cx, |_| {});
@@ -10663,7 +10841,7 @@ async fn test_diagnostics_with_links(cx: &mut TestAppContext) {
lsp_store.update_diagnostics(
LanguageServerId(0),
lsp::PublishDiagnosticsParams {
- uri: lsp::Url::from_file_path("/root/file").unwrap(),
+ uri: lsp::Url::from_file_path(path!("/root/file")).unwrap(),
version: None,
diagnostics: vec![lsp::Diagnostic {
range: lsp::Range::new(lsp::Position::new(0, 8), lsp::Position::new(0, 12)),
@@ -10923,14 +11101,14 @@ async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
let fs = FakeFs::new(cx.executor());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": "fn main() { let a = 5; }",
"other.rs": "// Test file",
}),
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(Arc::new(Language::new(
@@ -10982,7 +11160,7 @@ async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
let buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer("/a/main.rs", cx)
+ project.open_local_buffer(path!("/a/main.rs"), cx)
})
.await
.unwrap();
@@ -11002,7 +11180,7 @@ async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
fake_server.handle_request::(|params, _| async move {
assert_eq!(
params.text_document_position.text_document.uri,
- lsp::Url::from_file_path("/a/main.rs").unwrap(),
+ lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
);
assert_eq!(
params.text_document_position.position,
@@ -11040,7 +11218,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut gpui::Test
let fs = FakeFs::new(cx.executor());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": "fn main() { let a = 5; }",
"other.rs": "// Test file",
@@ -11048,7 +11226,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut gpui::Test
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let server_restarts = Arc::new(AtomicUsize::new(0));
let closure_restarts = Arc::clone(&server_restarts);
@@ -11088,7 +11266,7 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut gpui::Test
let _window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
let _buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer_with_lsp("/a/main.rs", cx)
+ project.open_local_buffer_with_lsp(path!("/a/main.rs"), cx)
})
.await
.unwrap();
@@ -11861,9 +12039,9 @@ async fn test_document_format_with_prettier(cx: &mut gpui::TestAppContext) {
});
let fs = FakeFs::new(cx.executor());
- fs.insert_file("/file.ts", Default::default()).await;
+ fs.insert_file(path!("/file.ts"), Default::default()).await;
- let project = Project::test(fs, ["/file.ts".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/file.ts").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(Arc::new(Language::new(
@@ -11895,7 +12073,9 @@ async fn test_document_format_with_prettier(cx: &mut gpui::TestAppContext) {
let prettier_format_suffix = project::TEST_PRETTIER_FORMAT_SUFFIX;
let buffer = project
- .update(cx, |project, cx| project.open_local_buffer("/file.ts", cx))
+ .update(cx, |project, cx| {
+ project.open_local_buffer(path!("/file.ts"), cx)
+ })
.await
.unwrap();
@@ -12431,11 +12611,10 @@ async fn test_multibuffer_reverts(cx: &mut gpui::TestAppContext) {
(buffer_2.clone(), base_text_2),
(buffer_3.clone(), base_text_3),
] {
- let change_set = cx
- .new(|cx| BufferChangeSet::new_with_base_text(diff_base.to_string(), &buffer, cx));
+ let diff = cx.new(|cx| BufferDiff::new_with_base_text(&diff_base, &buffer, cx));
editor
.buffer
- .update(cx, |buffer, cx| buffer.add_change_set(change_set, cx));
+ .update(cx, |buffer, cx| buffer.add_diff(diff, cx));
}
});
cx.executor().run_until_parked();
@@ -13125,12 +13304,10 @@ async fn test_toggle_diff_expand_in_multi_buffer(cx: &mut gpui::TestAppContext)
(buffer_2.clone(), file_2_old),
(buffer_3.clone(), file_3_old),
] {
- let change_set = cx.new(|cx| {
- BufferChangeSet::new_with_base_text(diff_base.to_string(), &buffer, cx)
- });
+ let diff = cx.new(|cx| BufferDiff::new_with_base_text(&diff_base, &buffer, cx));
editor
.buffer
- .update(cx, |buffer, cx| buffer.add_change_set(change_set, cx));
+ .update(cx, |buffer, cx| buffer.add_diff(diff, cx));
}
})
.unwrap();
@@ -13212,7 +13389,7 @@ async fn test_expand_diff_hunk_at_excerpt_boundary(cx: &mut gpui::TestAppContext
init_test(cx, |_| {});
let base = "aaa\nbbb\nccc\nddd\neee\nfff\nggg\n";
- let text = "aaa\nBBB\nBB2\nccc\nDDD\nEEE\nfff\nggg\n";
+ let text = "aaa\nBBB\nBB2\nccc\nDDD\nEEE\nfff\nggg\nhhh\niii\n";
let buffer = cx.new(|cx| Buffer::local(text.to_string(), cx));
let multi_buffer = cx.new(|cx| {
@@ -13225,7 +13402,11 @@ async fn test_expand_diff_hunk_at_excerpt_boundary(cx: &mut gpui::TestAppContext
primary: None,
},
ExcerptRange {
- context: Point::new(5, 0)..Point::new(7, 0),
+ context: Point::new(4, 0)..Point::new(7, 0),
+ primary: None,
+ },
+ ExcerptRange {
+ context: Point::new(9, 0)..Point::new(10, 0),
primary: None,
},
],
@@ -13239,11 +13420,10 @@ async fn test_expand_diff_hunk_at_excerpt_boundary(cx: &mut gpui::TestAppContext
});
editor
.update(cx, |editor, _window, cx| {
- let change_set =
- cx.new(|cx| BufferChangeSet::new_with_base_text(base.to_string(), &buffer, cx));
+ let diff = cx.new(|cx| BufferDiff::new_with_base_text(base, &buffer, cx));
editor
.buffer
- .update(cx, |buffer, cx| buffer.add_change_set(change_set, cx))
+ .update(cx, |buffer, cx| buffer.add_diff(diff, cx))
})
.unwrap();
@@ -13255,14 +13435,22 @@ async fn test_expand_diff_hunk_at_excerpt_boundary(cx: &mut gpui::TestAppContext
});
cx.executor().run_until_parked();
+ // When the start of a hunk coincides with the start of its excerpt,
+ // the hunk is expanded. When the start of a a hunk is earlier than
+ // the start of its excerpt, the hunk is not expanded.
cx.assert_state_with_diff(
"
ˇaaa
- bbb
+ BBB
+ - ddd
+ - eee
+ + DDD
+ EEE
fff
+
+ iii
"
.unindent(),
);
@@ -13500,8 +13688,8 @@ async fn test_toggling_adjacent_diff_hunks(cx: &mut TestAppContext) {
cx.set_state(indoc! { "
one
- TWO
- ˇthree
+ ˇTWO
+ three
four
five
"});
@@ -13514,15 +13702,14 @@ async fn test_toggling_adjacent_diff_hunks(cx: &mut TestAppContext) {
indoc! { "
one
- two
- + TWO
- ˇthree
+ + ˇTWO
+ three
four
five
"}
.to_string(),
);
cx.update_editor(|editor, window, cx| {
- editor.move_up(&Default::default(), window, cx);
editor.move_up(&Default::default(), window, cx);
editor.toggle_selected_diff_hunks(&Default::default(), window, cx);
});
@@ -14402,15 +14589,10 @@ async fn test_indent_guide_with_expanded_diff_hunks(cx: &mut gpui::TestAppContex
editor.buffer().update(cx, |multibuffer, cx| {
let buffer = multibuffer.as_singleton().unwrap();
- let change_set = cx.new(|cx| {
- let mut change_set = BufferChangeSet::new(&buffer, cx);
- let _ =
- change_set.set_base_text(base_text.into(), buffer.read(cx).text_snapshot(), cx);
- change_set
- });
+ let diff = cx.new(|cx| BufferDiff::new_with_base_text(base_text, &buffer, cx));
multibuffer.set_all_diff_hunks_expanded(cx);
- multibuffer.add_change_set(change_set, cx);
+ multibuffer.add_diff(diff, cx);
buffer.read(cx).remote_id()
})
@@ -14863,7 +15045,7 @@ async fn test_multi_buffer_folding(cx: &mut gpui::TestAppContext) {
let fs = FakeFs::new(cx.executor());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"first.rs": sample_text_1,
"second.rs": sample_text_2,
@@ -14871,7 +15053,7 @@ async fn test_multi_buffer_folding(cx: &mut gpui::TestAppContext) {
}),
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
let worktree = project.update(cx, |project, cx| {
@@ -15047,7 +15229,7 @@ async fn test_multi_buffer_single_excerpts_folding(cx: &mut gpui::TestAppContext
let fs = FakeFs::new(cx.executor());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"first.rs": sample_text_1,
"second.rs": sample_text_2,
@@ -15055,7 +15237,7 @@ async fn test_multi_buffer_single_excerpts_folding(cx: &mut gpui::TestAppContext
}),
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
let worktree = project.update(cx, |project, cx| {
@@ -15194,13 +15376,13 @@ async fn test_multi_buffer_with_single_excerpt_folding(cx: &mut gpui::TestAppCon
let fs = FakeFs::new(cx.executor());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": sample_text,
}),
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
let cx = &mut VisualTestContext::from_window(*workspace.deref(), cx);
let worktree = project.update(cx, |project, cx| {
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 4b57f8654495ce8f7b676ee50f8822bd9bbb76bd..04bcf722625bfb40016f4d7b16b0b246f97c877e 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -26,8 +26,9 @@ use crate::{
};
use client::ParticipantIndex;
use collections::{BTreeMap, HashMap, HashSet};
+use diff::DiffHunkStatus;
use file_icons::FileIcons;
-use git::{blame::BlameEntry, diff::DiffHunkStatus, Oid};
+use git::{blame::BlameEntry, Oid};
use gpui::{
anchored, deferred, div, fill, linear_color_stop, linear_gradient, outline, point, px, quad,
relative, size, svg, transparent_black, Action, AnyElement, App, AvailableSpace, Axis, Bounds,
@@ -430,7 +431,6 @@ impl EditorElement {
}
});
register_action(editor, window, Editor::restart_language_server);
- register_action(editor, window, Editor::cancel_language_server_work);
register_action(editor, window, Editor::show_character_palette);
register_action(editor, window, |editor, action, window, cx| {
if let Some(task) = editor.confirm_completion(action, window, cx) {
@@ -475,8 +475,8 @@ impl EditorElement {
}
});
register_action(editor, window, Editor::show_signature_help);
- register_action(editor, window, Editor::next_inline_completion);
- register_action(editor, window, Editor::previous_inline_completion);
+ register_action(editor, window, Editor::next_edit_prediction);
+ register_action(editor, window, Editor::previous_edit_prediction);
register_action(editor, window, Editor::show_inline_completion);
register_action(editor, window, Editor::context_menu_first);
register_action(editor, window, Editor::context_menu_prev);
@@ -486,7 +486,7 @@ impl EditorElement {
register_action(editor, window, Editor::unique_lines_case_insensitive);
register_action(editor, window, Editor::unique_lines_case_sensitive);
register_action(editor, window, Editor::accept_partial_inline_completion);
- register_action(editor, window, Editor::accept_inline_completion);
+ register_action(editor, window, Editor::accept_edit_prediction);
register_action(editor, window, Editor::revert_file);
register_action(editor, window, Editor::revert_selected_hunks);
register_action(editor, window, Editor::apply_all_diff_hunks);
@@ -503,7 +503,6 @@ impl EditorElement {
let position_map = layout.position_map.clone();
window.on_key_event({
let editor = self.editor.clone();
- let text_hitbox = layout.text_hitbox.clone();
move |event: &ModifiersChangedEvent, phase, window, cx| {
if phase != DispatchPhase::Bubble {
return;
@@ -512,7 +511,7 @@ impl EditorElement {
if editor.hover_state.focused(window, cx) {
return;
}
- Self::modifiers_changed(editor, event, &position_map, &text_hitbox, window, cx)
+ Self::modifiers_changed(editor, event, &position_map, window, cx)
})
}
});
@@ -522,19 +521,18 @@ impl EditorElement {
editor: &mut Editor,
event: &ModifiersChangedEvent,
position_map: &PositionMap,
- text_hitbox: &Hitbox,
window: &mut Window,
cx: &mut Context,
) {
editor.update_inline_completion_preview(&event.modifiers, window, cx);
let mouse_position = window.mouse_position();
- if !text_hitbox.is_hovered(window) {
+ if !position_map.text_hitbox.is_hovered(window) {
return;
}
editor.update_hovered_link(
- position_map.point_for_position(text_hitbox.bounds, mouse_position),
+ position_map.point_for_position(mouse_position),
&position_map.snapshot,
event.modifiers,
window,
@@ -542,14 +540,11 @@ impl EditorElement {
)
}
- #[allow(clippy::too_many_arguments)]
fn mouse_left_down(
editor: &mut Editor,
event: &MouseDownEvent,
hovered_hunk: Option>,
position_map: &PositionMap,
- text_hitbox: &Hitbox,
- gutter_hitbox: &Hitbox,
line_numbers: &HashMap,
window: &mut Window,
cx: &mut Context,
@@ -558,11 +553,13 @@ impl EditorElement {
return;
}
+ let text_hitbox = &position_map.text_hitbox;
+ let gutter_hitbox = &position_map.gutter_hitbox;
let mut click_count = event.click_count;
let mut modifiers = event.modifiers;
if let Some(hovered_hunk) = hovered_hunk {
- editor.toggle_diff_hunks_in_ranges(vec![hovered_hunk], cx);
+ editor.toggle_diff_hunks_in_ranges_narrow(vec![hovered_hunk], cx);
cx.notify();
return;
} else if gutter_hitbox.is_hovered(window) {
@@ -614,8 +611,7 @@ impl EditorElement {
}
}
- let point_for_position =
- position_map.point_for_position(text_hitbox.bounds, event.position);
+ let point_for_position = position_map.point_for_position(event.position);
let position = point_for_position.previous_valid;
if modifiers.shift && modifiers.alt {
editor.select(
@@ -690,15 +686,13 @@ impl EditorElement {
editor: &mut Editor,
event: &MouseDownEvent,
position_map: &PositionMap,
- text_hitbox: &Hitbox,
window: &mut Window,
cx: &mut Context,
) {
- if !text_hitbox.is_hovered(window) {
+ if !position_map.text_hitbox.is_hovered(window) {
return;
}
- let point_for_position =
- position_map.point_for_position(text_hitbox.bounds, event.position);
+ let point_for_position = position_map.point_for_position(event.position);
mouse_context_menu::deploy_context_menu(
editor,
Some(event.position),
@@ -713,16 +707,14 @@ impl EditorElement {
editor: &mut Editor,
event: &MouseDownEvent,
position_map: &PositionMap,
- text_hitbox: &Hitbox,
window: &mut Window,
cx: &mut Context,
) {
- if !text_hitbox.is_hovered(window) || window.default_prevented() {
+ if !position_map.text_hitbox.is_hovered(window) || window.default_prevented() {
return;
}
- let point_for_position =
- position_map.point_for_position(text_hitbox.bounds, event.position);
+ let point_for_position = position_map.point_for_position(event.position);
let position = point_for_position.previous_valid;
editor.select(
@@ -739,15 +731,11 @@ impl EditorElement {
fn mouse_up(
editor: &mut Editor,
event: &MouseUpEvent,
- #[cfg_attr(
- not(any(target_os = "linux", target_os = "freebsd")),
- allow(unused_variables)
- )]
position_map: &PositionMap,
- text_hitbox: &Hitbox,
window: &mut Window,
cx: &mut Context,
) {
+ let text_hitbox = &position_map.text_hitbox;
let end_selection = editor.has_pending_selection();
let pending_nonempty_selections = editor.has_pending_nonempty_selection();
@@ -767,8 +755,7 @@ impl EditorElement {
#[cfg(any(target_os = "linux", target_os = "freebsd"))]
if EditorSettings::get_global(cx).middle_click_paste {
if let Some(text) = cx.read_from_primary().and_then(|item| item.text()) {
- let point_for_position =
- position_map.point_for_position(text_hitbox.bounds, event.position);
+ let point_for_position = position_map.point_for_position(event.position);
let position = point_for_position.previous_valid;
editor.select(
@@ -791,10 +778,10 @@ impl EditorElement {
editor: &mut Editor,
event: &ClickEvent,
position_map: &PositionMap,
- text_hitbox: &Hitbox,
window: &mut Window,
cx: &mut Context,
) {
+ let text_hitbox = &position_map.text_hitbox;
let pending_nonempty_selections = editor.has_pending_nonempty_selection();
let multi_cursor_setting = EditorSettings::get_global(cx).multi_cursor_modifier;
@@ -804,7 +791,7 @@ impl EditorElement {
};
if !pending_nonempty_selections && multi_cursor_modifier && text_hitbox.is_hovered(window) {
- let point = position_map.point_for_position(text_hitbox.bounds, event.up.position);
+ let point = position_map.point_for_position(event.up.position);
editor.handle_click_hovered_link(point, event.modifiers(), window, cx);
cx.stop_propagation();
@@ -815,7 +802,6 @@ impl EditorElement {
editor: &mut Editor,
event: &MouseMoveEvent,
position_map: &PositionMap,
- text_bounds: Bounds,
window: &mut Window,
cx: &mut Context,
) {
@@ -823,7 +809,8 @@ impl EditorElement {
return;
}
- let point_for_position = position_map.point_for_position(text_bounds, event.position);
+ let text_bounds = position_map.text_hitbox.bounds;
+ let point_for_position = position_map.point_for_position(event.position);
let mut scroll_delta = gpui::Point::::default();
let vertical_margin = position_map.line_height.min(text_bounds.size.height / 3.0);
let top = text_bounds.origin.y + vertical_margin;
@@ -870,19 +857,18 @@ impl EditorElement {
editor: &mut Editor,
event: &MouseMoveEvent,
position_map: &PositionMap,
- text_hitbox: &Hitbox,
- gutter_hitbox: &Hitbox,
window: &mut Window,
cx: &mut Context,
) {
+ let text_hitbox = &position_map.text_hitbox;
+ let gutter_hitbox = &position_map.gutter_hitbox;
let modifiers = event.modifiers;
let gutter_hovered = gutter_hitbox.is_hovered(window);
editor.set_gutter_hovered(gutter_hovered, cx);
// Don't trigger hover popover if mouse is hovering over context menu
if text_hitbox.is_hovered(window) {
- let point_for_position =
- position_map.point_for_position(text_hitbox.bounds, event.position);
+ let point_for_position = position_map.point_for_position(event.position);
editor.update_hovered_link(
point_for_position,
@@ -1668,7 +1654,7 @@ impl EditorElement {
if let Some(inline_completion) = editor.active_inline_completion.as_ref() {
match &inline_completion.completion {
InlineCompletion::Edit {
- display_mode: EditDisplayMode::TabAccept(_),
+ display_mode: EditDisplayMode::TabAccept,
..
} => padding += INLINE_ACCEPT_SUGGESTION_EM_WIDTHS,
_ => {}
@@ -2418,35 +2404,18 @@ impl EditorElement {
height,
} => {
let selected = selected_buffer_ids.contains(&first_excerpt.buffer_id);
- let icon_offset = gutter_dimensions.width
- - (gutter_dimensions.left_padding + gutter_dimensions.margin);
let mut result = v_flex().id(block_id).w_full();
if let Some(prev_excerpt) = prev_excerpt {
if *show_excerpt_controls {
- result =
- result.child(
- h_flex()
- .id("expand_down_hit_area")
- .w(icon_offset)
- .h(MULTI_BUFFER_EXCERPT_HEADER_HEIGHT as f32
- * window.line_height())
- .flex_none()
- .justify_end()
- .child(self.render_expand_excerpt_button(
- IconName::ArrowDownFromLine,
- None,
- cx,
- ))
- .on_click(window.listener_for(&self.editor, {
- let excerpt_id = prev_excerpt.id;
- let direction = ExpandExcerptDirection::Down;
- move |editor, _, _, cx| {
- editor.expand_excerpt(excerpt_id, direction, cx);
- cx.stop_propagation();
- }
- })),
- );
+ result = result.child(self.render_expand_excerpt_control(
+ block_id,
+ ExpandExcerptDirection::Down,
+ prev_excerpt.id,
+ gutter_dimensions,
+ window,
+ cx,
+ ));
}
}
@@ -2470,65 +2439,19 @@ impl EditorElement {
height,
starts_new_buffer,
} => {
- let icon_offset = gutter_dimensions.width
- - (gutter_dimensions.left_padding + gutter_dimensions.margin);
- let header_height =
- MULTI_BUFFER_EXCERPT_HEADER_HEIGHT as f32 * window.line_height();
let color = cx.theme().colors().clone();
- let hover_color = color.border_variant.opacity(0.5);
- let focus_handle = self.editor.focus_handle(cx).clone();
-
let mut result = v_flex().id(block_id).w_full();
- let expand_area = |id: SharedString| {
- h_flex()
- .id(id)
- .w_full()
- .cursor_pointer()
- .block_mouse_down()
- .on_mouse_move(|_, _, cx| cx.stop_propagation())
- .hover(|style| style.bg(hover_color))
- .tooltip({
- let focus_handle = focus_handle.clone();
- move |window, cx| {
- Tooltip::for_action_in(
- "Expand Excerpt",
- &ExpandExcerpts { lines: 0 },
- &focus_handle,
- window,
- cx,
- )
- }
- })
- };
if let Some(prev_excerpt) = prev_excerpt {
if *show_excerpt_controls {
- let group_name = "expand-down";
-
- result = result.child(
- expand_area(format!("block-{}-down", block_id).into())
- .group(group_name)
- .child(
- h_flex()
- .w(icon_offset)
- .h(header_height)
- .flex_none()
- .justify_end()
- .child(self.render_expand_excerpt_button(
- IconName::ArrowDownFromLine,
- Some(group_name.to_string()),
- cx,
- )),
- )
- .on_click(window.listener_for(&self.editor, {
- let excerpt_id = prev_excerpt.id;
- let direction = ExpandExcerptDirection::Down;
- move |editor, _, _, cx| {
- editor.expand_excerpt(excerpt_id, direction, cx);
- cx.stop_propagation();
- }
- })),
- );
+ result = result.child(self.render_expand_excerpt_control(
+ block_id,
+ ExpandExcerptDirection::Down,
+ prev_excerpt.id,
+ gutter_dimensions,
+ window,
+ cx,
+ ));
}
}
@@ -2554,43 +2477,20 @@ impl EditorElement {
}
if *show_excerpt_controls {
- let group_name = "expand-up-first";
-
- result = result.child(
- h_flex().group(group_name).child(
- expand_area(format!("block-{}-up-first", block_id).into())
- .h(header_height)
- .child(
- h_flex()
- .w(icon_offset)
- .h(header_height)
- .flex_none()
- .justify_end()
- .child(self.render_expand_excerpt_button(
- IconName::ArrowUpFromLine,
- Some(group_name.to_string()),
- cx,
- )),
- )
- .on_click(window.listener_for(&self.editor, {
- let excerpt_id = next_excerpt.id;
- let direction = ExpandExcerptDirection::Up;
- move |editor, _, _, cx| {
- editor.expand_excerpt(excerpt_id, direction, cx);
- cx.stop_propagation();
- }
- })),
- ),
- );
+ result = result.child(self.render_expand_excerpt_control(
+ block_id,
+ ExpandExcerptDirection::Up,
+ next_excerpt.id,
+ gutter_dimensions,
+ window,
+ cx,
+ ));
}
} else {
- let group_name = "expand-up-subsequent";
-
if *show_excerpt_controls {
result = result.child(
h_flex()
.relative()
- .group(group_name)
.child(
div()
.top(px(0.))
@@ -2599,55 +2499,14 @@ impl EditorElement {
.h_px()
.bg(color.border_variant),
)
- .child(
- expand_area(format!("block-{}-up", block_id).into())
- .h(header_height)
- .child(
- h_flex()
- .w(icon_offset)
- .h(header_height)
- .flex_none()
- .justify_end()
- .child(if *show_excerpt_controls {
- self.render_expand_excerpt_button(
- IconName::ArrowUpFromLine,
- Some(group_name.to_string()),
- cx,
- )
- } else {
- ButtonLike::new("jump-icon")
- .style(ButtonStyle::Transparent)
- .child(
- svg()
- .path(
- IconName::ArrowUpRight
- .path(),
- )
- .size(IconSize::XSmall.rems())
- .text_color(
- color.border_variant,
- )
- .group_hover(
- group_name,
- |style| {
- style.text_color(
- color.border,
- )
- },
- ),
- )
- }),
- )
- .on_click(window.listener_for(&self.editor, {
- let excerpt_id = next_excerpt.id;
- let direction = ExpandExcerptDirection::Up;
- move |editor, _, _, cx| {
- editor
- .expand_excerpt(excerpt_id, direction, cx);
- cx.stop_propagation();
- }
- })),
- ),
+ .child(self.render_expand_excerpt_control(
+ block_id,
+ ExpandExcerptDirection::Up,
+ next_excerpt.id,
+ gutter_dimensions,
+ window,
+ cx,
+ )),
);
}
};
@@ -2775,6 +2634,16 @@ impl EditorElement {
),
)
})
+ .children(
+ self.editor
+ .read(cx)
+ .addons
+ .values()
+ .filter_map(|addon| {
+ addon.render_buffer_header_controls(for_excerpt, window, cx)
+ })
+ .take(1),
+ )
.child(
h_flex()
.cursor_pointer()
@@ -2824,26 +2693,93 @@ impl EditorElement {
)
}
- fn render_expand_excerpt_button(
+ fn render_expand_excerpt_control(
&self,
- icon: IconName,
- group_name: impl Into>,
+ block_id: BlockId,
+ direction: ExpandExcerptDirection,
+ excerpt_id: ExcerptId,
+ gutter_dimensions: &GutterDimensions,
+ window: &Window,
cx: &mut App,
- ) -> ButtonLike {
- let group_name = group_name.into();
- ButtonLike::new("expand-icon")
- .style(ButtonStyle::Transparent)
- .child(
- svg()
- .path(icon.path())
- .size(IconSize::XSmall.rems())
- .text_color(cx.theme().colors().editor_line_number)
- .when_some(group_name, |svg, group_name| {
- svg.group_hover(group_name, |style| {
- style.text_color(cx.theme().colors().editor_active_line_number)
- })
- }),
+ ) -> impl IntoElement {
+ let color = cx.theme().colors().clone();
+ let hover_color = color.border_variant.opacity(0.5);
+ let focus_handle = self.editor.focus_handle(cx).clone();
+
+ let icon_offset =
+ gutter_dimensions.width - (gutter_dimensions.left_padding + gutter_dimensions.margin);
+ let header_height = MULTI_BUFFER_EXCERPT_HEADER_HEIGHT as f32 * window.line_height();
+ let group_name = if direction == ExpandExcerptDirection::Down {
+ "expand-down"
+ } else {
+ "expand-up"
+ };
+
+ let expand_area = |id: SharedString| {
+ h_flex()
+ .id(id)
+ .w_full()
+ .cursor_pointer()
+ .block_mouse_down()
+ .on_mouse_move(|_, _, cx| cx.stop_propagation())
+ .hover(|style| style.bg(hover_color))
+ .tooltip({
+ let focus_handle = focus_handle.clone();
+ move |window, cx| {
+ Tooltip::for_action_in(
+ "Expand Excerpt",
+ &ExpandExcerpts { lines: 0 },
+ &focus_handle,
+ window,
+ cx,
+ )
+ }
+ })
+ };
+
+ expand_area(
+ format!(
+ "block-{}-{}",
+ block_id,
+ if direction == ExpandExcerptDirection::Down {
+ "down"
+ } else {
+ "up"
+ }
)
+ .into(),
+ )
+ .group(group_name)
+ .child(
+ h_flex()
+ .w(icon_offset)
+ .h(header_height)
+ .flex_none()
+ .justify_end()
+ .child(
+ ButtonLike::new("expand-icon")
+ .style(ButtonStyle::Transparent)
+ .child(
+ svg()
+ .path(if direction == ExpandExcerptDirection::Down {
+ IconName::ArrowDownFromLine.path()
+ } else {
+ IconName::ArrowUpFromLine.path()
+ })
+ .size(IconSize::XSmall.rems())
+ .text_color(cx.theme().colors().editor_line_number)
+ .group_hover(group_name, |style| {
+ style.text_color(cx.theme().colors().editor_active_line_number)
+ }),
+ ),
+ ),
+ )
+ .on_click(window.listener_for(&self.editor, {
+ move |editor, _, _, cx| {
+ editor.expand_excerpt(excerpt_id, direction, cx);
+ cx.stop_propagation();
+ }
+ }))
}
#[allow(clippy::too_many_arguments)]
@@ -3174,7 +3110,10 @@ impl EditorElement {
{
let editor = self.editor.read(cx);
- if editor.has_active_completions_menu() && editor.show_inline_completions_in_menu(cx) {
+ if editor.inline_completion_visible_in_cursor_popover(
+ editor.has_active_inline_completion(),
+ cx,
+ ) {
height_above_menu +=
editor.edit_prediction_cursor_popover_height() + POPOVER_Y_PADDING;
edit_prediction_popover_visible = true;
@@ -3235,7 +3174,7 @@ impl EditorElement {
};
let mut element = self
.render_context_menu(line_height, menu_height, y_flipped, window, cx)
- .unwrap();
+ .expect("Visible context menu should always render.");
let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
Some((CursorPopoverType::CodeContextMenu, element, size))
} else {
@@ -3258,7 +3197,7 @@ impl EditorElement {
#[cfg(target_os = "macos")]
{
// let bindings = window.bindings_for_action_in(
- // &crate::AcceptInlineCompletion,
+ // &crate::AcceptEditPrediction,
// &self.editor.focus_handle(cx),
// );
@@ -3300,7 +3239,6 @@ impl EditorElement {
min_width,
max_width,
cursor_point,
- &line_layouts,
style,
accept_keystroke.as_ref()?,
window,
@@ -3392,8 +3330,12 @@ impl EditorElement {
window: &mut Window,
cx: &mut App,
) {
+ let editor = self.editor.read(cx);
+ if !editor.context_menu_visible() {
+ return;
+ }
let Some(crate::ContextMenuOrigin::GutterIndicator(gutter_row)) =
- self.editor.read(cx).context_menu_origin()
+ editor.context_menu_origin()
else {
return;
};
@@ -3421,11 +3363,9 @@ impl EditorElement {
window,
cx,
move |height, _max_width_for_stable_x, y_flipped, window, cx| {
- let Some(mut element) =
- self.render_context_menu(line_height, height, y_flipped, window, cx)
- else {
- return vec![];
- };
+ let mut element = self
+ .render_context_menu(line_height, height, y_flipped, window, cx)
+ .expect("Visible context menu should always render.");
let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
vec![(CursorPopoverType::CodeContextMenu, element, size)]
},
@@ -3677,7 +3617,12 @@ impl EditorElement {
const PADDING_X: Pixels = Pixels(24.);
const PADDING_Y: Pixels = Pixels(2.);
- let active_inline_completion = self.editor.read(cx).active_inline_completion.as_ref()?;
+ let editor = self.editor.read(cx);
+ let active_inline_completion = editor.active_inline_completion.as_ref()?;
+
+ if editor.inline_completion_visible_in_cursor_popover(true, cx) {
+ return None;
+ }
match &active_inline_completion.completion {
InlineCompletion::Move { target, .. } => {
@@ -3691,7 +3636,7 @@ impl EditorElement {
self.editor.focus_handle(cx),
window,
cx,
- );
+ )?;
let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
let offset = point((text_bounds.size.width - size.width) / 2., PADDING_Y);
element.prepaint_at(text_bounds.origin + offset, window, cx);
@@ -3704,7 +3649,7 @@ impl EditorElement {
self.editor.focus_handle(cx),
window,
cx,
- );
+ )?;
let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
let offset = point(
(text_bounds.size.width - size.width) / 2.,
@@ -3720,7 +3665,7 @@ impl EditorElement {
self.editor.focus_handle(cx),
window,
cx,
- );
+ )?;
let target_line_end = DisplayPoint::new(
target_display_point.row(),
@@ -3744,7 +3689,7 @@ impl EditorElement {
display_mode,
snapshot,
} => {
- if self.editor.read(cx).has_active_completions_menu() {
+ if self.editor.read(cx).has_visible_completions_menu() {
return None;
}
@@ -3768,8 +3713,7 @@ impl EditorElement {
}
match display_mode {
- EditDisplayMode::TabAccept(previewing) => {
- let previewing = *previewing;
+ EditDisplayMode::TabAccept => {
let range = &edits.first()?.0;
let target_display_point = range.end.to_display_point(editor_snapshot);
@@ -3777,18 +3721,26 @@ impl EditorElement {
target_display_point.row(),
editor_snapshot.line_len(target_display_point.row()),
);
- let origin = self.editor.update(cx, |editor, _cx| {
- editor.display_to_pixel_point(target_line_end, editor_snapshot, window)
- })?;
+ let (previewing_inline_completion, origin) =
+ self.editor.update(cx, |editor, _cx| {
+ Some((
+ editor.previewing_inline_completion,
+ editor.display_to_pixel_point(
+ target_line_end,
+ editor_snapshot,
+ window,
+ )?,
+ ))
+ })?;
let mut element = inline_completion_accept_indicator(
"Accept",
None,
- previewing,
+ previewing_inline_completion,
self.editor.focus_handle(cx),
window,
cx,
- );
+ )?;
element.prepaint_as_root(
text_bounds.origin + origin + point(PADDING_X, px(0.)),
@@ -4107,8 +4059,7 @@ impl EditorElement {
window: &mut Window,
cx: &mut App,
) -> Vec {
- let point_for_position =
- position_map.point_for_position(text_hitbox.bounds, window.mouse_position());
+ let point_for_position = position_map.point_for_position(window.mouse_position());
let mut controls = vec![];
@@ -4245,7 +4196,10 @@ impl EditorElement {
let scroll_top = layout.position_map.snapshot.scroll_position().y;
let gutter_bg = cx.theme().colors().editor_gutter_background;
window.paint_quad(fill(layout.gutter_hitbox.bounds, gutter_bg));
- window.paint_quad(fill(layout.text_hitbox.bounds, self.style.background));
+ window.paint_quad(fill(
+ layout.position_map.text_hitbox.bounds,
+ self.style.background,
+ ));
if let EditorMode::Full = layout.mode {
let mut active_rows = layout.active_rows.iter().peekable();
@@ -4270,8 +4224,8 @@ impl EditorElement {
end: layout.gutter_hitbox.right(),
}),
CurrentLineHighlight::Line => Some(Range {
- start: layout.text_hitbox.bounds.left(),
- end: layout.text_hitbox.bounds.right(),
+ start: layout.position_map.text_hitbox.bounds.left(),
+ end: layout.position_map.text_hitbox.bounds.right(),
}),
CurrentLineHighlight::All => Some(Range {
start: layout.hitbox.left(),
@@ -4345,7 +4299,7 @@ impl EditorElement {
layout.position_map.snapshot.scroll_position().x * layout.position_map.em_width;
for (wrap_position, active) in layout.wrap_guides.iter() {
- let x = (layout.text_hitbox.origin.x
+ let x = (layout.position_map.text_hitbox.origin.x
+ *wrap_position
+ layout.position_map.em_width / 2.)
- scroll_left;
@@ -4357,7 +4311,7 @@ impl EditorElement {
|| scrollbar_y.as_ref().map_or(false, |sy| sy.visible)
};
- if x < layout.text_hitbox.origin.x
+ if x < layout.position_map.text_hitbox.origin.x
|| (show_scrollbars && x > self.scrollbar_left(&layout.hitbox.bounds))
{
continue;
@@ -4370,8 +4324,8 @@ impl EditorElement {
};
window.paint_quad(fill(
Bounds {
- origin: point(x, layout.text_hitbox.origin.y),
- size: size(px(1.), layout.text_hitbox.size.height),
+ origin: point(x, layout.position_map.text_hitbox.origin.y),
+ size: size(px(1.), layout.position_map.text_hitbox.size.height),
},
color,
));
@@ -4746,7 +4700,7 @@ impl EditorElement {
fn paint_text(&mut self, layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
window.with_content_mask(
Some(ContentMask {
- bounds: layout.text_hitbox.bounds,
+ bounds: layout.position_map.text_hitbox.bounds,
}),
|window| {
let cursor_style = if self
@@ -4760,7 +4714,7 @@ impl EditorElement {
} else {
CursorStyle::IBeam
};
- window.set_cursor_style(cursor_style, &layout.text_hitbox);
+ window.set_cursor_style(cursor_style, &layout.position_map.text_hitbox);
let invisible_display_ranges = self.paint_highlights(layout, window);
self.paint_lines(&invisible_display_ranges, layout, window, cx);
@@ -4782,7 +4736,7 @@ impl EditorElement {
layout: &mut EditorLayout,
window: &mut Window,
) -> SmallVec<[Range; 32]> {
- window.paint_layer(layout.text_hitbox.bounds, |window| {
+ window.paint_layer(layout.position_map.text_hitbox.bounds, |window| {
let mut invisible_display_ranges = SmallVec::<[Range; 32]>::new();
let line_end_overshoot = 0.15 * layout.position_map.line_height;
for (range, color) in &layout.highlighted_ranges {
@@ -4861,7 +4815,7 @@ impl EditorElement {
// A softer than perfect black
let redaction_color = gpui::rgb(0x0e1111);
- window.paint_layer(layout.text_hitbox.bounds, |window| {
+ window.paint_layer(layout.position_map.text_hitbox.bounds, |window| {
for range in layout.redacted_ranges.iter() {
self.paint_highlighted_range(
range.clone(),
@@ -5307,7 +5261,7 @@ impl EditorElement {
if scrollbar_settings.diagnostics != ScrollbarDiagnostics::None {
let diagnostics = snapshot
.buffer_snapshot
- .diagnostics_in_range::<_, Point>(Point::zero()..max_point)
+ .diagnostics_in_range::(Point::zero()..max_point)
// Don't show diagnostics the user doesn't care about
.filter(|diagnostic| {
match (
@@ -5435,13 +5389,13 @@ impl EditorElement {
.collect(),
};
- highlighted_range.paint(layout.text_hitbox.bounds, window);
+ highlighted_range.paint(layout.position_map.text_hitbox.bounds, window);
}
}
fn paint_inline_blame(&mut self, layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
if let Some(mut inline_blame) = layout.inline_blame.take() {
- window.paint_layer(layout.text_hitbox.bounds, |window| {
+ window.paint_layer(layout.position_map.text_hitbox.bounds, |window| {
inline_blame.paint(window, cx);
})
}
@@ -5560,8 +5514,6 @@ impl EditorElement {
window.on_mouse_event({
let position_map = layout.position_map.clone();
let editor = self.editor.clone();
- let text_hitbox = layout.text_hitbox.clone();
- let gutter_hitbox = layout.gutter_hitbox.clone();
let multi_buffer_range =
layout
.display_hunks
@@ -5600,32 +5552,16 @@ impl EditorElement {
event,
multi_buffer_range.clone(),
&position_map,
- &text_hitbox,
- &gutter_hitbox,
line_numbers.as_ref(),
window,
cx,
);
}),
MouseButton::Right => editor.update(cx, |editor, cx| {
- Self::mouse_right_down(
- editor,
- event,
- &position_map,
- &text_hitbox,
- window,
- cx,
- );
+ Self::mouse_right_down(editor, event, &position_map, window, cx);
}),
MouseButton::Middle => editor.update(cx, |editor, cx| {
- Self::mouse_middle_down(
- editor,
- event,
- &position_map,
- &text_hitbox,
- window,
- cx,
- );
+ Self::mouse_middle_down(editor, event, &position_map, window, cx);
}),
_ => {}
};
@@ -5636,12 +5572,11 @@ impl EditorElement {
window.on_mouse_event({
let editor = self.editor.clone();
let position_map = layout.position_map.clone();
- let text_hitbox = layout.text_hitbox.clone();
move |event: &MouseUpEvent, phase, window, cx| {
if phase == DispatchPhase::Bubble {
editor.update(cx, |editor, cx| {
- Self::mouse_up(editor, event, &position_map, &text_hitbox, window, cx)
+ Self::mouse_up(editor, event, &position_map, window, cx)
});
}
}
@@ -5650,8 +5585,6 @@ impl EditorElement {
window.on_mouse_event({
let editor = self.editor.clone();
let position_map = layout.position_map.clone();
- let text_hitbox = layout.text_hitbox.clone();
-
let mut captured_mouse_down = None;
move |event: &MouseUpEvent, phase, window, cx| match phase {
@@ -5665,7 +5598,7 @@ impl EditorElement {
.clone();
let mut pending_mouse_down = pending_mouse_down.borrow_mut();
- if pending_mouse_down.is_some() && text_hitbox.is_hovered(window) {
+ if pending_mouse_down.is_some() && position_map.text_hitbox.is_hovered(window) {
captured_mouse_down = pending_mouse_down.take();
window.refresh();
}
@@ -5677,7 +5610,7 @@ impl EditorElement {
down: mouse_down,
up: event.clone(),
};
- Self::click(editor, &event, &position_map, &text_hitbox, window, cx);
+ Self::click(editor, &event, &position_map, window, cx);
}
}),
}
@@ -5686,8 +5619,6 @@ impl EditorElement {
window.on_mouse_event({
let position_map = layout.position_map.clone();
let editor = self.editor.clone();
- let text_hitbox = layout.text_hitbox.clone();
- let gutter_hitbox = layout.gutter_hitbox.clone();
move |event: &MouseMoveEvent, phase, window, cx| {
if phase == DispatchPhase::Bubble {
@@ -5698,25 +5629,10 @@ impl EditorElement {
if event.pressed_button == Some(MouseButton::Left)
|| event.pressed_button == Some(MouseButton::Middle)
{
- Self::mouse_dragged(
- editor,
- event,
- &position_map,
- text_hitbox.bounds,
- window,
- cx,
- )
+ Self::mouse_dragged(editor, event, &position_map, window, cx)
}
- Self::mouse_moved(
- editor,
- event,
- &position_map,
- &text_hitbox,
- &gutter_hitbox,
- window,
- cx,
- )
+ Self::mouse_moved(editor, event, &position_map, window, cx)
});
}
}
@@ -5826,35 +5742,43 @@ fn inline_completion_accept_indicator(
focus_handle: FocusHandle,
window: &Window,
cx: &App,
-) -> AnyElement {
- let use_hardcoded_linux_preview_binding;
+) -> Option {
+ let use_hardcoded_linux_bindings;
#[cfg(target_os = "macos")]
{
- use_hardcoded_linux_preview_binding = false;
+ use_hardcoded_linux_bindings = false;
}
#[cfg(not(target_os = "macos"))]
{
- use_hardcoded_linux_preview_binding = previewing;
+ use_hardcoded_linux_bindings = true;
}
- let accept_keystroke = if use_hardcoded_linux_preview_binding {
- Keystroke {
- modifiers: Default::default(),
- key: "enter".to_string(),
- key_char: None,
+ let accept_keystroke = if use_hardcoded_linux_bindings {
+ if previewing {
+ Keystroke {
+ modifiers: Default::default(),
+ key: "enter".to_string(),
+ key_char: None,
+ }
+ } else {
+ Keystroke {
+ modifiers: Default::default(),
+ key: "tab".to_string(),
+ key_char: None,
+ }
}
} else {
- let bindings = window.bindings_for_action_in(&crate::AcceptInlineCompletion, &focus_handle);
+ let bindings = window.bindings_for_action_in(&crate::AcceptEditPrediction, &focus_handle);
if let Some(keystroke) = bindings
.last()
.and_then(|binding| binding.keystrokes().first())
{
- // TODO: clone unnecessary once `use_hardcoded_linux_preview_binding` is removed.
+ // TODO: clone unnecessary once `use_hardcoded_linux_bindings` is removed.
keystroke.clone()
} else {
- return div().into_any();
+ return None;
}
};
@@ -5869,6 +5793,7 @@ fn inline_completion_accept_indicator(
&accept_keystroke.modifiers,
PlatformStyle::platform(),
Some(Color::Default),
+ None,
false,
))
})
@@ -5876,26 +5801,28 @@ fn inline_completion_accept_indicator(
let padding_right = if icon.is_some() { px(4.) } else { px(8.) };
- h_flex()
- .py_0p5()
- .pl_1()
- .pr(padding_right)
- .gap_1()
- .bg(cx.theme().colors().text_accent.opacity(0.15))
- .border_1()
- .border_color(cx.theme().colors().text_accent.opacity(0.8))
- .rounded_md()
- .shadow_sm()
- .child(accept_key)
- .child(Label::new(label).size(LabelSize::Small))
- .when_some(icon, |element, icon| {
- element.child(
- div()
- .mt(px(1.5))
- .child(Icon::new(icon).size(IconSize::Small)),
- )
- })
- .into_any()
+ Some(
+ h_flex()
+ .py_0p5()
+ .pl_1()
+ .pr(padding_right)
+ .gap_1()
+ .bg(cx.theme().colors().text_accent.opacity(0.15))
+ .border_1()
+ .border_color(cx.theme().colors().text_accent.opacity(0.8))
+ .rounded_md()
+ .shadow_sm()
+ .child(accept_key)
+ .child(Label::new(label).size(LabelSize::Small))
+ .when_some(icon, |element, icon| {
+ element.child(
+ div()
+ .mt(px(1.5))
+ .child(Icon::new(icon).size(IconSize::Small)),
+ )
+ })
+ .into_any(),
+ )
}
#[allow(clippy::too_many_arguments)]
@@ -7566,6 +7493,12 @@ impl Element for EditorElement {
em_width,
em_advance,
snapshot,
+ gutter_hitbox: gutter_hitbox.clone(),
+ text_hitbox: text_hitbox.clone(),
+ });
+
+ self.editor.update(cx, |editor, _| {
+ editor.last_position_map = Some(position_map.clone())
});
let hunk_controls = self.layout_diff_hunk_controls(
@@ -7589,7 +7522,6 @@ impl Element for EditorElement {
wrap_guides,
indent_guides,
hitbox,
- text_hitbox,
gutter_hitbox,
display_hunks,
content_origin,
@@ -7761,7 +7693,6 @@ impl IntoElement for EditorElement {
pub struct EditorLayout {
position_map: Rc,
hitbox: Hitbox,
- text_hitbox: Hitbox,
gutter_hitbox: Hitbox,
content_origin: gpui::Point,
scrollbars_layout: AxisPair>,
@@ -7941,15 +7872,17 @@ struct CreaseTrailerLayout {
bounds: Bounds,
}
-struct PositionMap {
- size: Size,
- line_height: Pixels,
- scroll_pixel_position: gpui::Point,
- scroll_max: gpui::Point,
- em_width: Pixels,
- em_advance: Pixels,
- line_layouts: Vec,
- snapshot: EditorSnapshot,
+pub(crate) struct PositionMap {
+ pub size: Size,
+ pub line_height: Pixels,
+ pub scroll_pixel_position: gpui::Point,
+ pub scroll_max: gpui::Point,
+ pub em_width: Pixels,
+ pub em_advance: Pixels,
+ pub line_layouts: Vec,
+ pub snapshot: EditorSnapshot,
+ pub text_hitbox: Hitbox,
+ pub gutter_hitbox: Hitbox,
}
#[derive(Debug, Copy, Clone)]
@@ -7971,11 +7904,8 @@ impl PointForPosition {
}
impl PositionMap {
- fn point_for_position(
- &self,
- text_bounds: Bounds,
- position: gpui::Point,
- ) -> PointForPosition {
+ pub(crate) fn point_for_position(&self, position: gpui::Point) -> PointForPosition {
+ let text_bounds = self.text_hitbox.bounds;
let scroll_position = self.snapshot.scroll_position();
let position = position - text_bounds.origin;
let y = position.y.max(px(0.)).min(self.size.height);
@@ -8245,6 +8175,7 @@ impl HighlightedRange {
let top_curve_width = curve_width(first_line.start_x, first_line.end_x);
let mut builder = gpui::PathBuilder::fill();
+ builder.move_to(first_top_right - top_curve_width);
builder.curve_to(first_top_right + curve_height, first_top_right);
let mut iter = lines.iter().enumerate().peekable();
diff --git a/crates/editor/src/git/blame.rs b/crates/editor/src/git/blame.rs
index b3680c891fc10e7b8f56ee3c7a2e2d2a9e7639a7..767c1eabb9e0e09756037d5b44ca7740cac4a017 100644
--- a/crates/editor/src/git/blame.rs
+++ b/crates/editor/src/git/blame.rs
@@ -560,7 +560,7 @@ mod tests {
use settings::SettingsStore;
use std::{cmp, env, ops::Range, path::Path};
use unindent::Unindent as _;
- use util::RandomCharIter;
+ use util::{path, RandomCharIter};
// macro_rules! assert_blame_rows {
// ($blame:expr, $rows:expr, $expected:expr, $cx:expr) => {
@@ -697,7 +697,7 @@ mod tests {
fs.set_blame_for_repo(
Path::new("/my-repo/.git"),
vec![(
- Path::new("file.txt"),
+ "file.txt".into(),
Blame {
entries: vec![
blame_entry("1b1b1b", 0..1),
@@ -793,7 +793,7 @@ mod tests {
let fs = FakeFs::new(cx.executor());
fs.insert_tree(
- "/my-repo",
+ path!("/my-repo"),
json!({
".git": {},
"file.txt": r#"
@@ -807,9 +807,9 @@ mod tests {
.await;
fs.set_blame_for_repo(
- Path::new("/my-repo/.git"),
+ Path::new(path!("/my-repo/.git")),
vec![(
- Path::new("file.txt"),
+ "file.txt".into(),
Blame {
entries: vec![blame_entry("1b1b1b", 0..4)],
..Default::default()
@@ -817,10 +817,10 @@ mod tests {
)],
);
- let project = Project::test(fs, ["/my-repo".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/my-repo").as_ref()], cx).await;
let buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer("/my-repo/file.txt", cx)
+ project.open_local_buffer(path!("/my-repo/file.txt"), cx)
})
.await
.unwrap();
@@ -945,7 +945,7 @@ mod tests {
log::info!("initial buffer text: {:?}", buffer_initial_text);
fs.insert_tree(
- "/my-repo",
+ path!("/my-repo"),
json!({
".git": {},
"file.txt": buffer_initial_text.to_string()
@@ -956,9 +956,9 @@ mod tests {
let blame_entries = gen_blame_entries(buffer_initial_text.max_point().row, &mut rng);
log::info!("initial blame entries: {:?}", blame_entries);
fs.set_blame_for_repo(
- Path::new("/my-repo/.git"),
+ Path::new(path!("/my-repo/.git")),
vec![(
- Path::new("file.txt"),
+ "file.txt".into(),
Blame {
entries: blame_entries,
..Default::default()
@@ -966,10 +966,10 @@ mod tests {
)],
);
- let project = Project::test(fs.clone(), ["/my-repo".as_ref()], cx).await;
+ let project = Project::test(fs.clone(), [path!("/my-repo").as_ref()], cx).await;
let buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer("/my-repo/file.txt", cx)
+ project.open_local_buffer(path!("/my-repo/file.txt"), cx)
})
.await
.unwrap();
@@ -998,9 +998,9 @@ mod tests {
log::info!("regenerating blame entries: {:?}", blame_entries);
fs.set_blame_for_repo(
- Path::new("/my-repo/.git"),
+ Path::new(path!("/my-repo/.git")),
vec![(
- Path::new("file.txt"),
+ "file.txt".into(),
Blame {
entries: blame_entries,
..Default::default()
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 0442669e5eecaa4150cf4d8e75719e352724f060..b0e4abcb32f4a4c3ee999061da00c65315b3b0df 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -921,7 +921,7 @@ mod tests {
use indoc::indoc;
use language::language_settings::InlayHintSettings;
use lsp::request::{GotoDefinition, GotoTypeDefinition};
- use util::assert_set_eq;
+ use util::{assert_set_eq, path};
use workspace::item::Item;
#[gpui::test]
@@ -1574,18 +1574,31 @@ mod tests {
// Insert a new file
let fs = cx.update_workspace(|workspace, _, cx| workspace.project().read(cx).fs().clone());
fs.as_fake()
- .insert_file("/root/dir/file2.rs", "This is file2.rs".as_bytes().to_vec())
+ .insert_file(
+ path!("/root/dir/file2.rs"),
+ "This is file2.rs".as_bytes().to_vec(),
+ )
.await;
+ #[cfg(not(target_os = "windows"))]
cx.set_state(indoc! {"
You can't go to a file that does_not_exist.txt.
Go to file2.rs if you want.
Or go to ../dir/file2.rs if you want.
Or go to /root/dir/file2.rs if project is local.
Or go to /root/dir/file2 if this is a Rust file.ˇ
+ "});
+ #[cfg(target_os = "windows")]
+ cx.set_state(indoc! {"
+ You can't go to a file that does_not_exist.txt.
+ Go to file2.rs if you want.
+ Or go to ../dir/file2.rs if you want.
+ Or go to C:/root/dir/file2.rs if project is local.
+ Or go to C:/root/dir/file2 if this is a Rust file.ˇ
"});
// File does not exist
+ #[cfg(not(target_os = "windows"))]
let screen_coord = cx.pixel_position(indoc! {"
You can't go to a file that dˇoes_not_exist.txt.
Go to file2.rs if you want.
@@ -1593,6 +1606,14 @@ mod tests {
Or go to /root/dir/file2.rs if project is local.
Or go to /root/dir/file2 if this is a Rust file.
"});
+ #[cfg(target_os = "windows")]
+ let screen_coord = cx.pixel_position(indoc! {"
+ You can't go to a file that dˇoes_not_exist.txt.
+ Go to file2.rs if you want.
+ Or go to ../dir/file2.rs if you want.
+ Or go to C:/root/dir/file2.rs if project is local.
+ Or go to C:/root/dir/file2 if this is a Rust file.
+ "});
cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
// No highlight
cx.update_editor(|editor, window, cx| {
@@ -1605,6 +1626,7 @@ mod tests {
});
// Moving the mouse over a file that does exist should highlight it.
+ #[cfg(not(target_os = "windows"))]
let screen_coord = cx.pixel_position(indoc! {"
You can't go to a file that does_not_exist.txt.
Go to fˇile2.rs if you want.
@@ -1612,8 +1634,17 @@ mod tests {
Or go to /root/dir/file2.rs if project is local.
Or go to /root/dir/file2 if this is a Rust file.
"});
+ #[cfg(target_os = "windows")]
+ let screen_coord = cx.pixel_position(indoc! {"
+ You can't go to a file that does_not_exist.txt.
+ Go to fˇile2.rs if you want.
+ Or go to ../dir/file2.rs if you want.
+ Or go to C:/root/dir/file2.rs if project is local.
+ Or go to C:/root/dir/file2 if this is a Rust file.
+ "});
cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
+ #[cfg(not(target_os = "windows"))]
cx.assert_editor_text_highlights::(indoc! {"
You can't go to a file that does_not_exist.txt.
Go to «file2.rsˇ» if you want.
@@ -1621,8 +1652,17 @@ mod tests {
Or go to /root/dir/file2.rs if project is local.
Or go to /root/dir/file2 if this is a Rust file.
"});
+ #[cfg(target_os = "windows")]
+ cx.assert_editor_text_highlights::(indoc! {"
+ You can't go to a file that does_not_exist.txt.
+ Go to «file2.rsˇ» if you want.
+ Or go to ../dir/file2.rs if you want.
+ Or go to C:/root/dir/file2.rs if project is local.
+ Or go to C:/root/dir/file2 if this is a Rust file.
+ "});
// Moving the mouse over a relative path that does exist should highlight it
+ #[cfg(not(target_os = "windows"))]
let screen_coord = cx.pixel_position(indoc! {"
You can't go to a file that does_not_exist.txt.
Go to file2.rs if you want.
@@ -1630,8 +1670,17 @@ mod tests {
Or go to /root/dir/file2.rs if project is local.
Or go to /root/dir/file2 if this is a Rust file.
"});
+ #[cfg(target_os = "windows")]
+ let screen_coord = cx.pixel_position(indoc! {"
+ You can't go to a file that does_not_exist.txt.
+ Go to file2.rs if you want.
+ Or go to ../dir/fˇile2.rs if you want.
+ Or go to C:/root/dir/file2.rs if project is local.
+ Or go to C:/root/dir/file2 if this is a Rust file.
+ "});
cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
+ #[cfg(not(target_os = "windows"))]
cx.assert_editor_text_highlights::(indoc! {"
You can't go to a file that does_not_exist.txt.
Go to file2.rs if you want.
@@ -1639,8 +1688,17 @@ mod tests {
Or go to /root/dir/file2.rs if project is local.
Or go to /root/dir/file2 if this is a Rust file.
"});
+ #[cfg(target_os = "windows")]
+ cx.assert_editor_text_highlights::(indoc! {"
+ You can't go to a file that does_not_exist.txt.
+ Go to file2.rs if you want.
+ Or go to «../dir/file2.rsˇ» if you want.
+ Or go to C:/root/dir/file2.rs if project is local.
+ Or go to C:/root/dir/file2 if this is a Rust file.
+ "});
// Moving the mouse over an absolute path that does exist should highlight it
+ #[cfg(not(target_os = "windows"))]
let screen_coord = cx.pixel_position(indoc! {"
You can't go to a file that does_not_exist.txt.
Go to file2.rs if you want.
@@ -1649,7 +1707,17 @@ mod tests {
Or go to /root/dir/file2 if this is a Rust file.
"});
+ #[cfg(target_os = "windows")]
+ let screen_coord = cx.pixel_position(indoc! {"
+ You can't go to a file that does_not_exist.txt.
+ Go to file2.rs if you want.
+ Or go to ../dir/file2.rs if you want.
+ Or go to C:/root/diˇr/file2.rs if project is local.
+ Or go to C:/root/dir/file2 if this is a Rust file.
+ "});
+
cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
+ #[cfg(not(target_os = "windows"))]
cx.assert_editor_text_highlights::(indoc! {"
You can't go to a file that does_not_exist.txt.
Go to file2.rs if you want.
@@ -1657,8 +1725,17 @@ mod tests {
Or go to «/root/dir/file2.rsˇ» if project is local.
Or go to /root/dir/file2 if this is a Rust file.
"});
+ #[cfg(target_os = "windows")]
+ cx.assert_editor_text_highlights::(indoc! {"
+ You can't go to a file that does_not_exist.txt.
+ Go to file2.rs if you want.
+ Or go to ../dir/file2.rs if you want.
+ Or go to «C:/root/dir/file2.rsˇ» if project is local.
+ Or go to C:/root/dir/file2 if this is a Rust file.
+ "});
// Moving the mouse over a path that exists, if we add the language-specific suffix, it should highlight it
+ #[cfg(not(target_os = "windows"))]
let screen_coord = cx.pixel_position(indoc! {"
You can't go to a file that does_not_exist.txt.
Go to file2.rs if you want.
@@ -1666,8 +1743,17 @@ mod tests {
Or go to /root/dir/file2.rs if project is local.
Or go to /root/diˇr/file2 if this is a Rust file.
"});
+ #[cfg(target_os = "windows")]
+ let screen_coord = cx.pixel_position(indoc! {"
+ You can't go to a file that does_not_exist.txt.
+ Go to file2.rs if you want.
+ Or go to ../dir/file2.rs if you want.
+ Or go to C:/root/dir/file2.rs if project is local.
+ Or go to C:/root/diˇr/file2 if this is a Rust file.
+ "});
cx.simulate_mouse_move(screen_coord, None, Modifiers::secondary_key());
+ #[cfg(not(target_os = "windows"))]
cx.assert_editor_text_highlights::(indoc! {"
You can't go to a file that does_not_exist.txt.
Go to file2.rs if you want.
@@ -1675,6 +1761,14 @@ mod tests {
Or go to /root/dir/file2.rs if project is local.
Or go to «/root/dir/file2ˇ» if this is a Rust file.
"});
+ #[cfg(target_os = "windows")]
+ cx.assert_editor_text_highlights::(indoc! {"
+ You can't go to a file that does_not_exist.txt.
+ Go to file2.rs if you want.
+ Or go to ../dir/file2.rs if you want.
+ Or go to C:/root/dir/file2.rs if project is local.
+ Or go to «C:/root/dir/file2ˇ» if this is a Rust file.
+ "});
cx.simulate_click(screen_coord, Modifiers::secondary_key());
@@ -1692,7 +1786,10 @@ mod tests {
let file = buffer.read(cx).file().unwrap();
let file_path = file.as_local().unwrap().abs_path(cx);
- assert_eq!(file_path.to_str().unwrap(), "/root/dir/file2.rs");
+ assert_eq!(
+ file_path,
+ std::path::PathBuf::from(path!("/root/dir/file2.rs"))
+ );
});
}
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 2f1f00715e11c461f8900053af862ee6b37fbb6e..128ee45341682e4dbf5a3f0561337d46c13c642d 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -279,9 +279,10 @@ fn show_hover(
delay.await;
}
+ let offset = anchor.to_offset(&snapshot.buffer_snapshot);
let local_diagnostic = snapshot
.buffer_snapshot
- .diagnostics_in_range::<_, usize>(anchor..anchor)
+ .diagnostics_in_range::(offset..offset)
// Find the entry with the most specific range
.min_by_key(|entry| entry.range.len());
@@ -597,7 +598,7 @@ async fn parse_blocks(
},
syntax: cx.theme().syntax().clone(),
selection_background_color: { cx.theme().players().local().selection },
- break_style: Default::default(),
+
heading: StyleRefinement::default()
.font_weight(FontWeight::BOLD)
.text_base()
@@ -884,8 +885,10 @@ mod tests {
let slice = data;
for (range, event) in slice.iter() {
- if [MarkdownEvent::Text, MarkdownEvent::Code].contains(event) {
- rendered_text.push_str(&text[range.clone()])
+ match event {
+ MarkdownEvent::Text(parsed) => rendered_text.push_str(parsed),
+ MarkdownEvent::Code => rendered_text.push_str(&text[range.clone()]),
+ _ => {}
}
}
}
diff --git a/crates/editor/src/hunk_diff.rs b/crates/editor/src/hunk_diff.rs
index d6e6be1c863ead9f50e44e73b237a72b219a3552..8bed3e2ccb8054427e35db0ba264c23152cafcef 100644
--- a/crates/editor/src/hunk_diff.rs
+++ b/crates/editor/src/hunk_diff.rs
@@ -56,7 +56,7 @@ pub(super) struct ExpandedHunk {
pub(crate) struct DiffMapSnapshot(TreeMap);
pub(crate) struct DiffBaseState {
- pub(crate) change_set: Model,
+ pub(crate) diff: Model,
pub(crate) last_version: Option,
_subscription: Subscription,
}
@@ -80,38 +80,29 @@ impl DiffMap {
self.snapshot.clone()
}
- pub fn add_change_set(
+ pub fn add_diff(
&mut self,
- change_set: Model,
+ diff: Model,
window: &mut Window,
cx: &mut Context,
) {
- let buffer_id = change_set.read(cx).buffer_id;
+ let buffer_id = diff.read(cx).buffer_id;
self.snapshot
.0
- .insert(buffer_id, change_set.read(cx).diff_to_buffer.clone());
+ .insert(buffer_id, diff.read(cx).diff_to_buffer.clone());
self.diff_bases.insert(
buffer_id,
DiffBaseState {
last_version: None,
- _subscription: cx.observe_in(
- &change_set,
- window,
- move |editor, change_set, window, cx| {
- editor
- .diff_map
- .snapshot
- .0
- .insert(buffer_id, change_set.read(cx).diff_to_buffer.clone());
- Editor::sync_expanded_diff_hunks(
- &mut editor.diff_map,
- buffer_id,
- window,
- cx,
- );
- },
- ),
- change_set,
+ _subscription: cx.observe_in(&diff, window, move |editor, diff, window, cx| {
+ editor
+ .diff_map
+ .snapshot
+ .0
+ .insert(buffer_id, diff.read(cx).diff_to_buffer.clone());
+ Editor::sync_expanded_diff_hunks(&mut editor.diff_map, buffer_id, window, cx);
+ }),
+ diff,
},
);
Editor::sync_expanded_diff_hunks(self, buffer_id, window, cx);
@@ -399,7 +390,7 @@ impl Editor {
self.diff_map
.diff_bases
.get(&buffer_id)?
- .change_set
+ .diff
.read(cx)
.base_text
.clone()
@@ -953,12 +944,12 @@ impl Editor {
let mut diff_base_buffer = None;
let mut diff_base_buffer_unchanged = true;
if let Some(diff_base_state) = diff_base_state {
- diff_base_state.change_set.update(cx, |change_set, _| {
- if diff_base_state.last_version != Some(change_set.base_text_version) {
- diff_base_state.last_version = Some(change_set.base_text_version);
+ diff_base_state.diff.update(cx, |diff, _| {
+ if diff_base_state.last_version != Some(diff.base_text_version) {
+ diff_base_state.last_version = Some(diff.base_text_version);
diff_base_buffer_unchanged = false;
}
- diff_base_buffer = change_set.base_text.clone();
+ diff_base_buffer = diff.base_text.clone();
})
}
@@ -1498,14 +1489,14 @@ mod tests {
(buffer_1.clone(), diff_base_1),
(buffer_2.clone(), diff_base_2),
] {
- let change_set = cx.new(|cx| {
+ let diff = cx.new(|cx| {
BufferChangeSet::new_with_base_text(
diff_base.to_string(),
buffer.read(cx).text_snapshot(),
cx,
)
});
- editor.diff_map.add_change_set(change_set, window, cx)
+ editor.diff_map.add_diff(diff, window, cx)
}
})
.unwrap();
diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index 3b325a58025b76c0a3e472f682f38d693697146a..e6789c3a3abf85c255f2e7ff530b70d1dcde809e 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -1274,6 +1274,7 @@ pub mod tests {
use settings::SettingsStore;
use std::sync::atomic::{AtomicBool, AtomicU32, AtomicUsize, Ordering};
use text::Point;
+ use util::path;
use super::*;
@@ -1499,7 +1500,7 @@ pub mod tests {
let fs = FakeFs::new(cx.background_executor.clone());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out",
"other.md": "Test md file with some text",
@@ -1507,7 +1508,7 @@ pub mod tests {
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
let mut rs_fake_servers = None;
@@ -1542,14 +1543,16 @@ pub mod tests {
"Rust" => {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/a/main.rs").unwrap(),
+ lsp::Url::from_file_path(path!("/a/main.rs"))
+ .unwrap(),
);
rs_lsp_request_count.fetch_add(1, Ordering::Release) + 1
}
"Markdown" => {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/a/other.md").unwrap(),
+ lsp::Url::from_file_path(path!("/a/other.md"))
+ .unwrap(),
);
md_lsp_request_count.fetch_add(1, Ordering::Release) + 1
}
@@ -1585,7 +1588,7 @@ pub mod tests {
let rs_buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer("/a/main.rs", cx)
+ project.open_local_buffer(path!("/a/main.rs"), cx)
})
.await
.unwrap();
@@ -1611,7 +1614,7 @@ pub mod tests {
cx.executor().run_until_parked();
let md_buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer("/a/other.md", cx)
+ project.open_local_buffer(path!("/a/other.md"), cx)
})
.await
.unwrap();
@@ -2173,7 +2176,7 @@ pub mod tests {
let fs = FakeFs::new(cx.background_executor.clone());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": format!("fn main() {{\n{}\n}}", "let i = 5;\n".repeat(500)),
"other.rs": "// Test file",
@@ -2181,7 +2184,7 @@ pub mod tests {
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(rust_lang());
@@ -2209,7 +2212,7 @@ pub mod tests {
async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/a/main.rs").unwrap(),
+ lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
);
task_lsp_request_ranges.lock().push(params.range);
@@ -2237,7 +2240,7 @@ pub mod tests {
let buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer("/a/main.rs", cx)
+ project.open_local_buffer(path!("/a/main.rs"), cx)
})
.await
.unwrap();
@@ -2471,7 +2474,7 @@ pub mod tests {
let fs = FakeFs::new(cx.background_executor.clone());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|i| format!("let i = {i};\n")).collect::>().join("")),
"other.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|j| format!("let j = {j};\n")).collect::>().join("")),
@@ -2479,7 +2482,7 @@ pub mod tests {
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
let language = rust_lang();
@@ -2497,13 +2500,13 @@ pub mod tests {
let (buffer_1, _handle1) = project
.update(cx, |project, cx| {
- project.open_local_buffer_with_lsp("/a/main.rs", cx)
+ project.open_local_buffer_with_lsp(path!("/a/main.rs"), cx)
})
.await
.unwrap();
let (buffer_2, _handle2) = project
.update(cx, |project, cx| {
- project.open_local_buffer_with_lsp("/a/other.rs", cx)
+ project.open_local_buffer_with_lsp(path!("/a/other.rs"), cx)
})
.await
.unwrap();
@@ -2585,11 +2588,11 @@ pub mod tests {
let task_editor_edited = Arc::clone(&closure_editor_edited);
async move {
let hint_text = if params.text_document.uri
- == lsp::Url::from_file_path("/a/main.rs").unwrap()
+ == lsp::Url::from_file_path(path!("/a/main.rs")).unwrap()
{
"main hint"
} else if params.text_document.uri
- == lsp::Url::from_file_path("/a/other.rs").unwrap()
+ == lsp::Url::from_file_path(path!("/a/other.rs")).unwrap()
{
"other hint"
} else {
@@ -2815,7 +2818,7 @@ pub mod tests {
let fs = FakeFs::new(cx.background_executor.clone());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|i| format!("let i = {i};\n")).collect::>().join("")),
"other.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|j| format!("let j = {j};\n")).collect::>().join("")),
@@ -2823,7 +2826,7 @@ pub mod tests {
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(rust_lang());
@@ -2840,13 +2843,13 @@ pub mod tests {
let (buffer_1, _handle) = project
.update(cx, |project, cx| {
- project.open_local_buffer_with_lsp("/a/main.rs", cx)
+ project.open_local_buffer_with_lsp(path!("/a/main.rs"), cx)
})
.await
.unwrap();
let (buffer_2, _handle2) = project
.update(cx, |project, cx| {
- project.open_local_buffer_with_lsp("/a/other.rs", cx)
+ project.open_local_buffer_with_lsp(path!("/a/other.rs"), cx)
})
.await
.unwrap();
@@ -2886,11 +2889,11 @@ pub mod tests {
let task_editor_edited = Arc::clone(&closure_editor_edited);
async move {
let hint_text = if params.text_document.uri
- == lsp::Url::from_file_path("/a/main.rs").unwrap()
+ == lsp::Url::from_file_path(path!("/a/main.rs")).unwrap()
{
"main hint"
} else if params.text_document.uri
- == lsp::Url::from_file_path("/a/other.rs").unwrap()
+ == lsp::Url::from_file_path(path!("/a/other.rs")).unwrap()
{
"other hint"
} else {
@@ -3027,7 +3030,7 @@ pub mod tests {
let fs = FakeFs::new(cx.background_executor.clone());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": format!(r#"fn main() {{\n{}\n}}"#, format!("let i = {};\n", "√".repeat(10)).repeat(500)),
"other.rs": "// Test file",
@@ -3035,7 +3038,7 @@ pub mod tests {
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(rust_lang());
@@ -3054,7 +3057,7 @@ pub mod tests {
async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/a/main.rs").unwrap(),
+ lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
);
let query_start = params.range.start;
Ok(Some(vec![lsp::InlayHint {
@@ -3077,7 +3080,7 @@ pub mod tests {
let buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer("/a/main.rs", cx)
+ project.open_local_buffer(path!("/a/main.rs"), cx)
})
.await
.unwrap();
@@ -3250,7 +3253,7 @@ pub mod tests {
let fs = FakeFs::new(cx.background_executor.clone());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": "fn main() {
let x = 42;
@@ -3265,7 +3268,7 @@ pub mod tests {
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(rust_lang());
@@ -3281,7 +3284,7 @@ pub mod tests {
move |params, _| async move {
assert_eq!(
params.text_document.uri,
- lsp::Url::from_file_path("/a/main.rs").unwrap(),
+ lsp::Url::from_file_path(path!("/a/main.rs")).unwrap(),
);
Ok(Some(
serde_json::from_value(json!([
@@ -3351,7 +3354,7 @@ pub mod tests {
let buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer("/a/main.rs", cx)
+ project.open_local_buffer(path!("/a/main.rs"), cx)
})
.await
.unwrap();
@@ -3408,7 +3411,7 @@ pub mod tests {
) -> (&'static str, WindowHandle, FakeLanguageServer) {
let fs = FakeFs::new(cx.background_executor.clone());
fs.insert_tree(
- "/a",
+ path!("/a"),
json!({
"main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out",
"other.rs": "// Test file",
@@ -3416,8 +3419,8 @@ pub mod tests {
)
.await;
- let project = Project::test(fs, ["/a".as_ref()], cx).await;
- let file_path = "/a/main.rs";
+ let project = Project::test(fs, [path!("/a").as_ref()], cx).await;
+ let file_path = path!("/a/main.rs");
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
language_registry.add(rust_lang());
@@ -3435,7 +3438,7 @@ pub mod tests {
let buffer = project
.update(cx, |project, cx| {
- project.open_local_buffer("/a/main.rs", cx)
+ project.open_local_buffer(path!("/a/main.rs"), cx)
})
.await
.unwrap();
diff --git a/crates/editor/src/inline_completion_tests.rs b/crates/editor/src/inline_completion_tests.rs
index 40f77bd35b97f1b049e684282132d69762b76dbc..258a8780944052a1c398fba33cce843cc585de6d 100644
--- a/crates/editor/src/inline_completion_tests.rs
+++ b/crates/editor/src/inline_completion_tests.rs
@@ -1,8 +1,9 @@
use gpui::{prelude::*, Entity};
use indoc::indoc;
-use inline_completion::InlineCompletionProvider;
+use inline_completion::EditPredictionProvider;
use language::{Language, LanguageConfig};
use multi_buffer::{Anchor, MultiBufferSnapshot, ToPoint};
+use project::Project;
use std::{num::NonZeroU32, ops::Range, sync::Arc};
use text::{Point, ToOffset};
@@ -314,7 +315,7 @@ fn assert_editor_active_move_completion(
fn accept_completion(cx: &mut EditorTestContext) {
cx.update_editor(|editor, window, cx| {
- editor.accept_inline_completion(&crate::AcceptInlineCompletion, window, cx)
+ editor.accept_edit_prediction(&crate::AcceptEditPrediction, window, cx)
})
}
@@ -344,7 +345,7 @@ fn assign_editor_completion_provider(
cx: &mut EditorTestContext,
) {
cx.update_editor(|editor, window, cx| {
- editor.set_inline_completion_provider(Some(provider), window, cx);
+ editor.set_edit_prediction_provider(Some(provider), window, cx);
})
}
@@ -362,7 +363,7 @@ impl FakeInlineCompletionProvider {
}
}
-impl InlineCompletionProvider for FakeInlineCompletionProvider {
+impl EditPredictionProvider for FakeInlineCompletionProvider {
fn name() -> &'static str {
"fake-completion-provider"
}
@@ -375,10 +376,6 @@ impl InlineCompletionProvider for FakeInlineCompletionProvider {
false
}
- fn show_completions_in_normal_mode() -> bool {
- false
- }
-
fn is_enabled(
&self,
_buffer: &gpui::Entity