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

Do not enable copilot for always read-only editors (#16356)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2024-08-16 17:22:47 +03:00 • committed by GitHub
parent 0fe22f2a48
commit f1a2638d29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/assistant/src/inline_assistant.rs
View file

@ -1109,6 +1109,7 @@ impl InlineAssistant {
editor.set_show_gutter(false, cx); editor.set_show_gutter(false, cx);
editor.scroll_manager.set_forbid_vertical_scroll(true); editor.scroll_manager.set_forbid_vertical_scroll(true);
editor.set_read_only(true); editor.set_read_only(true);
editor.set_show_inline_completions(false);
editor.highlight_rows::<DeletedLines>( editor.highlight_rows::<DeletedLines>(
Anchor::min()..=Anchor::max(), Anchor::min()..=Anchor::max(),
Some(cx.theme().status().deleted_background), Some(cx.theme().status().deleted_background),

10
crates/assistant/src/prompt_library.rs
View file

@ -494,7 +494,10 @@ impl PromptLibrary {
let mut editor = Editor::auto_width(cx); let mut editor = Editor::auto_width(cx);
editor.set_placeholder_text("Untitled", cx); editor.set_placeholder_text("Untitled", cx);
editor.set_text(prompt_metadata.title.unwrap_or_default(), cx); editor.set_text(prompt_metadata.title.unwrap_or_default(), cx);
editor.set_read_only(prompt_id.is_built_in()); if prompt_id.is_built_in() {
editor.set_read_only(true);
editor.set_show_inline_completions(false);
}
editor editor
}); });
let body_editor = cx.new_view(|cx| { let body_editor = cx.new_view(|cx| {
@ -506,7 +509,10 @@ impl PromptLibrary {
}); });
let mut editor = Editor::for_buffer(buffer, None, cx); let mut editor = Editor::for_buffer(buffer, None, cx);
editor.set_read_only(prompt_id.is_built_in()); if prompt_id.is_built_in() {
editor.set_read_only(true);
editor.set_show_inline_completions(false);
}
editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx); editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
editor.set_show_gutter(false, cx); editor.set_show_gutter(false, cx);
editor.set_show_wrap_guides(false, cx); editor.set_show_wrap_guides(false, cx);

1
crates/assistant/src/workflow/step_view.rs
View file

@ -78,6 +78,7 @@ impl WorkflowStepView {
editor.set_show_wrap_guides(false, cx); editor.set_show_wrap_guides(false, cx);
editor.set_show_indent_guides(false, cx); editor.set_show_indent_guides(false, cx);
editor.set_read_only(true); editor.set_read_only(true);
editor.set_show_inline_completions(false);
editor.insert_blocks( editor.insert_blocks(
[ [
BlockProperties { BlockProperties {

21
crates/editor/src/hunk_diff.rs
View file

@ -777,19 +777,18 @@ fn editor_with_deleted_text(
}); });
let mut editor = Editor::for_multibuffer(multi_buffer, None, true, cx); let mut editor = Editor::for_multibuffer(multi_buffer, None, true, cx);
editor.soft_wrap_mode_override = Some(language::language_settings::SoftWrap::None); editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
editor.show_wrap_guides = Some(false); editor.set_show_wrap_guides(false, cx);
editor.show_gutter = false; editor.set_show_gutter(false, cx);
editor.scroll_manager.set_forbid_vertical_scroll(true); editor.scroll_manager.set_forbid_vertical_scroll(true);
editor.set_read_only(true); editor.set_read_only(true);
editor.set_show_inline_completions(false);
let editor_snapshot = editor.snapshot(cx); editor.highlight_rows::<DiffRowHighlight>(
let start = editor_snapshot.buffer_snapshot.anchor_before(0); Anchor::min()..=Anchor::max(),
let end = editor_snapshot Some(deleted_color),
.buffer_snapshot false,
.anchor_after(editor.buffer.read(cx).len(cx)); cx,
);
editor.highlight_rows::<DiffRowHighlight>(start..=end, Some(deleted_color), false, cx);
let subscription_editor = parent_editor.clone(); let subscription_editor = parent_editor.clone();
editor._subscriptions.extend([ editor._subscriptions.extend([