# Conflicts: # crates/agent/src/tools/streaming_edit_file_tool.rs # crates/edit_prediction_cli/src/format_prompt.rs # crates/editor/src/bracket_colorization.rs # crates/editor/src/document_symbols.rs # crates/editor/src/editor.rs # crates/language/src/buffer.rs # crates/languages/src/cpp/config.toml # crates/languages/src/markdown/config.toml # crates/remote_server/src/remote_editing_tests.rs # typos.toml
Showing the changes to crates/buffer_diff/src/buffer_diff.rs (1 of 1090 files). Show all
Unified · Split
| @@ -1719,7 +1719,7 @@ impl BufferDiff { · 1718 unmodified lines | ||
| 1719 | 1719 | if let Some(language_registry) = language_registry { |
| 1720 | 1720 | base_text.set_language_registry(language_registry); |
| 1721 | 1721 | } |
| 1722 | − base_text.set_language(language, cx); | |
| 1722 | + base_text.set_language_async(language, cx); | |
| 1723 | 1723 | base_text.parsing_idle() |
| 1724 | 1724 | }); |
| 1725 | 1725 | cx.spawn(async move |this, cx| { |
| @@ -1751,6 +1751,7 @@ impl BufferDiff { · 25 unmodified lines | ||
| 1751 | 1751 | let should_compare_hunks = update.base_text_edits.is_some() || !base_text_changed; |
| 1752 | 1752 | let parsing_idle = if let Some(diff) = update.base_text_edits { |
| 1753 | 1753 | state.base_text.update(cx, |base_text, cx| { |
| 1754 | + base_text.set_sync_parse_timeout(None); | |
| 1754 | 1755 | base_text.set_capability(Capability::ReadWrite, cx); |
| 1755 | 1756 | base_text.apply_diff(diff, cx); |
| 1756 | 1757 | base_text.set_capability(Capability::ReadOnly, cx); |
| @@ -1758,6 +1759,7 @@ impl BufferDiff { · 1 unmodified line | ||
| 1758 | 1759 | }) |
| 1759 | 1760 | } else if update.base_text_changed { |
| 1760 | 1761 | state.base_text.update(cx, |base_text, cx| { |
| 1762 | + base_text.set_sync_parse_timeout(None); | |
| 1761 | 1763 | base_text.set_capability(Capability::ReadWrite, cx); |
| 1762 | 1764 | base_text.set_text(new_state.base_text.clone(), cx); |
| 1763 | 1765 | base_text.set_capability(Capability::ReadOnly, cx); |