@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 4
+version = 3
[[package]]
name = "activity_indicator"
@@ -118,9 +118,9 @@ checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
[[package]]
name = "allocator-api2"
-version = "0.2.20"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
[[package]]
name = "alsa"
@@ -284,7 +284,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -454,30 +454,53 @@ dependencies = [
name = "assistant2"
version = "0.1.0"
dependencies = [
+ "anthropic",
"anyhow",
+ "assets",
"assistant_tool",
+ "async-watch",
"chrono",
"client",
"collections",
"command_palette_hooks",
"context_server",
+ "db",
"editor",
"feature_flags",
+ "fs",
"futures 0.3.31",
"gpui",
+ "handlebars 4.5.0",
+ "indoc",
"language",
"language_model",
"language_model_selector",
"language_models",
"log",
+ "lsp",
"markdown",
+ "menu",
+ "multi_buffer",
+ "ollama",
+ "open_ai",
+ "ordered-float 2.10.1",
+ "parking_lot",
+ "paths",
"picker",
"project",
"proto",
+ "rand 0.8.5",
+ "rope",
+ "schemars",
"serde",
"serde_json",
+ "serde_json_lenient",
"settings",
+ "similar",
"smol",
+ "telemetry_events",
+ "terminal_view",
+ "text",
"theme",
"time",
"time_format",
@@ -486,6 +509,7 @@ dependencies = [
"util",
"uuid",
"workspace",
+ "zed_actions",
]
[[package]]
@@ -597,9 +621,9 @@ dependencies = [
[[package]]
name = "async-compression"
-version = "0.4.17"
+version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857"
+checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
dependencies = [
"deflate64",
"flate2",
@@ -627,7 +651,7 @@ checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.2.0",
+ "fastrand 2.3.0",
"futures-lite 2.5.0",
"slab",
]
@@ -703,7 +727,7 @@ dependencies = [
"futures-lite 2.5.0",
"parking",
"polling 3.7.4",
- "rustix 0.38.40",
+ "rustix 0.38.42",
"slab",
"tracing",
"windows-sys 0.59.0",
@@ -785,7 +809,7 @@ dependencies = [
"cfg-if",
"event-listener 3.1.0",
"futures-lite 1.13.0",
- "rustix 0.38.40",
+ "rustix 0.38.42",
"windows-sys 0.48.0",
]
@@ -804,7 +828,7 @@ dependencies = [
"cfg-if",
"event-listener 5.3.1",
"futures-lite 2.5.0",
- "rustix 0.38.40",
+ "rustix 0.38.42",
"tracing",
]
@@ -827,7 +851,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -842,7 +866,7 @@ dependencies = [
"cfg-if",
"futures-core",
"futures-io",
- "rustix 0.38.40",
+ "rustix 0.38.42",
"signal-hook-registry",
"slab",
"windows-sys 0.59.0",
@@ -895,7 +919,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -959,7 +983,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -980,13 +1004,16 @@ dependencies = [
[[package]]
name = "async-tungstenite"
-version = "0.28.0"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e661b6cb0a6eb34d02c520b052daa3aa9ac0cc02495c9d066bbce13ead132b"
+checksum = "e6cd055774e8b7f2ff9e5f9646efb298f180c3b886cdf20ef27f5a0bfbe2677b"
dependencies = [
"async-std",
"async-tls",
+ "atomic-waker",
+ "futures-core",
"futures-io",
+ "futures-task",
"futures-util",
"log",
"pin-project-lite",
@@ -1021,7 +1048,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233"
dependencies = [
- "bytes 1.8.0",
+ "bytes 1.9.0",
"futures-sink",
"futures-util",
"memchr",
@@ -1146,13 +1173,13 @@ dependencies = [
"aws-sdk-sts",
"aws-smithy-async",
"aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.60.7",
"aws-smithy-runtime",
"aws-smithy-runtime-api",
"aws-smithy-types",
"aws-types",
- "bytes 1.8.0",
- "fastrand 2.2.0",
+ "bytes 1.9.0",
+ "fastrand 2.3.0",
"hex",
"http 0.2.12",
"ring",
@@ -1177,9 +1204,9 @@ dependencies = [
[[package]]
name = "aws-runtime"
-version = "1.4.3"
+version = "1.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468"
+checksum = "b5ac934720fbb46206292d2c75b57e67acfc56fe7dfd34fb9a02334af08409ea"
dependencies = [
"aws-credential-types",
"aws-sigv4",
@@ -1190,8 +1217,8 @@ dependencies = [
"aws-smithy-runtime-api",
"aws-smithy-types",
"aws-types",
- "bytes 1.8.0",
- "fastrand 2.2.0",
+ "bytes 1.9.0",
+ "fastrand 2.3.0",
"http 0.2.12",
"http-body 0.4.6",
"once_cell",
@@ -1203,20 +1230,20 @@ dependencies = [
[[package]]
name = "aws-sdk-kinesis"
-version = "1.51.0"
+version = "1.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad48026d3d53881146469b36358d633f1b8c9ad6eb3033f348600f981f2f449b"
+checksum = "3e5d4932ecd8754ec808b57c13b5ab4965d2b568ae1c1984d1823a4e2aa3e7bc"
dependencies = [
"aws-credential-types",
"aws-runtime",
"aws-smithy-async",
"aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.61.1",
"aws-smithy-runtime",
"aws-smithy-runtime-api",
"aws-smithy-types",
"aws-types",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"http 0.2.12",
"once_cell",
"regex-lite",
@@ -1225,9 +1252,9 @@ dependencies = [
[[package]]
name = "aws-sdk-s3"
-version = "1.61.0"
+version = "1.65.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e531658a0397d22365dfe26c3e1c0c8448bf6a3a2d8a098ded802f2b1261615"
+checksum = "d3ba2c5c0f2618937ce3d4a5ad574b86775576fa24006bcb3128c6e2cbf3c34e"
dependencies = [
"aws-credential-types",
"aws-runtime",
@@ -1236,14 +1263,14 @@ dependencies = [
"aws-smithy-checksums",
"aws-smithy-eventstream",
"aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.61.1",
"aws-smithy-runtime",
"aws-smithy-runtime-api",
"aws-smithy-types",
"aws-smithy-xml",
"aws-types",
- "bytes 1.8.0",
- "fastrand 2.2.0",
+ "bytes 1.9.0",
+ "fastrand 2.3.0",
"hex",
"hmac",
"http 0.2.12",
@@ -1259,20 +1286,20 @@ dependencies = [
[[package]]
name = "aws-sdk-sso"
-version = "1.49.0"
+version = "1.50.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09677244a9da92172c8dc60109b4a9658597d4d298b188dd0018b6a66b410ca4"
+checksum = "05ca43a4ef210894f93096039ef1d6fa4ad3edfabb3be92b80908b9f2e4b4eab"
dependencies = [
"aws-credential-types",
"aws-runtime",
"aws-smithy-async",
"aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.61.1",
"aws-smithy-runtime",
"aws-smithy-runtime-api",
"aws-smithy-types",
"aws-types",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"http 0.2.12",
"once_cell",
"regex-lite",
@@ -1281,20 +1308,20 @@ dependencies = [
[[package]]
name = "aws-sdk-ssooidc"
-version = "1.50.0"
+version = "1.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fea2f3a8bb3bd10932ae7ad59cc59f65f270fc9183a7e91f501dc5efbef7ee"
+checksum = "abaf490c2e48eed0bb8e2da2fb08405647bd7f253996e0f93b981958ea0f73b0"
dependencies = [
"aws-credential-types",
"aws-runtime",
"aws-smithy-async",
"aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.61.1",
"aws-smithy-runtime",
"aws-smithy-runtime-api",
"aws-smithy-types",
"aws-types",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"http 0.2.12",
"once_cell",
"regex-lite",
@@ -1303,15 +1330,15 @@ dependencies = [
[[package]]
name = "aws-sdk-sts"
-version = "1.50.0"
+version = "1.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ada54e5f26ac246dc79727def52f7f8ed38915cb47781e2a72213957dc3a7d5"
+checksum = "b68fde0d69c8bfdc1060ea7da21df3e39f6014da316783336deff0a9ec28f4bf"
dependencies = [
"aws-credential-types",
"aws-runtime",
"aws-smithy-async",
"aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.61.1",
"aws-smithy-query",
"aws-smithy-runtime",
"aws-smithy-runtime-api",
@@ -1326,22 +1353,22 @@ dependencies = [
[[package]]
name = "aws-sigv4"
-version = "1.2.5"
+version = "1.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1"
+checksum = "7d3820e0c08d0737872ff3c7c1f21ebbb6693d832312d6152bf18ef50a5471c2"
dependencies = [
"aws-credential-types",
"aws-smithy-eventstream",
"aws-smithy-http",
"aws-smithy-runtime-api",
"aws-smithy-types",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"crypto-bigint 0.5.5",
"form_urlencoded",
"hex",
"hmac",
"http 0.2.12",
- "http 1.1.0",
+ "http 1.2.0",
"once_cell",
"p256",
"percent-encoding",
@@ -1372,7 +1399,7 @@ checksum = "ba1a71073fca26775c8b5189175ea8863afb1c9ea2cceb02a5de5ad9dfbaa795"
dependencies = [
"aws-smithy-http",
"aws-smithy-types",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"crc32c",
"crc32fast",
"hex",
@@ -1392,7 +1419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90"
dependencies = [
"aws-smithy-types",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"crc32fast",
]
@@ -1405,7 +1432,7 @@ dependencies = [
"aws-smithy-eventstream",
"aws-smithy-runtime-api",
"aws-smithy-types",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"bytes-utils",
"futures-core",
"http 0.2.12",
@@ -1426,6 +1453,15 @@ dependencies = [
"aws-smithy-types",
]
+[[package]]
+name = "aws-smithy-json"
+version = "0.61.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee4e69cc50921eb913c6b662f8d909131bb3e6ad6cb6090d3a39b66fc5c52095"
+dependencies = [
+ "aws-smithy-types",
+]
+
[[package]]
name = "aws-smithy-query"
version = "0.60.7"
@@ -1438,16 +1474,16 @@ dependencies = [
[[package]]
name = "aws-smithy-runtime"
-version = "1.7.3"
+version = "1.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2"
+checksum = "9f20685047ca9d6f17b994a07f629c813f08b5bce65523e47124879e60103d45"
dependencies = [
"aws-smithy-async",
"aws-smithy-http",
"aws-smithy-runtime-api",
"aws-smithy-types",
- "bytes 1.8.0",
- "fastrand 2.2.0",
+ "bytes 1.9.0",
+ "fastrand 2.3.0",
"h2 0.3.26",
"http 0.2.12",
"http-body 0.4.6",
@@ -1471,9 +1507,9 @@ checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
dependencies = [
"aws-smithy-async",
"aws-smithy-types",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"http 0.2.12",
- "http 1.1.0",
+ "http 1.2.0",
"pin-project-lite",
"tokio",
"tracing",
@@ -1487,11 +1523,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510"
dependencies = [
"base64-simd",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"bytes-utils",
"futures-core",
"http 0.2.12",
- "http 1.1.0",
+ "http 1.2.0",
"http-body 0.4.6",
"http-body 1.0.1",
"http-body-util",
@@ -1539,7 +1575,7 @@ dependencies = [
"axum-core",
"base64 0.21.7",
"bitflags 1.3.2",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"futures-util",
"headers",
"http 0.2.12",
@@ -1572,7 +1608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
dependencies = [
"async-trait",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"futures-util",
"http 0.2.12",
"http-body 0.4.6",
@@ -1589,7 +1625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9a320103719de37b7b4da4c8eb629d4573f6bcfd3dfe80d3208806895ccf81d"
dependencies = [
"axum",
- "bytes 1.8.0",
+ "bytes 1.9.0",
"futures-util",
"http 0.2.12",
"mime",
@@ -1660,9 +1696,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
[[package]]
name = "bigdecimal"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f850665a0385e070b64c38d2354e6c104c8479c59868d1e48a0c13ee2c7a1c1"
+checksum = "7f31f3af01c5c65a07985c804d3366560e6fa7883d640a122819b14ec327482c"
dependencies = [
"autocfg",
"libm",
@@ -1698,7 +1734,7 @@ dependencies = [
"regex",
"rustc-hash 1.1.0",
"shlex",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -1822,7 +1858,7 @@ source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -1906,7 +1942,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -1924,9 +1960,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.11.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
+checksum = "786a307d683a5bf92e6fd5fd69a7eb613751668d1d8d67d802846dfe367c62c8"
dependencies = [
"memchr",
"regex-automata 0.4.9",
@@ -1990,7 +2026,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -2017,9 +2053,9 @@ dependencies = [
[[package]]
name = "bytes"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
[[package]]
name = "bytes-utils"
@@ -2027,7 +2063,7 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
dependencies = [
- "bytes 1.8.0",
+ "bytes 1.9.0",
"either",
]
@@ -2087,7 +2123,7 @@ dependencies = [
"bitflags 2.6.0",
"log",
"polling 3.7.4",
- "rustix 0.38.40",
+ "rustix 0.38.42",
"slab",
"thiserror 1.0.69",
]
@@ -2099,7 +2135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
dependencies = [
"calloop",
- "rustix 0.38.40",
+ "rustix 0.38.42",
"wayland-backend",
"wayland-client",
]
@@ -2115,50 +2151,50 @@ dependencies = [
[[package]]
name = "cap-fs-ext"
-version = "3.4.1"
+version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16619ada836f12897a72011fe99b03f0025b87a8dbbea4f3c9f89b458a23bf3"
+checksum = "7f78efdd7378980d79c0f36b519e51191742d2c9f91ffa5e228fba9f3806d2e1"
dependencies = [
"cap-primitives",
"cap-std",
- "io-lifetimes 2.0.3",
- "windows-sys 0.52.0",
+ "io-lifetimes 2.0.4",
+ "windows-sys 0.59.0",
]
[[package]]
name = "cap-net-ext"
-version = "3.4.1"
+version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "710b0eb776410a22c89a98f2f80b2187c2ac3a8206b99f3412332e63c9b09de0"
+checksum = "4ac68674a6042af2bcee1adad9f6abd432642cf03444ce3a5b36c3f39f23baf8"
dependencies = [
"cap-primitives",
"cap-std",
- "rustix 0.38.40",
+ "rustix 0.38.42",
"smallvec",
]
[[package]]
name = "cap-primitives"
-version = "3.4.1"
+version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82fa6c3f9773feab88d844aa50035a33fb6e7e7426105d2f4bb7aadc42a5f89a"
+checksum = "8fc15faeed2223d8b8e8cc1857f5861935a06d06713c4ac106b722ae9ce3c369"
dependencies = [
"ambient-authority",
"fs-set-times",
"io-extras",
- "io-lifetimes 2.0.3",
+ "io-lifetimes 2.0.4",
"ipnet",
"maybe-owned",
- "rustix 0.38.40",
- "windows-sys 0.52.0",
+ "rustix 0.38.42",
+ "windows-sys 0.59.0",
"winx",
]
[[package]]
name = "cap-rand"
-version = "3.4.1"
+version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53774d49369892b70184f8312e50c1b87edccb376691de4485b0ff554b27c36c"
+checksum = "dea13372b49df066d1ae654e5c6e41799c1efd9f6b36794b921e877ea4037977"
dependencies = [
"ambient-authority",
"rand 0.8.5",
@@ -2166,35 +2202,35 @@ dependencies = [
[[package]]
name = "cap-std"
-version = "3.4.1"
+version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f71b70818556b4fe2a10c7c30baac3f5f45e973f49fc2673d7c75c39d0baf5b"
+checksum = "c3dbd3e8e8d093d6ccb4b512264869e1281cdb032f7940bd50b2894f96f25609"
dependencies = [
"cap-primitives",
"io-extras",
- "io-lifetimes 2.0.3",
- "rustix 0.38.40",
+ "io-lifetimes 2.0.4",
+ "rustix 0.38.42",
]
[[package]]
name = "cap-time-ext"
-version = "3.4.1"
+version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69dd48afa2363f746c93f961c211f6f099fb594a3446b8097bc5f79db51b6816"
+checksum = "bd736b20fc033f564a1995fb82fc349146de43aabba19c7368b4cb17d8f9ea53"
dependencies = [
"ambient-authority",
"cap-primitives",
"iana-time-zone",
"once_cell",
- "rustix 0.38.40",
+ "rustix 0.38.42",
"winx",
]
[[package]]
name = "cargo-platform"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
dependencies = [
"serde",
]
@@ -2210,7 +2246,7 @@ dependencies = [
"semver",
"serde",
"serde_json",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
]
[[package]]
@@ -2245,22 +2281,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb"
dependencies = [
"heck 0.4.1",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
"log",
"proc-macro2",
"quote",
"serde",
"serde_json",
- "syn 2.0.87",
+ "syn 2.0.90",
"tempfile",
"toml 0.8.19",
]
[[package]]
name = "cc"
-version = "1.2.1"
+version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
+checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
dependencies = [
"jobserver",
"libc",
@@ -2335,9 +2371,9 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
dependencies = [
"android-tzdata",
"iana-time-zone",
@@ -2405,9 +2441,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.21"
+version = "4.5.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
dependencies = [
"clap_builder",
"clap_derive",
@@ -2415,9 +2451,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.21"
+version = "4.5.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
dependencies = [
"anstream",
"anstyle",
@@ -2444,14 +2480,14 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
name = "clap_lex"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
[[package]]
name = "cli"
@@ -2482,7 +2518,7 @@ dependencies = [
"anyhow",
"async-native-tls",
"async-recursion 0.3.2",
- "async-tungstenite 0.28.0",
+ "async-tungstenite 0.28.1",
"chrono",
"clock",
"cocoa 0.26.0",
@@ -2500,7 +2536,7 @@ dependencies = [
"release_channel",
"rpc",
"rustls 0.21.12",
- "rustls-native-certs 0.8.0",
+ "rustls-native-certs 0.8.1",
"schemars",
"serde",
"serde_json",
@@ -2614,7 +2650,7 @@ dependencies = [
"assistant_tool",
"async-stripe",
"async-trait",
- "async-tungstenite 0.28.0",
+ "async-tungstenite 0.28.1",
"audio",
"aws-config",
"aws-sdk-kinesis",
@@ -2777,7 +2813,7 @@ version = "4.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
dependencies = [
- "bytes 1.8.0",
+ "bytes 1.9.0",
"memchr",
]
@@ -3154,9 +3190,9 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
dependencies = [
"libc",
]
@@ -3441,7 +3477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
dependencies = [
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -3462,9 +3498,9 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
[[package]]
name = "cxx"
-version = "1.0.133"
+version = "1.0.134"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e1ec88093d2abd9cf1b09ffd979136b8e922bf31cad966a8fe0d73233112ef"
+checksum = "a5a32d755fe20281b46118ee4b507233311fb7a48a0cfd42f554b93640521a2f"
dependencies = [
"cc",
"cxxbridge-cmd",
@@ -3476,47 +3512,47 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.133"
+version = "1.0.134"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afa390d956ee7ccb41aeed7ed7856ab3ffb4fc587e7216be7e0f83e949b4e6c"
+checksum = "11645536ada5d1c8804312cbffc9ab950f2216154de431de930da47ca6955199"
dependencies = [
"cc",
"codespan-reporting",
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
name = "cxxbridge-cmd"
-version = "1.0.133"
+version = "1.0.134"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c23bfff654d6227cbc83de8e059d2f8678ede5fc3a6c5a35d5c379983cc61e6"
+checksum = "ebcc9c78e3c7289665aab921a2b394eaffe8bdb369aa18d81ffc0f534fd49385"
dependencies = [
"clap",
"codespan-reporting",
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.133"
+version = "1.0.134"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c01b36e22051bc6928a78583f1621abaaf7621561c2ada1b00f7878fbe2caa"
+checksum = "3a22a87bd9e78d7204d793261470a4c9d585154fddd251828d8aefbb5f74c3bf"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.133"
+version = "1.0.134"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6e14013136fac689345d17b9a6df55977251f11d333c0a571e8d963b55e1f95"
+checksum = "1dfdb020ff8787c5daf6e0dca743005cc8782868faeadfbabb8824ede5cb1c72"
dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -3639,7 +3675,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -3760,7 +3796,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -4032,7 +4068,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.87",
+ "syn 2.0.90",
]
[[package]]
@@ -4109,12 +4145,12 @@ dependencies = [
[[package]]
name = "errno"
-version = "0.3.9"
+version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
dependencies = [
"libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -4216,9 +4252,9 @@ dependencies = [
[[package]]
name = "event-listener-strategy"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
dependencies = [
"event-listener 5.3.1",
"pin-project-lite",
@@ -4419,9 +4455,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
[[package]]
name = "fd-lock"
@@ -0,0 +1,3851 @@
+use crate::{
+ assistant_settings::AssistantSettings,
+ prompts::PromptBuilder,
+ streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff},
+ CycleNextInlineAssist, CyclePreviousInlineAssist, ToggleInlineAssist,
+};
+use anyhow::{Context as _, Result};
+use client::{telemetry::Telemetry, ErrorExt};
+use collections::{hash_map, HashMap, HashSet, VecDeque};
+use editor::{
+ actions::{MoveDown, MoveUp, SelectAll},
+ display_map::{
+ BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
+ ToDisplayPoint,
+ },
+ Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorElement, EditorEvent, EditorMode,
+ EditorStyle, ExcerptId, ExcerptRange, GutterDimensions, MultiBuffer, MultiBufferSnapshot,
+ ToOffset as _, ToPoint,
+};
+use feature_flags::{FeatureFlagAppExt as _, ZedPro};
+use fs::Fs;
+use futures::{channel::mpsc, future::LocalBoxFuture, join, SinkExt, Stream, StreamExt};
+use gpui::{
+ anchored, deferred, point, AnyElement, AppContext, ClickEvent, CursorStyle, EventEmitter,
+ FocusHandle, FocusableView, FontWeight, Global, HighlightStyle, Model, ModelContext,
+ Subscription, Task, TextStyle, UpdateGlobal, View, ViewContext, WeakView, WindowContext,
+};
+use language::{Buffer, IndentKind, Point, Selection, TransactionId};
+use language_model::{
+ LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
+ LanguageModelTextStream, Role,
+};
+use language_model_selector::LanguageModelSelector;
+use language_models::report_assistant_event;
+use multi_buffer::MultiBufferRow;
+use parking_lot::Mutex;
+use project::{CodeAction, ProjectTransaction};
+use rope::Rope;
+use settings::{update_settings_file, Settings, SettingsStore};
+use smol::future::FutureExt;
+use std::{
+ cmp,
+ future::Future,
+ iter, mem,
+ ops::{Range, RangeInclusive},
+ pin::Pin,
+ sync::Arc,
+ task::{self, Poll},
+ time::Instant,
+};
+use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
+use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
+use text::{OffsetRangeExt, ToPoint as _};
+use theme::ThemeSettings;
+use ui::{prelude::*, CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, Tooltip};
+use util::{RangeExt, ResultExt};
+use workspace::{dock::Panel, ShowConfiguration};
+use workspace::{notifications::NotificationId, ItemHandle, Toast, Workspace};
+
+pub fn init(
+ fs: Arc<dyn Fs>,
+ prompt_builder: Arc<PromptBuilder>,
+ telemetry: Arc<Telemetry>,
+ cx: &mut AppContext,
+) {
+ cx.set_global(InlineAssistant::new(fs, prompt_builder, telemetry));
+ cx.observe_new_views(|workspace: &mut Workspace, cx| {
+ workspace.register_action(InlineAssistant::toggle_inline_assist);
+
+ let workspace = cx.view().clone();
+ InlineAssistant::update_global(cx, |inline_assistant, cx| {
+ inline_assistant.register_workspace(&workspace, cx)
+ })
+ })
+ .detach();
+}
+
+const PROMPT_HISTORY_MAX_LEN: usize = 20;
+
+enum InlineAssistTarget {
+ Editor(View<Editor>),
+ Terminal(View<TerminalView>),
+}
+
+pub struct InlineAssistant {
+ next_assist_id: InlineAssistId,
+ next_assist_group_id: InlineAssistGroupId,
+ assists: HashMap<InlineAssistId, InlineAssist>,
+ assists_by_editor: HashMap<WeakView<Editor>, EditorInlineAssists>,
+ assist_groups: HashMap<InlineAssistGroupId, InlineAssistGroup>,
+ confirmed_assists: HashMap<InlineAssistId, Model<CodegenAlternative>>,
+ prompt_history: VecDeque<String>,
+ prompt_builder: Arc<PromptBuilder>,
+ telemetry: Arc<Telemetry>,
+ fs: Arc<dyn Fs>,
+}
+
+impl Global for InlineAssistant {}
+
+impl InlineAssistant {
+ pub fn new(
+ fs: Arc<dyn Fs>,
+ prompt_builder: Arc<PromptBuilder>,
+ telemetry: Arc<Telemetry>,
+ ) -> Self {
+ Self {
+ next_assist_id: InlineAssistId::default(),
+ next_assist_group_id: InlineAssistGroupId::default(),
+ assists: HashMap::default(),
+ assists_by_editor: HashMap::default(),
+ assist_groups: HashMap::default(),
+ confirmed_assists: HashMap::default(),
+ prompt_history: VecDeque::default(),
+ prompt_builder,
+ telemetry,
+ fs,
+ }
+ }
+
+ pub fn register_workspace(&mut self, workspace: &View<Workspace>, cx: &mut WindowContext) {
+ cx.subscribe(workspace, |workspace, event, cx| {
+ Self::update_global(cx, |this, cx| {
+ this.handle_workspace_event(workspace, event, cx)
+ });
+ })
+ .detach();
+
+ let workspace = workspace.downgrade();
+ cx.observe_global::<SettingsStore>(move |cx| {
+ let Some(workspace) = workspace.upgrade() else {
+ return;
+ };
+ let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
+ return;
+ };
+ let enabled = AssistantSettings::get_global(cx).enabled;
+ terminal_panel.update(cx, |terminal_panel, cx| {
+ terminal_panel.asssistant_enabled(enabled, cx)
+ });
+ })
+ .detach();
+ }
+
+ fn handle_workspace_event(
+ &mut self,
+ workspace: View<Workspace>,
+ event: &workspace::Event,
+ cx: &mut WindowContext,
+ ) {
+ match event {
+ workspace::Event::UserSavedItem { item, .. } => {
+ // When the user manually saves an editor, automatically accepts all finished transformations.
+ if let Some(editor) = item.upgrade().and_then(|item| item.act_as::<Editor>(cx)) {
+ if let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) {
+ for assist_id in editor_assists.assist_ids.clone() {
+ let assist = &self.assists[&assist_id];
+ if let CodegenStatus::Done = assist.codegen.read(cx).status(cx) {
+ self.finish_assist(assist_id, false, cx)
+ }
+ }
+ }
+ }
+ }
+ workspace::Event::ItemAdded { item } => {
+ self.register_workspace_item(&workspace, item.as_ref(), cx);
+ }
+ _ => (),
+ }
+ }
+
+ fn register_workspace_item(
+ &mut self,
+ workspace: &View<Workspace>,
+ item: &dyn ItemHandle,
+ cx: &mut WindowContext,
+ ) {
+ if let Some(editor) = item.act_as::<Editor>(cx) {
+ editor.update(cx, |editor, cx| {
+ editor.push_code_action_provider(
+ Arc::new(AssistantCodeActionProvider {
+ editor: cx.view().downgrade(),
+ workspace: workspace.downgrade(),
+ }),
+ cx,
+ );
+ });
+ }
+ }
+
+ pub fn toggle_inline_assist(
+ workspace: &mut Workspace,
+ _action: &ToggleInlineAssist,
+ cx: &mut ViewContext<Workspace>,
+ ) {
+ let settings = AssistantSettings::get_global(cx);
+ if !settings.enabled {
+ return;
+ }
+
+ let Some(inline_assist_target) = Self::resolve_inline_assist_target(workspace, cx) else {
+ return;
+ };
+
+ let is_authenticated = || {
+ LanguageModelRegistry::read_global(cx)
+ .active_provider()
+ .map_or(false, |provider| provider.is_authenticated(cx))
+ };
+
+ let handle_assist = |cx: &mut ViewContext<Workspace>| {
+ match inline_assist_target {
+ InlineAssistTarget::Editor(active_editor) => {
+ InlineAssistant::update_global(cx, |assistant, cx| {
+ assistant.assist(&active_editor, Some(cx.view().downgrade()), cx)
+ })
+ }
+ InlineAssistTarget::Terminal(_active_terminal) => {
+ // TODO show the terminal inline assistant
+ }
+ }
+ };
+
+ if is_authenticated() {
+ handle_assist(cx);
+ } else {
+ cx.spawn(|_workspace, mut cx| async move {
+ let Some(task) = cx.update(|cx| {
+ LanguageModelRegistry::read_global(cx)
+ .active_provider()
+ .map_or(None, |provider| Some(provider.authenticate(cx)))
+ })?
+ else {
+ let answer = cx
+ .prompt(
+ gpui::PromptLevel::Warning,
+ "No language model provider configured",
+ None,
+ &["Configure", "Cancel"],
+ )
+ .await
+ .ok();
+ if let Some(answer) = answer {
+ if answer == 0 {
+ cx.update(|cx| cx.dispatch_action(Box::new(ShowConfiguration)))
+ .ok();
+ }
+ }
+ return Ok(());
+ };
+ task.await?;
+
+ anyhow::Ok(())
+ })
+ .detach_and_log_err(cx);
+
+ if is_authenticated() {
+ handle_assist(cx);
+ }
+ }
+ }
+
+ pub fn assist(
+ &mut self,
+ editor: &View<Editor>,
+ workspace: Option<WeakView<Workspace>>,
+ cx: &mut WindowContext,
+ ) {
+ let (snapshot, initial_selections) = editor.update(cx, |editor, cx| {
+ (
+ editor.buffer().read(cx).snapshot(cx),
+ editor.selections.all::<Point>(cx),
+ )
+ });
+
+ let mut selections = Vec::<Selection<Point>>::new();
+ let mut newest_selection = None;
+ for mut selection in initial_selections {
+ if selection.end > selection.start {
+ selection.start.column = 0;
+ // If the selection ends at the start of the line, we don't want to include it.
+ if selection.end.column == 0 {
+ selection.end.row -= 1;
+ }
+ selection.end.column = snapshot.line_len(MultiBufferRow(selection.end.row));
+ }
+
+ if let Some(prev_selection) = selections.last_mut() {
+ if selection.start <= prev_selection.end {
+ prev_selection.end = selection.end;
+ continue;
+ }
+ }
+
+ let latest_selection = newest_selection.get_or_insert_with(|| selection.clone());
+ if selection.id > latest_selection.id {
+ *latest_selection = selection.clone();
+ }
+ selections.push(selection);
+ }
+ let newest_selection = newest_selection.unwrap();
+
+ let mut codegen_ranges = Vec::new();
+ for (excerpt_id, buffer, buffer_range) in
+ snapshot.excerpts_in_ranges(selections.iter().map(|selection| {
+ snapshot.anchor_before(selection.start)..snapshot.anchor_after(selection.end)
+ }))
+ {
+ let start = Anchor {
+ buffer_id: Some(buffer.remote_id()),
+ excerpt_id,
+ text_anchor: buffer.anchor_before(buffer_range.start),
+ };
+ let end = Anchor {
+ buffer_id: Some(buffer.remote_id()),
+ excerpt_id,
+ text_anchor: buffer.anchor_after(buffer_range.end),
+ };
+ codegen_ranges.push(start..end);
+
+ if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
+ self.telemetry.report_assistant_event(AssistantEvent {
+ conversation_id: None,
+ kind: AssistantKind::Inline,
+ phase: AssistantPhase::Invoked,
+ message_id: None,
+ model: model.telemetry_id(),
+ model_provider: model.provider_id().to_string(),
+ response_latency: None,
+ error_message: None,
+ language_name: buffer.language().map(|language| language.name().to_proto()),
+ });
+ }
+ }
+
+ let assist_group_id = self.next_assist_group_id.post_inc();
+ let prompt_buffer = cx.new_model(|cx| {
+ MultiBuffer::singleton(cx.new_model(|cx| Buffer::local(String::new(), cx)), cx)
+ });
+
+ let mut assists = Vec::new();
+ let mut assist_to_focus = None;
+ for range in codegen_ranges {
+ let assist_id = self.next_assist_id.post_inc();
+ let codegen = cx.new_model(|cx| {
+ Codegen::new(
+ editor.read(cx).buffer().clone(),
+ range.clone(),
+ None,
+ self.telemetry.clone(),
+ self.prompt_builder.clone(),
+ cx,
+ )
+ });
+
+ let gutter_dimensions = Arc::new(Mutex::new(GutterDimensions::default()));
+ let prompt_editor = cx.new_view(|cx| {
+ PromptEditor::new(
+ assist_id,
+ gutter_dimensions.clone(),
+ self.prompt_history.clone(),
+ prompt_buffer.clone(),
+ codegen.clone(),
+ self.fs.clone(),
+ cx,
+ )
+ });
+
+ if assist_to_focus.is_none() {
+ let focus_assist = if newest_selection.reversed {
+ range.start.to_point(&snapshot) == newest_selection.start
+ } else {
+ range.end.to_point(&snapshot) == newest_selection.end
+ };
+ if focus_assist {
+ assist_to_focus = Some(assist_id);
+ }
+ }
+
+ let [prompt_block_id, end_block_id] =
+ self.insert_assist_blocks(editor, &range, &prompt_editor, cx);
+
+ assists.push((
+ assist_id,
+ range,
+ prompt_editor,
+ prompt_block_id,
+ end_block_id,
+ ));
+ }
+
+ let editor_assists = self
+ .assists_by_editor
+ .entry(editor.downgrade())
+ .or_insert_with(|| EditorInlineAssists::new(&editor, cx));
+ let mut assist_group = InlineAssistGroup::new();
+ for (assist_id, range, prompt_editor, prompt_block_id, end_block_id) in assists {
+ self.assists.insert(
+ assist_id,
+ InlineAssist::new(
+ assist_id,
+ assist_group_id,
+ editor,
+ &prompt_editor,
+ prompt_block_id,
+ end_block_id,
+ range,
+ prompt_editor.read(cx).codegen.clone(),
+ workspace.clone(),
+ cx,
+ ),
+ );
+ assist_group.assist_ids.push(assist_id);
+ editor_assists.assist_ids.push(assist_id);
+ }
+ self.assist_groups.insert(assist_group_id, assist_group);
+
+ if let Some(assist_id) = assist_to_focus {
+ self.focus_assist(assist_id, cx);
+ }
+ }
+
+ #[allow(clippy::too_many_arguments)]
+ pub fn suggest_assist(
+ &mut self,
+ editor: &View<Editor>,
+ mut range: Range<Anchor>,
+ initial_prompt: String,
+ initial_transaction_id: Option<TransactionId>,
+ focus: bool,
+ workspace: Option<WeakView<Workspace>>,
+ cx: &mut WindowContext,
+ ) -> InlineAssistId {
+ let assist_group_id = self.next_assist_group_id.post_inc();
+ let prompt_buffer = cx.new_model(|cx| Buffer::local(&initial_prompt, cx));
+ let prompt_buffer = cx.new_model(|cx| MultiBuffer::singleton(prompt_buffer, cx));
+
+ let assist_id = self.next_assist_id.post_inc();
+
+ let buffer = editor.read(cx).buffer().clone();
+ {
+ let snapshot = buffer.read(cx).read(cx);
+ range.start = range.start.bias_left(&snapshot);
+ range.end = range.end.bias_right(&snapshot);
+ }
+
+ let codegen = cx.new_model(|cx| {
+ Codegen::new(
+ editor.read(cx).buffer().clone(),
+ range.clone(),
+ initial_transaction_id,
+ self.telemetry.clone(),
+ self.prompt_builder.clone(),
+ cx,
+ )
+ });
+
+ let gutter_dimensions = Arc::new(Mutex::new(GutterDimensions::default()));
+ let prompt_editor = cx.new_view(|cx| {
+ PromptEditor::new(
+ assist_id,
+ gutter_dimensions.clone(),
+ self.prompt_history.clone(),
+ prompt_buffer.clone(),
+ codegen.clone(),
+ self.fs.clone(),
+ cx,
+ )
+ });
+
+ let [prompt_block_id, end_block_id] =
+ self.insert_assist_blocks(editor, &range, &prompt_editor, cx);
+
+ let editor_assists = self
+ .assists_by_editor
+ .entry(editor.downgrade())
+ .or_insert_with(|| EditorInlineAssists::new(&editor, cx));
+
+ let mut assist_group = InlineAssistGroup::new();
+ self.assists.insert(
+ assist_id,
+ InlineAssist::new(
+ assist_id,
+ assist_group_id,
+ editor,
+ &prompt_editor,
+ prompt_block_id,
+ end_block_id,
+ range,
+ prompt_editor.read(cx).codegen.clone(),
+ workspace.clone(),
+ cx,
+ ),
+ );
+ assist_group.assist_ids.push(assist_id);
+ editor_assists.assist_ids.push(assist_id);
+ self.assist_groups.insert(assist_group_id, assist_group);
+
+ if focus {
+ self.focus_assist(assist_id, cx);
+ }
+
+ assist_id
+ }
+
+ fn insert_assist_blocks(
+ &self,
+ editor: &View<Editor>,
+ range: &Range<Anchor>,
+ prompt_editor: &View<PromptEditor>,
+ cx: &mut WindowContext,
+ ) -> [CustomBlockId; 2] {
+ let prompt_editor_height = prompt_editor.update(cx, |prompt_editor, cx| {
+ prompt_editor
+ .editor
+ .update(cx, |editor, cx| editor.max_point(cx).row().0 + 1 + 2)
+ });
+ let assist_blocks = vec![
+ BlockProperties {
+ style: BlockStyle::Sticky,
+ placement: BlockPlacement::Above(range.start),
+ height: prompt_editor_height,
+ render: build_assist_editor_renderer(prompt_editor),
+ priority: 0,
+ },
+ BlockProperties {
+ style: BlockStyle::Sticky,
+ placement: BlockPlacement::Below(range.end),
+ height: 0,
+ render: Arc::new(|cx| {
+ v_flex()
+ .h_full()
+ .w_full()
+ .border_t_1()
+ .border_color(cx.theme().status().info_border)
+ .into_any_element()
+ }),
+ priority: 0,
+ },
+ ];
+
+ editor.update(cx, |editor, cx| {
+ let block_ids = editor.insert_blocks(assist_blocks, None, cx);
+ [block_ids[0], block_ids[1]]
+ })
+ }
+
+ fn handle_prompt_editor_focus_in(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
+ let assist = &self.assists[&assist_id];
+ let Some(decorations) = assist.decorations.as_ref() else {
+ return;
+ };
+ let assist_group = self.assist_groups.get_mut(&assist.group_id).unwrap();
+ let editor_assists = self.assists_by_editor.get_mut(&assist.editor).unwrap();
+
+ assist_group.active_assist_id = Some(assist_id);
+ if assist_group.linked {
+ for assist_id in &assist_group.assist_ids {
+ if let Some(decorations) = self.assists[assist_id].decorations.as_ref() {
+ decorations.prompt_editor.update(cx, |prompt_editor, cx| {
+ prompt_editor.set_show_cursor_when_unfocused(true, cx)
+ });
+ }
+ }
+ }
+
+ assist
+ .editor
+ .update(cx, |editor, cx| {
+ let scroll_top = editor.scroll_position(cx).y;
+ let scroll_bottom = scroll_top + editor.visible_line_count().unwrap_or(0.);
+ let prompt_row = editor
+ .row_for_block(decorations.prompt_block_id, cx)
+ .unwrap()
+ .0 as f32;
+
+ if (scroll_top..scroll_bottom).contains(&prompt_row) {
+ editor_assists.scroll_lock = Some(InlineAssistScrollLock {
+ assist_id,
+ distance_from_top: prompt_row - scroll_top,
+ });
+ } else {
+ editor_assists.scroll_lock = None;
+ }
+ })
+ .ok();
+ }
+
+ fn handle_prompt_editor_focus_out(
+ &mut self,
+ assist_id: InlineAssistId,
+ cx: &mut WindowContext,
+ ) {
+ let assist = &self.assists[&assist_id];
+ let assist_group = self.assist_groups.get_mut(&assist.group_id).unwrap();
+ if assist_group.active_assist_id == Some(assist_id) {
+ assist_group.active_assist_id = None;
+ if assist_group.linked {
+ for assist_id in &assist_group.assist_ids {
+ if let Some(decorations) = self.assists[assist_id].decorations.as_ref() {
+ decorations.prompt_editor.update(cx, |prompt_editor, cx| {
+ prompt_editor.set_show_cursor_when_unfocused(false, cx)
+ });
+ }
+ }
+ }
+ }
+ }
+
+ fn handle_prompt_editor_event(
+ &mut self,
+ prompt_editor: View<PromptEditor>,
+ event: &PromptEditorEvent,
+ cx: &mut WindowContext,
+ ) {
+ let assist_id = prompt_editor.read(cx).id;
+ match event {
+ PromptEditorEvent::StartRequested => {
+ self.start_assist(assist_id, cx);
+ }
+ PromptEditorEvent::StopRequested => {
+ self.stop_assist(assist_id, cx);
+ }
+ PromptEditorEvent::ConfirmRequested => {
+ self.finish_assist(assist_id, false, cx);
+ }
+ PromptEditorEvent::CancelRequested => {
+ self.finish_assist(assist_id, true, cx);
+ }
+ PromptEditorEvent::DismissRequested => {
+ self.dismiss_assist(assist_id, cx);
+ }
+ }
+ }
+
+ fn handle_editor_newline(&mut self, editor: View<Editor>, cx: &mut WindowContext) {
+ let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) else {
+ return;
+ };
+
+ if editor.read(cx).selections.count() == 1 {
+ let (selection, buffer) = editor.update(cx, |editor, cx| {
+ (
+ editor.selections.newest::<usize>(cx),
+ editor.buffer().read(cx).snapshot(cx),
+ )
+ });
+ for assist_id in &editor_assists.assist_ids {
+ let assist = &self.assists[assist_id];
+ let assist_range = assist.range.to_offset(&buffer);
+ if assist_range.contains(&selection.start) && assist_range.contains(&selection.end)
+ {
+ if matches!(assist.codegen.read(cx).status(cx), CodegenStatus::Pending) {
+ self.dismiss_assist(*assist_id, cx);
+ } else {
+ self.finish_assist(*assist_id, false, cx);
+ }
+
+ return;
+ }
+ }
+ }
+
+ cx.propagate();
+ }
+
+ fn handle_editor_cancel(&mut self, editor: View<Editor>, cx: &mut WindowContext) {
+ let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) else {
+ return;
+ };
+
+ if editor.read(cx).selections.count() == 1 {
+ let (selection, buffer) = editor.update(cx, |editor, cx| {
+ (
+ editor.selections.newest::<usize>(cx),
+ editor.buffer().read(cx).snapshot(cx),
+ )
+ });
+ let mut closest_assist_fallback = None;
+ for assist_id in &editor_assists.assist_ids {
+ let assist = &self.assists[assist_id];
+ let assist_range = assist.range.to_offset(&buffer);
+ if assist.decorations.is_some() {
+ if assist_range.contains(&selection.start)
+ && assist_range.contains(&selection.end)
+ {
+ self.focus_assist(*assist_id, cx);
+ return;
+ } else {
+ let distance_from_selection = assist_range
+ .start
+ .abs_diff(selection.start)
+ .min(assist_range.start.abs_diff(selection.end))
+ + assist_range
+ .end
+ .abs_diff(selection.start)
+ .min(assist_range.end.abs_diff(selection.end));
+ match closest_assist_fallback {
+ Some((_, old_distance)) => {
+ if distance_from_selection < old_distance {
+ closest_assist_fallback =
+ Some((assist_id, distance_from_selection));
+ }
+ }
+ None => {
+ closest_assist_fallback = Some((assist_id, distance_from_selection))
+ }
+ }
+ }
+ }
+ }
+
+ if let Some((&assist_id, _)) = closest_assist_fallback {
+ self.focus_assist(assist_id, cx);
+ }
+ }
+
+ cx.propagate();
+ }
+
+ fn handle_editor_release(&mut self, editor: WeakView<Editor>, cx: &mut WindowContext) {
+ if let Some(editor_assists) = self.assists_by_editor.get_mut(&editor) {
+ for assist_id in editor_assists.assist_ids.clone() {
+ self.finish_assist(assist_id, true, cx);
+ }
+ }
+ }
+
+ fn handle_editor_change(&mut self, editor: View<Editor>, cx: &mut WindowContext) {
+ let Some(editor_assists) = self.assists_by_editor.get(&editor.downgrade()) else {
+ return;
+ };
+ let Some(scroll_lock) = editor_assists.scroll_lock.as_ref() else {
+ return;
+ };
+ let assist = &self.assists[&scroll_lock.assist_id];
+ let Some(decorations) = assist.decorations.as_ref() else {
+ return;
+ };
+
+ editor.update(cx, |editor, cx| {
+ let scroll_position = editor.scroll_position(cx);
+ let target_scroll_top = editor
+ .row_for_block(decorations.prompt_block_id, cx)
+ .unwrap()
+ .0 as f32
+ - scroll_lock.distance_from_top;
+ if target_scroll_top != scroll_position.y {
+ editor.set_scroll_position(point(scroll_position.x, target_scroll_top), cx);
+ }
+ });
+ }
+
+ fn handle_editor_event(
+ &mut self,
+ editor: View<Editor>,
+ event: &EditorEvent,
+ cx: &mut WindowContext,
+ ) {
+ let Some(editor_assists) = self.assists_by_editor.get_mut(&editor.downgrade()) else {
+ return;
+ };
+
+ match event {
+ EditorEvent::Edited { transaction_id } => {
+ let buffer = editor.read(cx).buffer().read(cx);
+ let edited_ranges =
+ buffer.edited_ranges_for_transaction::<usize>(*transaction_id, cx);
+ let snapshot = buffer.snapshot(cx);
+
+ for assist_id in editor_assists.assist_ids.clone() {
+ let assist = &self.assists[&assist_id];
+ if matches!(
+ assist.codegen.read(cx).status(cx),
+ CodegenStatus::Error(_) | CodegenStatus::Done
+ ) {
+ let assist_range = assist.range.to_offset(&snapshot);
+ if edited_ranges
+ .iter()
+ .any(|range| range.overlaps(&assist_range))
+ {
+ self.finish_assist(assist_id, false, cx);
+ }
+ }
+ }
+ }
+ EditorEvent::ScrollPositionChanged { .. } => {
+ if let Some(scroll_lock) = editor_assists.scroll_lock.as_ref() {
+ let assist = &self.assists[&scroll_lock.assist_id];
+ if let Some(decorations) = assist.decorations.as_ref() {
+ let distance_from_top = editor.update(cx, |editor, cx| {
+ let scroll_top = editor.scroll_position(cx).y;
+ let prompt_row = editor
+ .row_for_block(decorations.prompt_block_id, cx)
+ .unwrap()
+ .0 as f32;
+ prompt_row - scroll_top
+ });
+
+ if distance_from_top != scroll_lock.distance_from_top {
+ editor_assists.scroll_lock = None;
+ }
+ }
+ }
+ }
+ EditorEvent::SelectionsChanged { .. } => {
+ for assist_id in editor_assists.assist_ids.clone() {
+ let assist = &self.assists[&assist_id];
+ if let Some(decorations) = assist.decorations.as_ref() {
+ if decorations.prompt_editor.focus_handle(cx).is_focused(cx) {
+ return;
+ }
+ }
+ }
+
+ editor_assists.scroll_lock = None;
+ }
+ _ => {}
+ }
+ }
+
+ pub fn finish_assist(&mut self, assist_id: InlineAssistId, undo: bool, cx: &mut WindowContext) {
+ if let Some(assist) = self.assists.get(&assist_id) {
+ let assist_group_id = assist.group_id;
+ if self.assist_groups[&assist_group_id].linked {
+ for assist_id in self.unlink_assist_group(assist_group_id, cx) {
+ self.finish_assist(assist_id, undo, cx);
+ }
+ return;
+ }
+ }
+
+ self.dismiss_assist(assist_id, cx);
+
+ if let Some(assist) = self.assists.remove(&assist_id) {
+ if let hash_map::Entry::Occupied(mut entry) = self.assist_groups.entry(assist.group_id)
+ {
+ entry.get_mut().assist_ids.retain(|id| *id != assist_id);
+ if entry.get().assist_ids.is_empty() {
+ entry.remove();
+ }
+ }
+
+ if let hash_map::Entry::Occupied(mut entry) =
+ self.assists_by_editor.entry(assist.editor.clone())
+ {
+ entry.get_mut().assist_ids.retain(|id| *id != assist_id);
+ if entry.get().assist_ids.is_empty() {
+ entry.remove();
+ if let Some(editor) = assist.editor.upgrade() {
+ self.update_editor_highlights(&editor, cx);
+ }
+ } else {
+ entry.get().highlight_updates.send(()).ok();
+ }
+ }
+
+ let active_alternative = assist.codegen.read(cx).active_alternative().clone();
+ let message_id = active_alternative.read(cx).message_id.clone();
+
+ if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
+ let language_name = assist.editor.upgrade().and_then(|editor| {
+ let multibuffer = editor.read(cx).buffer().read(cx);
+ let ranges = multibuffer.range_to_buffer_ranges(assist.range.clone(), cx);
+ ranges
+ .first()
+ .and_then(|(buffer, _, _)| buffer.read(cx).language())
+ .map(|language| language.name())
+ });
+ report_assistant_event(
+ AssistantEvent {
+ conversation_id: None,
+ kind: AssistantKind::Inline,
+ message_id,
+ phase: if undo {
+ AssistantPhase::Rejected
+ } else {
+ AssistantPhase::Accepted
+ },
+ model: model.telemetry_id(),
+ model_provider: model.provider_id().to_string(),
+ response_latency: None,
+ error_message: None,
+ language_name: language_name.map(|name| name.to_proto()),
+ },
+ Some(self.telemetry.clone()),
+ cx.http_client(),
+ model.api_key(cx),
+ cx.background_executor(),
+ );
+ }
+
+ if undo {
+ assist.codegen.update(cx, |codegen, cx| codegen.undo(cx));
+ } else {
+ self.confirmed_assists.insert(assist_id, active_alternative);
+ }
+ }
+ }
+
+ fn dismiss_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) -> bool {
+ let Some(assist) = self.assists.get_mut(&assist_id) else {
+ return false;
+ };
+ let Some(editor) = assist.editor.upgrade() else {
+ return false;
+ };
+ let Some(decorations) = assist.decorations.take() else {
+ return false;
+ };
+
+ editor.update(cx, |editor, cx| {
+ let mut to_remove = decorations.removed_line_block_ids;
+ to_remove.insert(decorations.prompt_block_id);
+ to_remove.insert(decorations.end_block_id);
+ editor.remove_blocks(to_remove, None, cx);
+ });
+
+ if decorations
+ .prompt_editor
+ .focus_handle(cx)
+ .contains_focused(cx)
+ {
+ self.focus_next_assist(assist_id, cx);
+ }
+
+ if let Some(editor_assists) = self.assists_by_editor.get_mut(&editor.downgrade()) {
+ if editor_assists
+ .scroll_lock
+ .as_ref()
+ .map_or(false, |lock| lock.assist_id == assist_id)
+ {
+ editor_assists.scroll_lock = None;
+ }
+ editor_assists.highlight_updates.send(()).ok();
+ }
+
+ true
+ }
+
+ fn focus_next_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
+ let Some(assist) = self.assists.get(&assist_id) else {
+ return;
+ };
+
+ let assist_group = &self.assist_groups[&assist.group_id];
+ let assist_ix = assist_group
+ .assist_ids
+ .iter()
+ .position(|id| *id == assist_id)
+ .unwrap();
+ let assist_ids = assist_group
+ .assist_ids
+ .iter()
+ .skip(assist_ix + 1)
+ .chain(assist_group.assist_ids.iter().take(assist_ix));
+
+ for assist_id in assist_ids {
+ let assist = &self.assists[assist_id];
+ if assist.decorations.is_some() {
+ self.focus_assist(*assist_id, cx);
+ return;
+ }
+ }
+
+ assist.editor.update(cx, |editor, cx| editor.focus(cx)).ok();
+ }
+
+ fn focus_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
+ let Some(assist) = self.assists.get(&assist_id) else {
+ return;
+ };
+
+ if let Some(decorations) = assist.decorations.as_ref() {
+ decorations.prompt_editor.update(cx, |prompt_editor, cx| {
+ prompt_editor.editor.update(cx, |editor, cx| {
+ editor.focus(cx);
+ editor.select_all(&SelectAll, cx);
+ })
+ });
+ }
+
+ self.scroll_to_assist(assist_id, cx);
+ }
+
+ pub fn scroll_to_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
+ let Some(assist) = self.assists.get(&assist_id) else {
+ return;
+ };
+ let Some(editor) = assist.editor.upgrade() else {
+ return;
+ };
+
+ let position = assist.range.start;
+ editor.update(cx, |editor, cx| {
+ editor.change_selections(None, cx, |selections| {
+ selections.select_anchor_ranges([position..position])
+ });
+
+ let mut scroll_target_top;
+ let mut scroll_target_bottom;
+ if let Some(decorations) = assist.decorations.as_ref() {
+ scroll_target_top = editor
+ .row_for_block(decorations.prompt_block_id, cx)
+ .unwrap()
+ .0 as f32;
+ scroll_target_bottom = editor
+ .row_for_block(decorations.end_block_id, cx)
+ .unwrap()
+ .0 as f32;
+ } else {
+ let snapshot = editor.snapshot(cx);
+ let start_row = assist
+ .range
+ .start
+ .to_display_point(&snapshot.display_snapshot)
+ .row();
+ scroll_target_top = start_row.0 as f32;
+ scroll_target_bottom = scroll_target_top + 1.;
+ }
+ scroll_target_top -= editor.vertical_scroll_margin() as f32;
+ scroll_target_bottom += editor.vertical_scroll_margin() as f32;
+
+ let height_in_lines = editor.visible_line_count().unwrap_or(0.);
+ let scroll_top = editor.scroll_position(cx).y;
+ let scroll_bottom = scroll_top + height_in_lines;
+
+ if scroll_target_top < scroll_top {
+ editor.set_scroll_position(point(0., scroll_target_top), cx);
+ } else if scroll_target_bottom > scroll_bottom {
+ if (scroll_target_bottom - scroll_target_top) <= height_in_lines {
+ editor
+ .set_scroll_position(point(0., scroll_target_bottom - height_in_lines), cx);
+ } else {
+ editor.set_scroll_position(point(0., scroll_target_top), cx);
+ }
+ }
+ });
+ }
+
+ fn unlink_assist_group(
+ &mut self,
+ assist_group_id: InlineAssistGroupId,
+ cx: &mut WindowContext,
+ ) -> Vec<InlineAssistId> {
+ let assist_group = self.assist_groups.get_mut(&assist_group_id).unwrap();
+ assist_group.linked = false;
+ for assist_id in &assist_group.assist_ids {
+ let assist = self.assists.get_mut(assist_id).unwrap();
+ if let Some(editor_decorations) = assist.decorations.as_ref() {
+ editor_decorations
+ .prompt_editor
+ .update(cx, |prompt_editor, cx| prompt_editor.unlink(cx));
+ }
+ }
+ assist_group.assist_ids.clone()
+ }
+
+ pub fn start_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
+ let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
+ assist
+ } else {
+ return;
+ };
+
+ let assist_group_id = assist.group_id;
+ if self.assist_groups[&assist_group_id].linked {
+ for assist_id in self.unlink_assist_group(assist_group_id, cx) {
+ self.start_assist(assist_id, cx);
+ }
+ return;
+ }
+
+ let Some(user_prompt) = assist.user_prompt(cx) else {
+ return;
+ };
+
+ self.prompt_history.retain(|prompt| *prompt != user_prompt);
+ self.prompt_history.push_back(user_prompt.clone());
+ if self.prompt_history.len() > PROMPT_HISTORY_MAX_LEN {
+ self.prompt_history.pop_front();
+ }
+
+ assist
+ .codegen
+ .update(cx, |codegen, cx| codegen.start(user_prompt, cx))
+ .log_err();
+ }
+
+ pub fn stop_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
+ let assist = if let Some(assist) = self.assists.get_mut(&assist_id) {
+ assist
+ } else {
+ return;
+ };
+
+ assist.codegen.update(cx, |codegen, cx| codegen.stop(cx));
+ }
+
+ fn update_editor_highlights(&self, editor: &View<Editor>, cx: &mut WindowContext) {
+ let mut gutter_pending_ranges = Vec::new();
+ let mut gutter_transformed_ranges = Vec::new();
+ let mut foreground_ranges = Vec::new();
+ let mut inserted_row_ranges = Vec::new();
+ let empty_assist_ids = Vec::new();
+ let assist_ids = self
+ .assists_by_editor
+ .get(&editor.downgrade())
+ .map_or(&empty_assist_ids, |editor_assists| {
+ &editor_assists.assist_ids
+ });
+
+ for assist_id in assist_ids {
+ if let Some(assist) = self.assists.get(assist_id) {
+ let codegen = assist.codegen.read(cx);
+ let buffer = codegen.buffer(cx).read(cx).read(cx);
+ foreground_ranges.extend(codegen.last_equal_ranges(cx).iter().cloned());
+
+ let pending_range =
+ codegen.edit_position(cx).unwrap_or(assist.range.start)..assist.range.end;
+ if pending_range.end.to_offset(&buffer) > pending_range.start.to_offset(&buffer) {
+ gutter_pending_ranges.push(pending_range);
+ }
+
+ if let Some(edit_position) = codegen.edit_position(cx) {
+ let edited_range = assist.range.start..edit_position;
+ if edited_range.end.to_offset(&buffer) > edited_range.start.to_offset(&buffer) {
+ gutter_transformed_ranges.push(edited_range);
+ }
+ }
+
+ if assist.decorations.is_some() {
+ inserted_row_ranges
+ .extend(codegen.diff(cx).inserted_row_ranges.iter().cloned());
+ }
+ }
+ }
+
+ let snapshot = editor.read(cx).buffer().read(cx).snapshot(cx);
+ merge_ranges(&mut foreground_ranges, &snapshot);
+ merge_ranges(&mut gutter_pending_ranges, &snapshot);
+ merge_ranges(&mut gutter_transformed_ranges, &snapshot);
+ editor.update(cx, |editor, cx| {
+ enum GutterPendingRange {}
+ if gutter_pending_ranges.is_empty() {
+ editor.clear_gutter_highlights::<GutterPendingRange>(cx);
+ } else {
+ editor.highlight_gutter::<GutterPendingRange>(
+ &gutter_pending_ranges,
+ |cx| cx.theme().status().info_background,
+ cx,
+ )
+ }
+
+ enum GutterTransformedRange {}
+ if gutter_transformed_ranges.is_empty() {
+ editor.clear_gutter_highlights::<GutterTransformedRange>(cx);
+ } else {
+ editor.highlight_gutter::<GutterTransformedRange>(
+ &gutter_transformed_ranges,
+ |cx| cx.theme().status().info,
+ cx,
+ )
+ }
+
+ if foreground_ranges.is_empty() {
+ editor.clear_highlights::<InlineAssist>(cx);
+ } else {
+ editor.highlight_text::<InlineAssist>(
+ foreground_ranges,
+ HighlightStyle {
+ fade_out: Some(0.6),
+ ..Default::default()
+ },
+ cx,
+ );
+ }
+
+ editor.clear_row_highlights::<InlineAssist>();
+ for row_range in inserted_row_ranges {
+ editor.highlight_rows::<InlineAssist>(
+ row_range,
+ cx.theme().status().info_background,
+ false,
+ cx,
+ );
+ }
+ });
+ }
+
+ fn update_editor_blocks(
+ &mut self,
+ editor: &View<Editor>,
+ assist_id: InlineAssistId,
+ cx: &mut WindowContext,
+ ) {
+ let Some(assist) = self.assists.get_mut(&assist_id) else {
+ return;
+ };
+ let Some(decorations) = assist.decorations.as_mut() else {
+ return;
+ };
+
+ let codegen = assist.codegen.read(cx);
+ let old_snapshot = codegen.snapshot(cx);
+ let old_buffer = codegen.old_buffer(cx);
+ let deleted_row_ranges = codegen.diff(cx).deleted_row_ranges.clone();
+
+ editor.update(cx, |editor, cx| {
+ let old_blocks = mem::take(&mut decorations.removed_line_block_ids);
+ editor.remove_blocks(old_blocks, None, cx);
+
+ let mut new_blocks = Vec::new();
+ for (new_row, old_row_range) in deleted_row_ranges {
+ let (_, buffer_start) = old_snapshot
+ .point_to_buffer_offset(Point::new(*old_row_range.start(), 0))
+ .unwrap();
+ let (_, buffer_end) = old_snapshot
+ .point_to_buffer_offset(Point::new(
+ *old_row_range.end(),
+ old_snapshot.line_len(MultiBufferRow(*old_row_range.end())),
+ ))
+ .unwrap();
+
+ let deleted_lines_editor = cx.new_view(|cx| {
+ let multi_buffer = cx.new_model(|_| {
+ MultiBuffer::without_headers(language::Capability::ReadOnly)
+ });
+ multi_buffer.update(cx, |multi_buffer, cx| {
+ multi_buffer.push_excerpts(
+ old_buffer.clone(),
+ Some(ExcerptRange {
+ context: buffer_start..buffer_end,
+ primary: None,
+ }),
+ cx,
+ );
+ });
+
+ enum DeletedLines {}
+ let mut editor = Editor::for_multibuffer(multi_buffer, None, true, cx);
+ editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
+ editor.set_show_wrap_guides(false, cx);
+ editor.set_show_gutter(false, cx);
+ editor.scroll_manager.set_forbid_vertical_scroll(true);
+ editor.set_read_only(true);
+ editor.set_show_inline_completions(Some(false), cx);
+ editor.highlight_rows::<DeletedLines>(
+ Anchor::min()..Anchor::max(),
+ cx.theme().status().deleted_background,
+ false,
+ cx,
+ );
+ editor
+ });
+
+ let height =
+ deleted_lines_editor.update(cx, |editor, cx| editor.max_point(cx).row().0 + 1);
+ new_blocks.push(BlockProperties {
+ placement: BlockPlacement::Above(new_row),
+ height,
+ style: BlockStyle::Flex,
+ render: Arc::new(move |cx| {
+ div()
+ .block_mouse_down()
+ .bg(cx.theme().status().deleted_background)
+ .size_full()
+ .h(height as f32 * cx.line_height())
+ .pl(cx.gutter_dimensions.full_width())
+ .child(deleted_lines_editor.clone())
+ .into_any_element()
+ }),
+ priority: 0,
+ });
+ }
+
+ decorations.removed_line_block_ids = editor
+ .insert_blocks(new_blocks, None, cx)
+ .into_iter()
+ .collect();
+ })
+ }
+
+ fn resolve_inline_assist_target(
+ workspace: &mut Workspace,
+ cx: &mut WindowContext,
+ ) -> Option<InlineAssistTarget> {
+ if let Some(terminal_panel) = workspace.panel::<TerminalPanel>(cx) {
+ if terminal_panel
+ .read(cx)
+ .focus_handle(cx)
+ .contains_focused(cx)
+ {
+ if let Some(terminal_view) = terminal_panel.read(cx).pane().and_then(|pane| {
+ pane.read(cx)
+ .active_item()
+ .and_then(|t| t.downcast::<TerminalView>())
+ }) {
+ return Some(InlineAssistTarget::Terminal(terminal_view));
+ }
+ }
+ }
+
+ if let Some(workspace_editor) = workspace
+ .active_item(cx)
+ .and_then(|item| item.act_as::<Editor>(cx))
+ {
+ Some(InlineAssistTarget::Editor(workspace_editor))
+ } else if let Some(terminal_view) = workspace
+ .active_item(cx)
+ .and_then(|item| item.act_as::<TerminalView>(cx))
+ {
+ Some(InlineAssistTarget::Terminal(terminal_view))
+ } else {
+ None
+ }
+ }
+}
+
+struct EditorInlineAssists {
+ assist_ids: Vec<InlineAssistId>,
+ scroll_lock: Option<InlineAssistScrollLock>,
+ highlight_updates: async_watch::Sender<()>,
+ _update_highlights: Task<Result<()>>,
+ _subscriptions: Vec<gpui::Subscription>,
+}
+
+struct InlineAssistScrollLock {
+ assist_id: InlineAssistId,
+ distance_from_top: f32,
+}
+
+impl EditorInlineAssists {
+ #[allow(clippy::too_many_arguments)]
+ fn new(editor: &View<Editor>, cx: &mut WindowContext) -> Self {
+ let (highlight_updates_tx, mut highlight_updates_rx) = async_watch::channel(());
+ Self {
+ assist_ids: Vec::new(),
+ scroll_lock: None,
+ highlight_updates: highlight_updates_tx,
+ _update_highlights: cx.spawn(|mut cx| {
+ let editor = editor.downgrade();
+ async move {
+ while let Ok(()) = highlight_updates_rx.changed().await {
+ let editor = editor.upgrade().context("editor was dropped")?;
+ cx.update_global(|assistant: &mut InlineAssistant, cx| {
+ assistant.update_editor_highlights(&editor, cx);
+ })?;
+ }
+ Ok(())
+ }
+ }),
+ _subscriptions: vec![
+ cx.observe_release(editor, {
+ let editor = editor.downgrade();
+ |_, cx| {
+ InlineAssistant::update_global(cx, |this, cx| {
+ this.handle_editor_release(editor, cx);
+ })
+ }
+ }),
+ cx.observe(editor, move |editor, cx| {
+ InlineAssistant::update_global(cx, |this, cx| {
+ this.handle_editor_change(editor, cx)
+ })
+ }),
+ cx.subscribe(editor, move |editor, event, cx| {
+ InlineAssistant::update_global(cx, |this, cx| {
+ this.handle_editor_event(editor, event, cx)
+ })
+ }),
+ editor.update(cx, |editor, cx| {
+ let editor_handle = cx.view().downgrade();
+ editor.register_action(
+ move |_: &editor::actions::Newline, cx: &mut WindowContext| {
+ InlineAssistant::update_global(cx, |this, cx| {
+ if let Some(editor) = editor_handle.upgrade() {
+ this.handle_editor_newline(editor, cx)
+ }
+ })
+ },
+ )
+ }),
+ editor.update(cx, |editor, cx| {
+ let editor_handle = cx.view().downgrade();
+ editor.register_action(
+ move |_: &editor::actions::Cancel, cx: &mut WindowContext| {
+ InlineAssistant::update_global(cx, |this, cx| {
+ if let Some(editor) = editor_handle.upgrade() {
+ this.handle_editor_cancel(editor, cx)
+ }
+ })
+ },
+ )
+ }),
+ ],
+ }
+ }
+}
+
+struct InlineAssistGroup {
+ assist_ids: Vec<InlineAssistId>,
+ linked: bool,
+ active_assist_id: Option<InlineAssistId>,
+}
+
+impl InlineAssistGroup {
+ fn new() -> Self {
+ Self {
+ assist_ids: Vec::new(),
+ linked: true,
+ active_assist_id: None,
+ }
+ }
+}
+
+fn build_assist_editor_renderer(editor: &View<PromptEditor>) -> RenderBlock {
+ let editor = editor.clone();
+ Arc::new(move |cx: &mut BlockContext| {
+ *editor.read(cx).gutter_dimensions.lock() = *cx.gutter_dimensions;
+ editor.clone().into_any_element()
+ })
+}
+
+#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, Hash)]
+pub struct InlineAssistId(usize);
+
+impl InlineAssistId {
+ fn post_inc(&mut self) -> InlineAssistId {
+ let id = *self;
+ self.0 += 1;
+ id
+ }
+}
+
+#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, Hash)]
+struct InlineAssistGroupId(usize);
+
+impl InlineAssistGroupId {
+ fn post_inc(&mut self) -> InlineAssistGroupId {
+ let id = *self;
+ self.0 += 1;
+ id
+ }
+}
+
+enum PromptEditorEvent {
+ StartRequested,
+ StopRequested,
+ ConfirmRequested,
+ CancelRequested,
+ DismissRequested,
+}
+
+struct PromptEditor {
+ id: InlineAssistId,
+ fs: Arc<dyn Fs>,
+ editor: View<Editor>,
+ edited_since_done: bool,
+ gutter_dimensions: Arc<Mutex<GutterDimensions>>,
+ prompt_history: VecDeque<String>,
+ prompt_history_ix: Option<usize>,
+ pending_prompt: String,
+ codegen: Model<Codegen>,
+ _codegen_subscription: Subscription,
+ editor_subscriptions: Vec<Subscription>,
+ show_rate_limit_notice: bool,
+}
+
+impl EventEmitter<PromptEditorEvent> for PromptEditor {}
+
+impl Render for PromptEditor {
+ fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+ let gutter_dimensions = *self.gutter_dimensions.lock();
+ let mut buttons = vec![Button::new("add-context", "Add Context")
+ .style(ButtonStyle::Filled)
+ .icon(IconName::Plus)
+ .icon_position(IconPosition::Start)
+ .into_any_element()];
+ let codegen = self.codegen.read(cx);
+ if codegen.alternative_count(cx) > 1 {
+ buttons.push(self.render_cycle_controls(cx));
+ }
+
+ let status = codegen.status(cx);
+ buttons.extend(match status {
+ CodegenStatus::Idle => {
+ vec![
+ IconButton::new("cancel", IconName::Close)
+ .icon_color(Color::Muted)
+ .shape(IconButtonShape::Square)
+ .tooltip(|cx| Tooltip::for_action("Cancel Assist", &menu::Cancel, cx))
+ .on_click(
+ cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::CancelRequested)),
+ )
+ .into_any_element(),
+ IconButton::new("start", IconName::SparkleAlt)
+ .icon_color(Color::Muted)
+ .shape(IconButtonShape::Square)
+ .tooltip(|cx| Tooltip::for_action("Transform", &menu::Confirm, cx))
+ .on_click(
+ cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::StartRequested)),
+ )
+ .into_any_element(),
+ ]
+ }
+ CodegenStatus::Pending => {
+ vec![
+ IconButton::new("cancel", IconName::Close)
+ .icon_color(Color::Muted)
+ .shape(IconButtonShape::Square)
+ .tooltip(|cx| Tooltip::text("Cancel Assist", cx))
+ .on_click(
+ cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::CancelRequested)),
+ )
+ .into_any_element(),
+ IconButton::new("stop", IconName::Stop)
+ .icon_color(Color::Error)
+ .shape(IconButtonShape::Square)
+ .tooltip(|cx| {
+ Tooltip::with_meta(
+ "Interrupt Transformation",
+ Some(&menu::Cancel),
+ "Changes won't be discarded",
+ cx,
+ )
+ })
+ .on_click(cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::StopRequested)))
+ .into_any_element(),
+ ]
+ }
+ CodegenStatus::Error(_) | CodegenStatus::Done => {
+ vec![
+ IconButton::new("cancel", IconName::Close)
+ .icon_color(Color::Muted)
+ .shape(IconButtonShape::Square)
+ .tooltip(|cx| Tooltip::for_action("Cancel Assist", &menu::Cancel, cx))
+ .on_click(
+ cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::CancelRequested)),
+ )
+ .into_any_element(),
+ if self.edited_since_done || matches!(status, CodegenStatus::Error(_)) {
+ IconButton::new("restart", IconName::RotateCw)
+ .icon_color(Color::Info)
+ .shape(IconButtonShape::Square)
+ .tooltip(|cx| {
+ Tooltip::with_meta(
+ "Restart Transformation",
+ Some(&menu::Confirm),
+ "Changes will be discarded",
+ cx,
+ )
+ })
+ .on_click(cx.listener(|_, _, cx| {
+ cx.emit(PromptEditorEvent::StartRequested);
+ }))
+ .into_any_element()
+ } else {
+ IconButton::new("confirm", IconName::Check)
+ .icon_color(Color::Info)
+ .shape(IconButtonShape::Square)
+ .tooltip(|cx| Tooltip::for_action("Confirm Assist", &menu::Confirm, cx))
+ .on_click(cx.listener(|_, _, cx| {
+ cx.emit(PromptEditorEvent::ConfirmRequested);
+ }))
+ .into_any_element()
+ },
+ ]
+ }
+ });
+
+ h_flex()
+ .key_context("PromptEditor")
+ .bg(cx.theme().colors().editor_background)
+ .block_mouse_down()
+ .cursor(CursorStyle::Arrow)
+ .border_y_1()
+ .border_color(cx.theme().status().info_border)
+ .size_full()
+ .py(cx.line_height() / 2.5)
+ .on_action(cx.listener(Self::confirm))
+ .on_action(cx.listener(Self::cancel))
+ .on_action(cx.listener(Self::move_up))
+ .on_action(cx.listener(Self::move_down))
+ .capture_action(cx.listener(Self::cycle_prev))
+ .capture_action(cx.listener(Self::cycle_next))
+ .child(
+ h_flex()
+ .w(gutter_dimensions.full_width() + (gutter_dimensions.margin / 2.0))
+ .justify_center()
+ .gap_2()
+ .child(
+ LanguageModelSelector::new(
+ {
+ let fs = self.fs.clone();
+ move |model, cx| {
+ update_settings_file::<AssistantSettings>(
+ fs.clone(),
+ cx,
+ move |settings, _| settings.set_model(model.clone()),
+ );
+ }
+ },
+ IconButton::new("context", IconName::SettingsAlt)
+ .shape(IconButtonShape::Square)
+ .icon_size(IconSize::Small)
+ .icon_color(Color::Muted)
+ .tooltip(move |cx| {
+ Tooltip::with_meta(
+ format!(
+ "Using {}",
+ LanguageModelRegistry::read_global(cx)
+ .active_model()
+ .map(|model| model.name().0)
+ .unwrap_or_else(|| "No model selected".into()),
+ ),
+ None,
+ "Change Model",
+ cx,
+ )
+ }),
+ )
+ .info_text(
+ "Inline edits use context\n\
+ from the currently selected\n\
+ assistant panel tab.",
+ ),
+ )
+ .map(|el| {
+ let CodegenStatus::Error(error) = self.codegen.read(cx).status(cx) else {
+ return el;
+ };
+
+ let error_message = SharedString::from(error.to_string());
+ if error.error_code() == proto::ErrorCode::RateLimitExceeded
+ && cx.has_flag::<ZedPro>()
+ {
+ el.child(
+ v_flex()
+ .child(
+ IconButton::new("rate-limit-error", IconName::XCircle)
+ .selected(self.show_rate_limit_notice)
+ .shape(IconButtonShape::Square)
+ .icon_size(IconSize::Small)
+ .on_click(cx.listener(Self::toggle_rate_limit_notice)),
+ )
+ .children(self.show_rate_limit_notice.then(|| {
+ deferred(
+ anchored()
+ .position_mode(gpui::AnchoredPositionMode::Local)
+ .position(point(px(0.), px(24.)))
+ .anchor(gpui::AnchorCorner::TopLeft)
+ .child(self.render_rate_limit_notice(cx)),
+ )
+ })),
+ )
+ } else {
+ el.child(
+ div()
+ .id("error")
+ .tooltip(move |cx| Tooltip::text(error_message.clone(), cx))
+ .child(
+ Icon::new(IconName::XCircle)
+ .size(IconSize::Small)
+ .color(Color::Error),
+ ),
+ )
+ }
+ }),
+ )
+ .child(div().flex_1().child(self.render_editor(cx)))
+ .child(h_flex().gap_2().pr_6().children(buttons))
+ }
+}
+
+impl FocusableView for PromptEditor {
+ fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
+ self.editor.focus_handle(cx)
+ }
+}
+
+impl PromptEditor {
+ const MAX_LINES: u8 = 8;
+
+ #[allow(clippy::too_many_arguments)]
+ fn new(
+ id: InlineAssistId,
+ gutter_dimensions: Arc<Mutex<GutterDimensions>>,
+ prompt_history: VecDeque<String>,
+ prompt_buffer: Model<MultiBuffer>,
+ codegen: Model<Codegen>,
+ fs: Arc<dyn Fs>,
+ cx: &mut ViewContext<Self>,
+ ) -> Self {
+ let prompt_editor = cx.new_view(|cx| {
+ let mut editor = Editor::new(
+ EditorMode::AutoHeight {
+ max_lines: Self::MAX_LINES as usize,
+ },
+ prompt_buffer,
+ None,
+ false,
+ cx,
+ );
+ editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
+ // Since the prompt editors for all inline assistants are linked,
+ // always show the cursor (even when it isn't focused) because
+ // typing in one will make what you typed appear in all of them.
+ editor.set_show_cursor_when_unfocused(true, cx);
+ editor.set_placeholder_text(Self::placeholder_text(codegen.read(cx)), cx);
+ editor
+ });
+
+ let mut this = Self {
+ id,
+ editor: prompt_editor,
+ edited_since_done: false,
+ gutter_dimensions,
+ prompt_history,
+ prompt_history_ix: None,
+ pending_prompt: String::new(),
+ _codegen_subscription: cx.observe(&codegen, Self::handle_codegen_changed),
+ editor_subscriptions: Vec::new(),
+ codegen,
+ fs,
+ show_rate_limit_notice: false,
+ };
+ this.subscribe_to_editor(cx);
+ this
+ }
+
+ fn subscribe_to_editor(&mut self, cx: &mut ViewContext<Self>) {
+ self.editor_subscriptions.clear();
+ self.editor_subscriptions
+ .push(cx.subscribe(&self.editor, Self::handle_prompt_editor_events));
+ }
+
+ fn set_show_cursor_when_unfocused(
+ &mut self,
+ show_cursor_when_unfocused: bool,
+ cx: &mut ViewContext<Self>,
+ ) {
+ self.editor.update(cx, |editor, cx| {
+ editor.set_show_cursor_when_unfocused(show_cursor_when_unfocused, cx)
+ });
+ }
+
+ fn unlink(&mut self, cx: &mut ViewContext<Self>) {
+ let prompt = self.prompt(cx);
+ let focus = self.editor.focus_handle(cx).contains_focused(cx);
+ self.editor = cx.new_view(|cx| {
+ let mut editor = Editor::auto_height(Self::MAX_LINES as usize, cx);
+ editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
+ editor.set_placeholder_text(Self::placeholder_text(self.codegen.read(cx)), cx);
+ editor.set_placeholder_text("Add a prompt…", cx);
+ editor.set_text(prompt, cx);
+ if focus {
+ editor.focus(cx);
+ }
+ editor
+ });
+ self.subscribe_to_editor(cx);
+ }
+
+ fn placeholder_text(codegen: &Codegen) -> String {
+ let action = if codegen.is_insertion {
+ "Generate"
+ } else {
+ "Transform"
+ };
+
+ format!("{action}… ↓↑ for history")
+ }
+
+ fn prompt(&self, cx: &AppContext) -> String {
+ self.editor.read(cx).text(cx)
+ }
+
+ fn toggle_rate_limit_notice(&mut self, _: &ClickEvent, cx: &mut ViewContext<Self>) {
+ self.show_rate_limit_notice = !self.show_rate_limit_notice;
+ if self.show_rate_limit_notice {
+ cx.focus_view(&self.editor);
+ }
+ cx.notify();
+ }
+
+ fn handle_prompt_editor_events(
+ &mut self,
+ _: View<Editor>,
+ event: &EditorEvent,
+ cx: &mut ViewContext<Self>,
+ ) {
+ match event {
+ EditorEvent::Edited { .. } => {
+ if let Some(workspace) = cx.window_handle().downcast::<Workspace>() {
+ workspace
+ .update(cx, |workspace, cx| {
+ let is_via_ssh = workspace
+ .project()
+ .update(cx, |project, _| project.is_via_ssh());
+
+ workspace
+ .client()
+ .telemetry()
+ .log_edit_event("inline assist", is_via_ssh);
+ })
+ .log_err();
+ }
+ let prompt = self.editor.read(cx).text(cx);
+ if self
+ .prompt_history_ix
+ .map_or(true, |ix| self.prompt_history[ix] != prompt)
+ {
+ self.prompt_history_ix.take();
+ self.pending_prompt = prompt;
+ }
+
+ self.edited_since_done = true;
+ cx.notify();
+ }
+ EditorEvent::Blurred => {
+ if self.show_rate_limit_notice {
+ self.show_rate_limit_notice = false;
+ cx.notify();
+ }
+ }
+ _ => {}
+ }
+ }
+
+ fn handle_codegen_changed(&mut self, _: Model<Codegen>, cx: &mut ViewContext<Self>) {
+ match self.codegen.read(cx).status(cx) {
+ CodegenStatus::Idle => {
+ self.editor
+ .update(cx, |editor, _| editor.set_read_only(false));
+ }
+ CodegenStatus::Pending => {
+ self.editor
+ .update(cx, |editor, _| editor.set_read_only(true));
+ }
+ CodegenStatus::Done => {
+ self.edited_since_done = false;
+ self.editor
+ .update(cx, |editor, _| editor.set_read_only(false));
+ }
+ CodegenStatus::Error(error) => {
+ if cx.has_flag::<ZedPro>()
+ && error.error_code() == proto::ErrorCode::RateLimitExceeded
+ && !dismissed_rate_limit_notice()
+ {
+ self.show_rate_limit_notice = true;
+ cx.notify();
+ }
+
+ self.edited_since_done = false;
+ self.editor
+ .update(cx, |editor, _| editor.set_read_only(false));
+ }
+ }
+ }
+
+ fn cancel(&mut self, _: &editor::actions::Cancel, cx: &mut ViewContext<Self>) {
+ match self.codegen.read(cx).status(cx) {
+ CodegenStatus::Idle | CodegenStatus::Done | CodegenStatus::Error(_) => {
+ cx.emit(PromptEditorEvent::CancelRequested);
+ }
+ CodegenStatus::Pending => {
+ cx.emit(PromptEditorEvent::StopRequested);
+ }
+ }
+ }
+
+ fn confirm(&mut self, _: &menu::Confirm, cx: &mut ViewContext<Self>) {
+ match self.codegen.read(cx).status(cx) {
+ CodegenStatus::Idle => {
+ cx.emit(PromptEditorEvent::StartRequested);
+ }
+ CodegenStatus::Pending => {
+ cx.emit(PromptEditorEvent::DismissRequested);
+ }
+ CodegenStatus::Done => {
+ if self.edited_since_done {
+ cx.emit(PromptEditorEvent::StartRequested);
+ } else {
+ cx.emit(PromptEditorEvent::ConfirmRequested);
+ }
+ }
+ CodegenStatus::Error(_) => {
+ cx.emit(PromptEditorEvent::StartRequested);
+ }
+ }
+ }
+
+ fn move_up(&mut self, _: &MoveUp, cx: &mut ViewContext<Self>) {
+ if let Some(ix) = self.prompt_history_ix {
+ if ix > 0 {
+ self.prompt_history_ix = Some(ix - 1);
+ let prompt = self.prompt_history[ix - 1].as_str();
+ self.editor.update(cx, |editor, cx| {
+ editor.set_text(prompt, cx);
+ editor.move_to_beginning(&Default::default(), cx);
+ });
+ }
+ } else if !self.prompt_history.is_empty() {
+ self.prompt_history_ix = Some(self.prompt_history.len() - 1);
+ let prompt = self.prompt_history[self.prompt_history.len() - 1].as_str();
+ self.editor.update(cx, |editor, cx| {
+ editor.set_text(prompt, cx);
+ editor.move_to_beginning(&Default::default(), cx);
+ });
+ }
+ }
+
+ fn move_down(&mut self, _: &MoveDown, cx: &mut ViewContext<Self>) {
+ if let Some(ix) = self.prompt_history_ix {
+ if ix < self.prompt_history.len() - 1 {
+ self.prompt_history_ix = Some(ix + 1);
+ let prompt = self.prompt_history[ix + 1].as_str();
+ self.editor.update(cx, |editor, cx| {
+ editor.set_text(prompt, cx);
+ editor.move_to_end(&Default::default(), cx)
+ });
+ } else {
+ self.prompt_history_ix = None;
+ let prompt = self.pending_prompt.as_str();
+ self.editor.update(cx, |editor, cx| {
+ editor.set_text(prompt, cx);
+ editor.move_to_end(&Default::default(), cx)
+ });
+ }
+ }
+ }
+
+ fn cycle_prev(&mut self, _: &CyclePreviousInlineAssist, cx: &mut ViewContext<Self>) {
+ self.codegen
+ .update(cx, |codegen, cx| codegen.cycle_prev(cx));
+ }
+
+ fn cycle_next(&mut self, _: &CycleNextInlineAssist, cx: &mut ViewContext<Self>) {
+ self.codegen
+ .update(cx, |codegen, cx| codegen.cycle_next(cx));
+ }
+
+ fn render_cycle_controls(&self, cx: &ViewContext<Self>) -> AnyElement {
+ let codegen = self.codegen.read(cx);
+ let disabled = matches!(codegen.status(cx), CodegenStatus::Idle);
+
+ let model_registry = LanguageModelRegistry::read_global(cx);
+ let default_model = model_registry.active_model();
+ let alternative_models = model_registry.inline_alternative_models();
+
+ let get_model_name = |index: usize| -> String {
+ let name = |model: &Arc<dyn LanguageModel>| model.name().0.to_string();
+
+ match index {
+ 0 => default_model.as_ref().map_or_else(String::new, name),
+ index if index <= alternative_models.len() => alternative_models
+ .get(index - 1)
+ .map_or_else(String::new, name),
+ _ => String::new(),
+ }
+ };
+
+ let total_models = alternative_models.len() + 1;
+
+ if total_models <= 1 {
+ return div().into_any_element();
+ }
+
+ let current_index = codegen.active_alternative;
+ let prev_index = (current_index + total_models - 1) % total_models;
+ let next_index = (current_index + 1) % total_models;
+
+ let prev_model_name = get_model_name(prev_index);
+ let next_model_name = get_model_name(next_index);
+
+ h_flex()
+ .child(
+ IconButton::new("previous", IconName::ChevronLeft)
+ .icon_color(Color::Muted)
+ .disabled(disabled || current_index == 0)
+ .shape(IconButtonShape::Square)
+ .tooltip({
+ let focus_handle = self.editor.focus_handle(cx);
+ move |cx| {
+ cx.new_view(|cx| {
+ let mut tooltip = Tooltip::new("Previous Alternative").key_binding(
+ KeyBinding::for_action_in(
+ &CyclePreviousInlineAssist,
+ &focus_handle,
+ cx,
+ ),
+ );
+ if !disabled && current_index != 0 {
+ tooltip = tooltip.meta(prev_model_name.clone());
+ }
+ tooltip
+ })
+ .into()
+ }
+ })
+ .on_click(cx.listener(|this, _, cx| {
+ this.codegen
+ .update(cx, |codegen, cx| codegen.cycle_prev(cx))
+ })),
+ )
+ .child(
+ Label::new(format!(
+ "{}/{}",
+ codegen.active_alternative + 1,
+ codegen.alternative_count(cx)
+ ))
+ .size(LabelSize::Small)
+ .color(if disabled {
+ Color::Disabled
+ } else {
+ Color::Muted
+ }),
+ )
+ .child(
+ IconButton::new("next", IconName::ChevronRight)
+ .icon_color(Color::Muted)
+ .disabled(disabled || current_index == total_models - 1)
+ .shape(IconButtonShape::Square)
+ .tooltip({
+ let focus_handle = self.editor.focus_handle(cx);
+ move |cx| {
+ cx.new_view(|cx| {
+ let mut tooltip = Tooltip::new("Next Alternative").key_binding(
+ KeyBinding::for_action_in(
+ &CycleNextInlineAssist,
+ &focus_handle,
+ cx,
+ ),
+ );
+ if !disabled && current_index != total_models - 1 {
+ tooltip = tooltip.meta(next_model_name.clone());
+ }
+ tooltip
+ })
+ .into()
+ }
+ })
+ .on_click(cx.listener(|this, _, cx| {
+ this.codegen
+ .update(cx, |codegen, cx| codegen.cycle_next(cx))
+ })),
+ )
+ .into_any_element()
+ }
+
+ fn render_rate_limit_notice(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+ Popover::new().child(
+ v_flex()
+ .occlude()
+ .p_2()
+ .child(
+ Label::new("Out of Tokens")
+ .size(LabelSize::Small)
+ .weight(FontWeight::BOLD),
+ )
+ .child(Label::new(
+ "Try Zed Pro for higher limits, a wider range of models, and more.",
+ ))
+ .child(
+ h_flex()
+ .justify_between()
+ .child(CheckboxWithLabel::new(
+ "dont-show-again",
+ Label::new("Don't show again"),
+ if dismissed_rate_limit_notice() {
+ ui::Selection::Selected
+ } else {
+ ui::Selection::Unselected
+ },
+ |selection, cx| {
+ let is_dismissed = match selection {
+ ui::Selection::Unselected => false,
+ ui::Selection::Indeterminate => return,
+ ui::Selection::Selected => true,
+ };
+
+ set_rate_limit_notice_dismissed(is_dismissed, cx)
+ },
+ ))
+ .child(
+ h_flex()
+ .gap_2()
+ .child(
+ Button::new("dismiss", "Dismiss")
+ .style(ButtonStyle::Transparent)
+ .on_click(cx.listener(Self::toggle_rate_limit_notice)),
+ )
+ .child(Button::new("more-info", "More Info").on_click(
+ |_event, cx| {
+ cx.dispatch_action(Box::new(
+ zed_actions::OpenAccountSettings,
+ ))
+ },
+ )),
+ ),
+ ),
+ )
+ }
+
+ fn render_editor(&mut self, cx: &mut ViewContext<Self>) -> AnyElement {
+ let font_size = TextSize::Default.rems(cx);
+ let line_height = font_size.to_pixels(cx.rem_size()) * 1.3;
+
+ v_flex()
+ .key_context("MessageEditor")
+ .size_full()
+ .gap_2()
+ .p_2()
+ .bg(cx.theme().colors().editor_background)
+ .child({
+ let settings = ThemeSettings::get_global(cx);
+ let text_style = TextStyle {
+ color: cx.theme().colors().editor_foreground,
+ font_family: settings.ui_font.family.clone(),
+ font_features: settings.ui_font.features.clone(),
+ font_size: font_size.into(),
+ font_weight: settings.ui_font.weight,
+ line_height: line_height.into(),
+ ..Default::default()
+ };
+
+ EditorElement::new(
+ &self.editor,
+ EditorStyle {
+ background: cx.theme().colors().editor_background,
+ local_player: cx.theme().players().local(),
+ text: text_style,
+ ..Default::default()
+ },
+ )
+ })
+ .into_any_element()
+ }
+}
+
+const DISMISSED_RATE_LIMIT_NOTICE_KEY: &str = "dismissed-rate-limit-notice";
+
+fn dismissed_rate_limit_notice() -> bool {
+ db::kvp::KEY_VALUE_STORE
+ .read_kvp(DISMISSED_RATE_LIMIT_NOTICE_KEY)
+ .log_err()
+ .map_or(false, |s| s.is_some())
+}
+
+fn set_rate_limit_notice_dismissed(is_dismissed: bool, cx: &mut AppContext) {
+ db::write_and_log(cx, move || async move {
+ if is_dismissed {
+ db::kvp::KEY_VALUE_STORE
+ .write_kvp(DISMISSED_RATE_LIMIT_NOTICE_KEY.into(), "1".into())
+ .await
+ } else {
+ db::kvp::KEY_VALUE_STORE
+ .delete_kvp(DISMISSED_RATE_LIMIT_NOTICE_KEY.into())
+ .await
+ }
+ })
+}
+
+pub struct InlineAssist {
+ group_id: InlineAssistGroupId,
+ range: Range<Anchor>,
+ editor: WeakView<Editor>,
+ decorations: Option<InlineAssistDecorations>,
+ codegen: Model<Codegen>,
+ _subscriptions: Vec<Subscription>,
+ workspace: Option<WeakView<Workspace>>,
+}
+
+impl InlineAssist {
+ #[allow(clippy::too_many_arguments)]
+ fn new(
+ assist_id: InlineAssistId,
+ group_id: InlineAssistGroupId,
+ editor: &View<Editor>,
+ prompt_editor: &View<PromptEditor>,
+ prompt_block_id: CustomBlockId,
+ end_block_id: CustomBlockId,
+ range: Range<Anchor>,
+ codegen: Model<Codegen>,
+ workspace: Option<WeakView<Workspace>>,
+ cx: &mut WindowContext,
+ ) -> Self {
+ let prompt_editor_focus_handle = prompt_editor.focus_handle(cx);
+ InlineAssist {
+ group_id,
+ editor: editor.downgrade(),
+ decorations: Some(InlineAssistDecorations {
+ prompt_block_id,
+ prompt_editor: prompt_editor.clone(),
+ removed_line_block_ids: HashSet::default(),
+ end_block_id,
+ }),
+ range,
+ codegen: codegen.clone(),
+ workspace: workspace.clone(),
+ _subscriptions: vec![
+ cx.on_focus_in(&prompt_editor_focus_handle, move |cx| {
+ InlineAssistant::update_global(cx, |this, cx| {
+ this.handle_prompt_editor_focus_in(assist_id, cx)
+ })
+ }),
+ cx.on_focus_out(&prompt_editor_focus_handle, move |_, cx| {
+ InlineAssistant::update_global(cx, |this, cx| {
+ this.handle_prompt_editor_focus_out(assist_id, cx)
+ })
+ }),
+ cx.subscribe(prompt_editor, |prompt_editor, event, cx| {
+ InlineAssistant::update_global(cx, |this, cx| {
+ this.handle_prompt_editor_event(prompt_editor, event, cx)
+ })
+ }),
+ cx.observe(&codegen, {
+ let editor = editor.downgrade();
+ move |_, cx| {
+ if let Some(editor) = editor.upgrade() {
+ InlineAssistant::update_global(cx, |this, cx| {
+ if let Some(editor_assists) =
+ this.assists_by_editor.get(&editor.downgrade())
+ {
+ editor_assists.highlight_updates.send(()).ok();
+ }
+
+ this.update_editor_blocks(&editor, assist_id, cx);
+ })
+ }
+ }
+ }),
+ cx.subscribe(&codegen, move |codegen, event, cx| {
+ InlineAssistant::update_global(cx, |this, cx| match event {
+ CodegenEvent::Undone => this.finish_assist(assist_id, false, cx),
+ CodegenEvent::Finished => {
+ let assist = if let Some(assist) = this.assists.get(&assist_id) {
+ assist
+ } else {
+ return;
+ };
+
+ if let CodegenStatus::Error(error) = codegen.read(cx).status(cx) {
+ if assist.decorations.is_none() {
+ if let Some(workspace) = assist
+ .workspace
+ .as_ref()
+ .and_then(|workspace| workspace.upgrade())
+ {
+ let error = format!("Inline assistant error: {}", error);
+ workspace.update(cx, |workspace, cx| {
+ struct InlineAssistantError;
+
+ let id =
+ NotificationId::composite::<InlineAssistantError>(
+ assist_id.0,
+ );
+
+ workspace.show_toast(Toast::new(id, error), cx);
+ })
+ }
+ }
+ }
+
+ if assist.decorations.is_none() {
+ this.finish_assist(assist_id, false, cx);
+ }
+ }
+ })
+ }),
+ ],
+ }
+ }
+
+ fn user_prompt(&self, cx: &AppContext) -> Option<String> {
+ let decorations = self.decorations.as_ref()?;
+ Some(decorations.prompt_editor.read(cx).prompt(cx))
+ }
+}
+
+struct InlineAssistDecorations {
+ prompt_block_id: CustomBlockId,
+ prompt_editor: View<PromptEditor>,
+ removed_line_block_ids: HashSet<CustomBlockId>,
+ end_block_id: CustomBlockId,
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum CodegenEvent {
+ Finished,
+ Undone,
+}
+
+pub struct Codegen {
+ alternatives: Vec<Model<CodegenAlternative>>,
+ active_alternative: usize,
+ seen_alternatives: HashSet<usize>,
+ subscriptions: Vec<Subscription>,
+ buffer: Model<MultiBuffer>,
+ range: Range<Anchor>,
+ initial_transaction_id: Option<TransactionId>,
+ telemetry: Arc<Telemetry>,
+ builder: Arc<PromptBuilder>,
+ is_insertion: bool,
+}
+
+impl Codegen {
+ pub fn new(
+ buffer: Model<MultiBuffer>,
+ range: Range<Anchor>,
+ initial_transaction_id: Option<TransactionId>,
+ telemetry: Arc<Telemetry>,
+ builder: Arc<PromptBuilder>,
+ cx: &mut ModelContext<Self>,
+ ) -> Self {
+ let codegen = cx.new_model(|cx| {
+ CodegenAlternative::new(
+ buffer.clone(),
+ range.clone(),
+ false,
+ Some(telemetry.clone()),
+ builder.clone(),
+ cx,
+ )
+ });
+ let mut this = Self {
+ is_insertion: range.to_offset(&buffer.read(cx).snapshot(cx)).is_empty(),
+ alternatives: vec![codegen],
+ active_alternative: 0,
+ seen_alternatives: HashSet::default(),
+ subscriptions: Vec::new(),
+ buffer,
+ range,
+ initial_transaction_id,
+ telemetry,
+ builder,
+ };
+ this.activate(0, cx);
+ this
+ }
+
+ fn subscribe_to_alternative(&mut self, cx: &mut ModelContext<Self>) {
+ let codegen = self.active_alternative().clone();
+ self.subscriptions.clear();
+ self.subscriptions
+ .push(cx.observe(&codegen, |_, _, cx| cx.notify()));
+ self.subscriptions
+ .push(cx.subscribe(&codegen, |_, _, event, cx| cx.emit(*event)));
+ }
+
+ fn active_alternative(&self) -> &Model<CodegenAlternative> {
+ &self.alternatives[self.active_alternative]
+ }
+
+ fn status<'a>(&self, cx: &'a AppContext) -> &'a CodegenStatus {
+ &self.active_alternative().read(cx).status
+ }
+
+ fn alternative_count(&self, cx: &AppContext) -> usize {
+ LanguageModelRegistry::read_global(cx)
+ .inline_alternative_models()
+ .len()
+ + 1
+ }
+
+ pub fn cycle_prev(&mut self, cx: &mut ModelContext<Self>) {
+ let next_active_ix = if self.active_alternative == 0 {
+ self.alternatives.len() - 1
+ } else {
+ self.active_alternative - 1
+ };
+ self.activate(next_active_ix, cx);
+ }
+
+ pub fn cycle_next(&mut self, cx: &mut ModelContext<Self>) {
+ let next_active_ix = (self.active_alternative + 1) % self.alternatives.len();
+ self.activate(next_active_ix, cx);
+ }
+
+ fn activate(&mut self, index: usize, cx: &mut ModelContext<Self>) {
+ self.active_alternative()
+ .update(cx, |codegen, cx| codegen.set_active(false, cx));
+ self.seen_alternatives.insert(index);
+ self.active_alternative = index;
+ self.active_alternative()
+ .update(cx, |codegen, cx| codegen.set_active(true, cx));
+ self.subscribe_to_alternative(cx);
+ cx.notify();
+ }
+
+ pub fn start(&mut self, user_prompt: String, cx: &mut ModelContext<Self>) -> Result<()> {
+ let alternative_models = LanguageModelRegistry::read_global(cx)
+ .inline_alternative_models()
+ .to_vec();
+
+ self.active_alternative()
+ .update(cx, |alternative, cx| alternative.undo(cx));
+ self.activate(0, cx);
+ self.alternatives.truncate(1);
+
+ for _ in 0..alternative_models.len() {
+ self.alternatives.push(cx.new_model(|cx| {
+ CodegenAlternative::new(
+ self.buffer.clone(),
+ self.range.clone(),
+ false,
+ Some(self.telemetry.clone()),
+ self.builder.clone(),
+ cx,
+ )
+ }));
+ }
+
+ let primary_model = LanguageModelRegistry::read_global(cx)
+ .active_model()
+ .context("no active model")?;
+
+ for (model, alternative) in iter::once(primary_model)
+ .chain(alternative_models)
+ .zip(&self.alternatives)
+ {
+ alternative.update(cx, |alternative, cx| {
+ alternative.start(user_prompt.clone(), model.clone(), cx)
+ })?;
+ }
+
+ Ok(())
+ }
+
+ pub fn stop(&mut self, cx: &mut ModelContext<Self>) {
+ for codegen in &self.alternatives {
+ codegen.update(cx, |codegen, cx| codegen.stop(cx));
+ }
+ }
+
+ pub fn undo(&mut self, cx: &mut ModelContext<Self>) {
+ self.active_alternative()
+ .update(cx, |codegen, cx| codegen.undo(cx));
+
+ self.buffer.update(cx, |buffer, cx| {
+ if let Some(transaction_id) = self.initial_transaction_id.take() {
+ buffer.undo_transaction(transaction_id, cx);
+ buffer.refresh_preview(cx);
+ }
+ });
+ }
+
+ pub fn buffer(&self, cx: &AppContext) -> Model<MultiBuffer> {
+ self.active_alternative().read(cx).buffer.clone()
+ }
+
+ pub fn old_buffer(&self, cx: &AppContext) -> Model<Buffer> {
+ self.active_alternative().read(cx).old_buffer.clone()
+ }
+
+ pub fn snapshot(&self, cx: &AppContext) -> MultiBufferSnapshot {
+ self.active_alternative().read(cx).snapshot.clone()
+ }
+
+ pub fn edit_position(&self, cx: &AppContext) -> Option<Anchor> {
+ self.active_alternative().read(cx).edit_position
+ }
+
+ fn diff<'a>(&self, cx: &'a AppContext) -> &'a Diff {
+ &self.active_alternative().read(cx).diff
+ }
+
+ pub fn last_equal_ranges<'a>(&self, cx: &'a AppContext) -> &'a [Range<Anchor>] {
+ self.active_alternative().read(cx).last_equal_ranges()
+ }
+}
+
+impl EventEmitter<CodegenEvent> for Codegen {}
+
+pub struct CodegenAlternative {
+ buffer: Model<MultiBuffer>,
+ old_buffer: Model<Buffer>,
+ snapshot: MultiBufferSnapshot,
+ edit_position: Option<Anchor>,
+ range: Range<Anchor>,
+ last_equal_ranges: Vec<Range<Anchor>>,
+ transformation_transaction_id: Option<TransactionId>,
+ status: CodegenStatus,
+ generation: Task<()>,
+ diff: Diff,
+ telemetry: Option<Arc<Telemetry>>,
+ _subscription: gpui::Subscription,
+ builder: Arc<PromptBuilder>,
+ active: bool,
+ edits: Vec<(Range<Anchor>, String)>,
+ line_operations: Vec<LineOperation>,
+ request: Option<LanguageModelRequest>,
+ elapsed_time: Option<f64>,
+ completion: Option<String>,
+ message_id: Option<String>,
+}
+
+enum CodegenStatus {
+ Idle,
+ Pending,
+ Done,
+ Error(anyhow::Error),
+}
+
+#[derive(Default)]
+struct Diff {
+ deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)>,
+ inserted_row_ranges: Vec<Range<Anchor>>,
+}
+
+impl Diff {
+ fn is_empty(&self) -> bool {
+ self.deleted_row_ranges.is_empty() && self.inserted_row_ranges.is_empty()
+ }
+}
+
+impl EventEmitter<CodegenEvent> for CodegenAlternative {}
+
+impl CodegenAlternative {
+ pub fn new(
+ buffer: Model<MultiBuffer>,
+ range: Range<Anchor>,
+ active: bool,
+ telemetry: Option<Arc<Telemetry>>,
+ builder: Arc<PromptBuilder>,
+ cx: &mut ModelContext<Self>,
+ ) -> Self {
+ let snapshot = buffer.read(cx).snapshot(cx);
+
+ let (old_buffer, _, _) = buffer
+ .read(cx)
+ .range_to_buffer_ranges(range.clone(), cx)
+ .pop()
+ .unwrap();
+ let old_buffer = cx.new_model(|cx| {
+ let old_buffer = old_buffer.read(cx);
+ let text = old_buffer.as_rope().clone();
+ let line_ending = old_buffer.line_ending();
+ let language = old_buffer.language().cloned();
+ let language_registry = old_buffer.language_registry();
+
+ let mut buffer = Buffer::local_normalized(text, line_ending, cx);
+ buffer.set_language(language, cx);
+ if let Some(language_registry) = language_registry {
+ buffer.set_language_registry(language_registry)
+ }
+ buffer
+ });
+
+ Self {
+ buffer: buffer.clone(),
+ old_buffer,
+ edit_position: None,
+ message_id: None,
+ snapshot,
+ last_equal_ranges: Default::default(),
+ transformation_transaction_id: None,
+ status: CodegenStatus::Idle,
+ generation: Task::ready(()),
+ diff: Diff::default(),
+ telemetry,
+ _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
+ builder,
+ active,
+ edits: Vec::new(),
+ line_operations: Vec::new(),
+ range,
+ request: None,
+ elapsed_time: None,
+ completion: None,
+ }
+ }
+
+ fn set_active(&mut self, active: bool, cx: &mut ModelContext<Self>) {
+ if active != self.active {
+ self.active = active;
+
+ if self.active {
+ let edits = self.edits.clone();
+ self.apply_edits(edits, cx);
+ if matches!(self.status, CodegenStatus::Pending) {
+ let line_operations = self.line_operations.clone();
+ self.reapply_line_based_diff(line_operations, cx);
+ } else {
+ self.reapply_batch_diff(cx).detach();
+ }
+ } else if let Some(transaction_id) = self.transformation_transaction_id.take() {
+ self.buffer.update(cx, |buffer, cx| {
+ buffer.undo_transaction(transaction_id, cx);
+ buffer.forget_transaction(transaction_id, cx);
+ });
+ }
+ }
+ }
+
+ fn handle_buffer_event(
+ &mut self,
+ _buffer: Model<MultiBuffer>,
+ event: &multi_buffer::Event,
+ cx: &mut ModelContext<Self>,
+ ) {
+ if let multi_buffer::Event::TransactionUndone { transaction_id } = event {
+ if self.transformation_transaction_id == Some(*transaction_id) {
+ self.transformation_transaction_id = None;
+ self.generation = Task::ready(());
+ cx.emit(CodegenEvent::Undone);
+ }
+ }
+ }
+
+ pub fn last_equal_ranges(&self) -> &[Range<Anchor>] {
+ &self.last_equal_ranges
+ }
+
+ pub fn start(
+ &mut self,
+ user_prompt: String,
+ model: Arc<dyn LanguageModel>,
+ cx: &mut ModelContext<Self>,
+ ) -> Result<()> {
+ if let Some(transformation_transaction_id) = self.transformation_transaction_id.take() {
+ self.buffer.update(cx, |buffer, cx| {
+ buffer.undo_transaction(transformation_transaction_id, cx);
+ });
+ }
+
+ self.edit_position = Some(self.range.start.bias_right(&self.snapshot));
+
+ let api_key = model.api_key(cx);
+ let telemetry_id = model.telemetry_id();
+ let provider_id = model.provider_id();
+ let stream: LocalBoxFuture<Result<LanguageModelTextStream>> =
+ if user_prompt.trim().to_lowercase() == "delete" {
+ async { Ok(LanguageModelTextStream::default()) }.boxed_local()
+ } else {
+ let request = self.build_request(user_prompt, cx)?;
+ self.request = Some(request.clone());
+
+ cx.spawn(|_, cx| async move { model.stream_completion_text(request, &cx).await })
+ .boxed_local()
+ };
+ self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
+ Ok(())
+ }
+
+ fn build_request(&self, user_prompt: String, cx: &AppContext) -> Result<LanguageModelRequest> {
+ let buffer = self.buffer.read(cx).snapshot(cx);
+ let language = buffer.language_at(self.range.start);
+ let language_name = if let Some(language) = language.as_ref() {
+ if Arc::ptr_eq(language, &language::PLAIN_TEXT) {
+ None
+ } else {
+ Some(language.name())
+ }
+ } else {
+ None
+ };
+
+ let language_name = language_name.as_ref();
+ let start = buffer.point_to_buffer_offset(self.range.start);
+ let end = buffer.point_to_buffer_offset(self.range.end);
+ let (buffer, range) = if let Some((start, end)) = start.zip(end) {
+ let (start_buffer, start_buffer_offset) = start;
+ let (end_buffer, end_buffer_offset) = end;
+ if start_buffer.remote_id() == end_buffer.remote_id() {
+ (start_buffer.clone(), start_buffer_offset..end_buffer_offset)
+ } else {
+ return Err(anyhow::anyhow!("invalid transformation range"));
+ }
+ } else {
+ return Err(anyhow::anyhow!("invalid transformation range"));
+ };
+
+ let prompt = self
+ .builder
+ .generate_inline_transformation_prompt(user_prompt, language_name, buffer, range)
+ .map_err(|e| anyhow::anyhow!("Failed to generate content prompt: {}", e))?;
+
+ Ok(LanguageModelRequest {
+ tools: Vec::new(),
+ stop: Vec::new(),
+ temperature: None,
+ messages: vec![LanguageModelRequestMessage {
+ role: Role::User,
+ content: vec![prompt.into()],
+ cache: false,
+ }],
+ })
+ }
+
+ pub fn handle_stream(
+ &mut self,
+ model_telemetry_id: String,
+ model_provider_id: String,
+ model_api_key: Option<String>,
+ stream: impl 'static + Future<Output = Result<LanguageModelTextStream>>,
+ cx: &mut ModelContext<Self>,
+ ) {
+ let start_time = Instant::now();
+ let snapshot = self.snapshot.clone();
+ let selected_text = snapshot
+ .text_for_range(self.range.start..self.range.end)
+ .collect::<Rope>();
+
+ let selection_start = self.range.start.to_point(&snapshot);
+
+ // Start with the indentation of the first line in the selection
+ let mut suggested_line_indent = snapshot
+ .suggested_indents(selection_start.row..=selection_start.row, cx)
+ .into_values()
+ .next()
+ .unwrap_or_else(|| snapshot.indent_size_for_line(MultiBufferRow(selection_start.row)));
+
+ // If the first line in the selection does not have indentation, check the following lines
+ if suggested_line_indent.len == 0 && suggested_line_indent.kind == IndentKind::Space {
+ for row in selection_start.row..=self.range.end.to_point(&snapshot).row {
+ let line_indent = snapshot.indent_size_for_line(MultiBufferRow(row));
+ // Prefer tabs if a line in the selection uses tabs as indentation
+ if line_indent.kind == IndentKind::Tab {
+ suggested_line_indent.kind = IndentKind::Tab;
+ break;
+ }
+ }
+ }
+
+ let http_client = cx.http_client().clone();
+ let telemetry = self.telemetry.clone();
+ let language_name = {
+ let multibuffer = self.buffer.read(cx);
+ let ranges = multibuffer.range_to_buffer_ranges(self.range.clone(), cx);
+ ranges
+ .first()
+ .and_then(|(buffer, _, _)| buffer.read(cx).language())
+ .map(|language| language.name())
+ };
+
+ self.diff = Diff::default();
+ self.status = CodegenStatus::Pending;
+ let mut edit_start = self.range.start.to_offset(&snapshot);
+ let completion = Arc::new(Mutex::new(String::new()));
+ let completion_clone = completion.clone();
+
+ self.generation = cx.spawn(|codegen, mut cx| {
+ async move {
+ let stream = stream.await;
+ let message_id = stream
+ .as_ref()
+ .ok()
+ .and_then(|stream| stream.message_id.clone());
+ let generate = async {
+ let (mut diff_tx, mut diff_rx) = mpsc::channel(1);
+ let executor = cx.background_executor().clone();
+ let message_id = message_id.clone();
+ let line_based_stream_diff: Task<anyhow::Result<()>> =
+ cx.background_executor().spawn(async move {
+ let mut response_latency = None;
+ let request_start = Instant::now();
+ let diff = async {
+ let chunks = StripInvalidSpans::new(stream?.stream);
+ futures::pin_mut!(chunks);
+ let mut diff = StreamingDiff::new(selected_text.to_string());
+ let mut line_diff = LineDiff::default();
+
+ let mut new_text = String::new();
+ let mut base_indent = None;
+ let mut line_indent = None;
+ let mut first_line = true;
+
+ while let Some(chunk) = chunks.next().await {
+ if response_latency.is_none() {
+ response_latency = Some(request_start.elapsed());
+ }
+ let chunk = chunk?;
+ completion_clone.lock().push_str(&chunk);
+
+ let mut lines = chunk.split('\n').peekable();
+ while let Some(line) = lines.next() {
+ new_text.push_str(line);
+ if line_indent.is_none() {
+ if let Some(non_whitespace_ch_ix) =
+ new_text.find(|ch: char| !ch.is_whitespace())
+ {
+ line_indent = Some(non_whitespace_ch_ix);
+ base_indent = base_indent.or(line_indent);
+
+ let line_indent = line_indent.unwrap();
+ let base_indent = base_indent.unwrap();
+ let indent_delta =
+ line_indent as i32 - base_indent as i32;
+ let mut corrected_indent_len = cmp::max(
+ 0,
+ suggested_line_indent.len as i32 + indent_delta,
+ )
+ as usize;
+ if first_line {
+ corrected_indent_len = corrected_indent_len
+ .saturating_sub(
+ selection_start.column as usize,
+ );
+ }
+
+ let indent_char = suggested_line_indent.char();
+ let mut indent_buffer = [0; 4];
+ let indent_str =
+ indent_char.encode_utf8(&mut indent_buffer);
+ new_text.replace_range(
+ ..line_indent,
+ &indent_str.repeat(corrected_indent_len),
+ );
+ }
+ }
+
+ if line_indent.is_some() {
+ let char_ops = diff.push_new(&new_text);
+ line_diff
+ .push_char_operations(&char_ops, &selected_text);
+ diff_tx
+ .send((char_ops, line_diff.line_operations()))
+ .await?;
+ new_text.clear();
+ }
+
+ if lines.peek().is_some() {
+ let char_ops = diff.push_new("\n");
+ line_diff
+ .push_char_operations(&char_ops, &selected_text);
+ diff_tx
+ .send((char_ops, line_diff.line_operations()))
+ .await?;
+ if line_indent.is_none() {
+ // Don't write out the leading indentation in empty lines on the next line
+ // This is the case where the above if statement didn't clear the buffer
+ new_text.clear();
+ }
+ line_indent = None;
+ first_line = false;
+ }
+ }
+ }
+
+ let mut char_ops = diff.push_new(&new_text);
+ char_ops.extend(diff.finish());
+ line_diff.push_char_operations(&char_ops, &selected_text);
+ line_diff.finish(&selected_text);
+ diff_tx
+ .send((char_ops, line_diff.line_operations()))
+ .await?;
+
+ anyhow::Ok(())
+ };
+
+ let result = diff.await;
+
+ let error_message =
+ result.as_ref().err().map(|error| error.to_string());
+ report_assistant_event(
+ AssistantEvent {
+ conversation_id: None,
+ message_id,
+ kind: AssistantKind::Inline,
+ phase: AssistantPhase::Response,
+ model: model_telemetry_id,
+ model_provider: model_provider_id.to_string(),
+ response_latency,
+ error_message,
+ language_name: language_name.map(|name| name.to_proto()),
+ },
+ telemetry,
+ http_client,
+ model_api_key,
+ &executor,
+ );
+
+ result?;
+ Ok(())
+ });
+
+ while let Some((char_ops, line_ops)) = diff_rx.next().await {
+ codegen.update(&mut cx, |codegen, cx| {
+ codegen.last_equal_ranges.clear();
+
+ let edits = char_ops
+ .into_iter()
+ .filter_map(|operation| match operation {
+ CharOperation::Insert { text } => {
+ let edit_start = snapshot.anchor_after(edit_start);
+ Some((edit_start..edit_start, text))
+ }
+ CharOperation::Delete { bytes } => {
+ let edit_end = edit_start + bytes;
+ let edit_range = snapshot.anchor_after(edit_start)
+ ..snapshot.anchor_before(edit_end);
+ edit_start = edit_end;
+ Some((edit_range, String::new()))
+ }
+ CharOperation::Keep { bytes } => {
+ let edit_end = edit_start + bytes;
+ let edit_range = snapshot.anchor_after(edit_start)
+ ..snapshot.anchor_before(edit_end);
+ edit_start = edit_end;
+ codegen.last_equal_ranges.push(edit_range);
+ None
+ }
+ })
+ .collect::<Vec<_>>();
+
+ if codegen.active {
+ codegen.apply_edits(edits.iter().cloned(), cx);
+ codegen.reapply_line_based_diff(line_ops.iter().cloned(), cx);
+ }
+ codegen.edits.extend(edits);
+ codegen.line_operations = line_ops;
+ codegen.edit_position = Some(snapshot.anchor_after(edit_start));
+
+ cx.notify();
+ })?;
+ }
+
+ // Streaming stopped and we have the new text in the buffer, and a line-based diff applied for the whole new buffer.
+ // That diff is not what a regular diff is and might look unexpected, ergo apply a regular diff.
+ // It's fine to apply even if the rest of the line diffing fails, as no more hunks are coming through `diff_rx`.
+ let batch_diff_task =
+ codegen.update(&mut cx, |codegen, cx| codegen.reapply_batch_diff(cx))?;
+ let (line_based_stream_diff, ()) =
+ join!(line_based_stream_diff, batch_diff_task);
+ line_based_stream_diff?;
+
+ anyhow::Ok(())
+ };
+
+ let result = generate.await;
+ let elapsed_time = start_time.elapsed().as_secs_f64();
+
+ codegen
+ .update(&mut cx, |this, cx| {
+ this.message_id = message_id;
+ this.last_equal_ranges.clear();
+ if let Err(error) = result {
+ this.status = CodegenStatus::Error(error);
+ } else {
+ this.status = CodegenStatus::Done;
+ }
+ this.elapsed_time = Some(elapsed_time);
+ this.completion = Some(completion.lock().clone());
+ cx.emit(CodegenEvent::Finished);
+ cx.notify();
+ })
+ .ok();
+ }
+ });
+ cx.notify();
+ }
+
+ pub fn stop(&mut self, cx: &mut ModelContext<Self>) {
+ self.last_equal_ranges.clear();
+ if self.diff.is_empty() {
+ self.status = CodegenStatus::Idle;
+ } else {
+ self.status = CodegenStatus::Done;
+ }
+ self.generation = Task::ready(());
+ cx.emit(CodegenEvent::Finished);
+ cx.notify();
+ }
+
+ pub fn undo(&mut self, cx: &mut ModelContext<Self>) {
+ self.buffer.update(cx, |buffer, cx| {
+ if let Some(transaction_id) = self.transformation_transaction_id.take() {
+ buffer.undo_transaction(transaction_id, cx);
+ buffer.refresh_preview(cx);
+ }
+ });
+ }
+
+ fn apply_edits(
+ &mut self,
+ edits: impl IntoIterator<Item = (Range<Anchor>, String)>,
+ cx: &mut ModelContext<CodegenAlternative>,
+ ) {
+ let transaction = self.buffer.update(cx, |buffer, cx| {
+ // Avoid grouping assistant edits with user edits.
+ buffer.finalize_last_transaction(cx);
+ buffer.start_transaction(cx);
+ buffer.edit(edits, None, cx);
+ buffer.end_transaction(cx)
+ });
+
+ if let Some(transaction) = transaction {
+ if let Some(first_transaction) = self.transformation_transaction_id {
+ // Group all assistant edits into the first transaction.
+ self.buffer.update(cx, |buffer, cx| {
+ buffer.merge_transactions(transaction, first_transaction, cx)
+ });
+ } else {
+ self.transformation_transaction_id = Some(transaction);
+ self.buffer
+ .update(cx, |buffer, cx| buffer.finalize_last_transaction(cx));
+ }
+ }
+ }
+
+ fn reapply_line_based_diff(
+ &mut self,
+ line_operations: impl IntoIterator<Item = LineOperation>,
+ cx: &mut ModelContext<Self>,
+ ) {
+ let old_snapshot = self.snapshot.clone();
+ let old_range = self.range.to_point(&old_snapshot);
+ let new_snapshot = self.buffer.read(cx).snapshot(cx);
+ let new_range = self.range.to_point(&new_snapshot);
+
+ let mut old_row = old_range.start.row;
+ let mut new_row = new_range.start.row;
+
+ self.diff.deleted_row_ranges.clear();
+ self.diff.inserted_row_ranges.clear();
+ for operation in line_operations {
+ match operation {
+ LineOperation::Keep { lines } => {
+ old_row += lines;
+ new_row += lines;
+ }
+ LineOperation::Delete { lines } => {
+ let old_end_row = old_row + lines - 1;
+ let new_row = new_snapshot.anchor_before(Point::new(new_row, 0));
+
+ if let Some((_, last_deleted_row_range)) =
+ self.diff.deleted_row_ranges.last_mut()
+ {
+ if *last_deleted_row_range.end() + 1 == old_row {
+ *last_deleted_row_range = *last_deleted_row_range.start()..=old_end_row;
+ } else {
+ self.diff
+ .deleted_row_ranges
+ .push((new_row, old_row..=old_end_row));
+ }
+ } else {
+ self.diff
+ .deleted_row_ranges
+ .push((new_row, old_row..=old_end_row));
+ }
+
+ old_row += lines;
+ }
+ LineOperation::Insert { lines } => {
+ let new_end_row = new_row + lines - 1;
+ let start = new_snapshot.anchor_before(Point::new(new_row, 0));
+ let end = new_snapshot.anchor_before(Point::new(
+ new_end_row,
+ new_snapshot.line_len(MultiBufferRow(new_end_row)),
+ ));
+ self.diff.inserted_row_ranges.push(start..end);
+ new_row += lines;
+ }
+ }
+
+ cx.notify();
+ }
+ }
+
+ fn reapply_batch_diff(&mut self, cx: &mut ModelContext<Self>) -> Task<()> {
+ let old_snapshot = self.snapshot.clone();
+ let old_range = self.range.to_point(&old_snapshot);
+ let new_snapshot = self.buffer.read(cx).snapshot(cx);
+ let new_range = self.range.to_point(&new_snapshot);
+
+ cx.spawn(|codegen, mut cx| async move {
+ let (deleted_row_ranges, inserted_row_ranges) = cx
+ .background_executor()
+ .spawn(async move {
+ let old_text = old_snapshot
+ .text_for_range(
+ Point::new(old_range.start.row, 0)
+ ..Point::new(
+ old_range.end.row,
+ old_snapshot.line_len(MultiBufferRow(old_range.end.row)),
+ ),
+ )
+ .collect::<String>();
+ let new_text = new_snapshot
+ .text_for_range(
+ Point::new(new_range.start.row, 0)
+ ..Point::new(
+ new_range.end.row,
+ new_snapshot.line_len(MultiBufferRow(new_range.end.row)),
+ ),
+ )
+ .collect::<String>();
+
+ let mut old_row = old_range.start.row;
+ let mut new_row = new_range.start.row;
+ let batch_diff =
+ similar::TextDiff::from_lines(old_text.as_str(), new_text.as_str());
+
+ let mut deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)> = Vec::new();
+ let mut inserted_row_ranges = Vec::new();
+ for change in batch_diff.iter_all_changes() {
+ let line_count = change.value().lines().count() as u32;
+ match change.tag() {
+ similar::ChangeTag::Equal => {
+ old_row += line_count;
+ new_row += line_count;
+ }
+ similar::ChangeTag::Delete => {
+ let old_end_row = old_row + line_count - 1;
+ let new_row = new_snapshot.anchor_before(Point::new(new_row, 0));
+
+ if let Some((_, last_deleted_row_range)) =
+ deleted_row_ranges.last_mut()
+ {
+ if *last_deleted_row_range.end() + 1 == old_row {
+ *last_deleted_row_range =
+ *last_deleted_row_range.start()..=old_end_row;
+ } else {
+ deleted_row_ranges.push((new_row, old_row..=old_end_row));
+ }
+ } else {
+ deleted_row_ranges.push((new_row, old_row..=old_end_row));
+ }
+
+ old_row += line_count;
+ }
+ similar::ChangeTag::Insert => {
+ let new_end_row = new_row + line_count - 1;
+ let start = new_snapshot.anchor_before(Point::new(new_row, 0));
+ let end = new_snapshot.anchor_before(Point::new(
+ new_end_row,
+ new_snapshot.line_len(MultiBufferRow(new_end_row)),
+ ));
+ inserted_row_ranges.push(start..end);
+ new_row += line_count;
+ }
+ }
+ }
+
+ (deleted_row_ranges, inserted_row_ranges)
+ })
+ .await;
+
+ codegen
+ .update(&mut cx, |codegen, cx| {
+ codegen.diff.deleted_row_ranges = deleted_row_ranges;
+ codegen.diff.inserted_row_ranges = inserted_row_ranges;
+ cx.notify();
+ })
+ .ok();
+ })
+ }
+}
+
+struct StripInvalidSpans<T> {
+ stream: T,
+ stream_done: bool,
+ buffer: String,
+ first_line: bool,
+ line_end: bool,
+ starts_with_code_block: bool,
+}
+
+impl<T> StripInvalidSpans<T>
+where
+ T: Stream<Item = Result<String>>,
+{
+ fn new(stream: T) -> Self {
+ Self {
+ stream,
+ stream_done: false,
+ buffer: String::new(),
+ first_line: true,
+ line_end: false,
+ starts_with_code_block: false,
+ }
+ }
+}
+
+impl<T> Stream for StripInvalidSpans<T>
+where
+ T: Stream<Item = Result<String>>,
+{
+ type Item = Result<String>;
+
+ fn poll_next(self: Pin<&mut Self>, cx: &mut task::Context) -> Poll<Option<Self::Item>> {
+ const CODE_BLOCK_DELIMITER: &str = "```";
+ const CURSOR_SPAN: &str = "<|CURSOR|>";
+
+ let this = unsafe { self.get_unchecked_mut() };
+ loop {
+ if !this.stream_done {
+ let mut stream = unsafe { Pin::new_unchecked(&mut this.stream) };
+ match stream.as_mut().poll_next(cx) {
+ Poll::Ready(Some(Ok(chunk))) => {
+ this.buffer.push_str(&chunk);
+ }
+ Poll::Ready(Some(Err(error))) => return Poll::Ready(Some(Err(error))),
+ Poll::Ready(None) => {
+ this.stream_done = true;
+ }
+ Poll::Pending => return Poll::Pending,
+ }
+ }
+
+ let mut chunk = String::new();
+ let mut consumed = 0;
+ if !this.buffer.is_empty() {
+ let mut lines = this.buffer.split('\n').enumerate().peekable();
+ while let Some((line_ix, line)) = lines.next() {
+ if line_ix > 0 {
+ this.first_line = false;
+ }
+
+ if this.first_line {
+ let trimmed_line = line.trim();
+ if lines.peek().is_some() {
+ if trimmed_line.starts_with(CODE_BLOCK_DELIMITER) {
+ consumed += line.len() + 1;
+ this.starts_with_code_block = true;
+ continue;
+ }
+ } else if trimmed_line.is_empty()
+ || prefixes(CODE_BLOCK_DELIMITER)
+ .any(|prefix| trimmed_line.starts_with(prefix))
+ {
+ break;
+ }
+ }
+
+ let line_without_cursor = line.replace(CURSOR_SPAN, "");
+ if lines.peek().is_some() {
+ if this.line_end {
+ chunk.push('\n');
+ }
+
+ chunk.push_str(&line_without_cursor);
+ this.line_end = true;
+ consumed += line.len() + 1;
+ } else if this.stream_done {
+ if !this.starts_with_code_block
+ || !line_without_cursor.trim().ends_with(CODE_BLOCK_DELIMITER)
+ {
+ if this.line_end {
+ chunk.push('\n');
+ }
+
+ chunk.push_str(&line);
+ }
+
+ consumed += line.len();
+ } else {
+ let trimmed_line = line.trim();
+ if trimmed_line.is_empty()
+ || prefixes(CURSOR_SPAN).any(|prefix| trimmed_line.ends_with(prefix))
+ || prefixes(CODE_BLOCK_DELIMITER)
+ .any(|prefix| trimmed_line.ends_with(prefix))
+ {
+ break;
+ } else {
+ if this.line_end {
+ chunk.push('\n');
+ this.line_end = false;
+ }
+
+ chunk.push_str(&line_without_cursor);
+ consumed += line.len();
+ }
+ }
+ }
+ }
+
+ this.buffer = this.buffer.split_off(consumed);
+ if !chunk.is_empty() {
+ return Poll::Ready(Some(Ok(chunk)));
+ } else if this.stream_done {
+ return Poll::Ready(None);
+ }
+ }
+ }
+}
+
+struct AssistantCodeActionProvider {
+ editor: WeakView<Editor>,
+ workspace: WeakView<Workspace>,
+}
+
+impl CodeActionProvider for AssistantCodeActionProvider {
+ fn code_actions(
+ &self,
+ buffer: &Model<Buffer>,
+ range: Range<text::Anchor>,
+ cx: &mut WindowContext,
+ ) -> Task<Result<Vec<CodeAction>>> {
+ if !AssistantSettings::get_global(cx).enabled {
+ return Task::ready(Ok(Vec::new()));
+ }
+
+ let snapshot = buffer.read(cx).snapshot();
+ let mut range = range.to_point(&snapshot);
+
+ // Expand the range to line boundaries.
+ range.start.column = 0;
+ range.end.column = snapshot.line_len(range.end.row);
+
+ let mut has_diagnostics = false;
+ for diagnostic in snapshot.diagnostics_in_range::<_, Point>(range.clone(), false) {
+ range.start = cmp::min(range.start, diagnostic.range.start);
+ range.end = cmp::max(range.end, diagnostic.range.end);
+ has_diagnostics = true;
+ }
+ if has_diagnostics {
+ if let Some(symbols_containing_start) = snapshot.symbols_containing(range.start, None) {
+ if let Some(symbol) = symbols_containing_start.last() {
+ range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
+ range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
+ }
+ }
+
+ if let Some(symbols_containing_end) = snapshot.symbols_containing(range.end, None) {
+ if let Some(symbol) = symbols_containing_end.last() {
+ range.start = cmp::min(range.start, symbol.range.start.to_point(&snapshot));
+ range.end = cmp::max(range.end, symbol.range.end.to_point(&snapshot));
+ }
+ }
+
+ Task::ready(Ok(vec![CodeAction {
+ server_id: language::LanguageServerId(0),
+ range: snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end),
+ lsp_action: lsp::CodeAction {
+ title: "Fix with Assistant".into(),
+ ..Default::default()
+ },
+ }]))
+ } else {
+ Task::ready(Ok(Vec::new()))
+ }
+ }
+
+ fn apply_code_action(
+ &self,
+ buffer: Model<Buffer>,
+ action: CodeAction,
+ excerpt_id: ExcerptId,
+ _push_to_history: bool,
+ cx: &mut WindowContext,
+ ) -> Task<Result<ProjectTransaction>> {
+ let editor = self.editor.clone();
+ let workspace = self.workspace.clone();
+ cx.spawn(|mut cx| async move {
+ let editor = editor.upgrade().context("editor was released")?;
+ let range = editor
+ .update(&mut cx, |editor, cx| {
+ editor.buffer().update(cx, |multibuffer, cx| {
+ let buffer = buffer.read(cx);
+ let multibuffer_snapshot = multibuffer.read(cx);
+
+ let old_context_range =
+ multibuffer_snapshot.context_range_for_excerpt(excerpt_id)?;
+ let mut new_context_range = old_context_range.clone();
+ if action
+ .range
+ .start
+ .cmp(&old_context_range.start, buffer)
+ .is_lt()
+ {
+ new_context_range.start = action.range.start;
+ }
+ if action.range.end.cmp(&old_context_range.end, buffer).is_gt() {
+ new_context_range.end = action.range.end;
+ }
+ drop(multibuffer_snapshot);
+
+ if new_context_range != old_context_range {
+ multibuffer.resize_excerpt(excerpt_id, new_context_range, cx);
+ }
+
+ let multibuffer_snapshot = multibuffer.read(cx);
+ Some(
+ multibuffer_snapshot
+ .anchor_in_excerpt(excerpt_id, action.range.start)?
+ ..multibuffer_snapshot
+ .anchor_in_excerpt(excerpt_id, action.range.end)?,
+ )
+ })
+ })?
+ .context("invalid range")?;
+
+ cx.update_global(|assistant: &mut InlineAssistant, cx| {
+ let assist_id = assistant.suggest_assist(
+ &editor,
+ range,
+ "Fix Diagnostics".into(),
+ None,
+ true,
+ Some(workspace),
+ cx,
+ );
+ assistant.start_assist(assist_id, cx);
+ })?;
+
+ Ok(ProjectTransaction::default())
+ })
+ }
+}
+
+fn prefixes(text: &str) -> impl Iterator<Item = &str> {
+ (0..text.len() - 1).map(|ix| &text[..ix + 1])
+}
+
+fn merge_ranges(ranges: &mut Vec<Range<Anchor>>, buffer: &MultiBufferSnapshot) {
+ ranges.sort_unstable_by(|a, b| {
+ a.start
+ .cmp(&b.start, buffer)
+ .then_with(|| b.end.cmp(&a.end, buffer))
+ });
+
+ let mut ix = 0;
+ while ix + 1 < ranges.len() {
+ let b = ranges[ix + 1].clone();
+ let a = &mut ranges[ix];
+ if a.end.cmp(&b.start, buffer).is_gt() {
+ if a.end.cmp(&b.end, buffer).is_lt() {
+ a.end = b.end;
+ }
+ ranges.remove(ix + 1);
+ } else {
+ ix += 1;
+ }
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use futures::stream::{self};
+ use gpui::{Context, TestAppContext};
+ use indoc::indoc;
+ use language::{
+ language_settings, tree_sitter_rust, Buffer, Language, LanguageConfig, LanguageMatcher,
+ Point,
+ };
+ use language_model::LanguageModelRegistry;
+ use rand::prelude::*;
+ use serde::Serialize;
+ use settings::SettingsStore;
+ use std::{future, sync::Arc};
+
+ #[derive(Serialize)]
+ pub struct DummyCompletionRequest {
+ pub name: String,
+ }
+
+ #[gpui::test(iterations = 10)]
+ async fn test_transform_autoindent(cx: &mut TestAppContext, mut rng: StdRng) {
+ cx.set_global(cx.update(SettingsStore::test));
+ cx.update(language_model::LanguageModelRegistry::test);
+ cx.update(language_settings::init);
+
+ let text = indoc! {"
+ fn main() {
+ let x = 0;
+ for _ in 0..10 {
+ x += 1;
+ }
+ }
+ "};
+ let buffer =
+ cx.new_model(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
+ let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
+ let range = buffer.read_with(cx, |buffer, cx| {
+ let snapshot = buffer.snapshot(cx);
+ snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(4, 5))
+ });
+ let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+ let codegen = cx.new_model(|cx| {
+ CodegenAlternative::new(
+ buffer.clone(),
+ range.clone(),
+ true,
+ None,
+ prompt_builder,
+ cx,
+ )
+ });
+
+ let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+
+ let mut new_text = concat!(
+ " let mut x = 0;\n",
+ " while x < 10 {\n",
+ " x += 1;\n",
+ " }",
+ );
+ while !new_text.is_empty() {
+ let max_len = cmp::min(new_text.len(), 10);
+ let len = rng.gen_range(1..=max_len);
+ let (chunk, suffix) = new_text.split_at(len);
+ chunks_tx.unbounded_send(chunk.to_string()).unwrap();
+ new_text = suffix;
+ cx.background_executor.run_until_parked();
+ }
+ drop(chunks_tx);
+ cx.background_executor.run_until_parked();
+
+ assert_eq!(
+ buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
+ indoc! {"
+ fn main() {
+ let mut x = 0;
+ while x < 10 {
+ x += 1;
+ }
+ }
+ "}
+ );
+ }
+
+ #[gpui::test(iterations = 10)]
+ async fn test_autoindent_when_generating_past_indentation(
+ cx: &mut TestAppContext,
+ mut rng: StdRng,
+ ) {
+ cx.set_global(cx.update(SettingsStore::test));
+ cx.update(language_settings::init);
+
+ let text = indoc! {"
+ fn main() {
+ le
+ }
+ "};
+ let buffer =
+ cx.new_model(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
+ let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
+ let range = buffer.read_with(cx, |buffer, cx| {
+ let snapshot = buffer.snapshot(cx);
+ snapshot.anchor_before(Point::new(1, 6))..snapshot.anchor_after(Point::new(1, 6))
+ });
+ let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+ let codegen = cx.new_model(|cx| {
+ CodegenAlternative::new(
+ buffer.clone(),
+ range.clone(),
+ true,
+ None,
+ prompt_builder,
+ cx,
+ )
+ });
+
+ let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+
+ cx.background_executor.run_until_parked();
+
+ let mut new_text = concat!(
+ "t mut x = 0;\n",
+ "while x < 10 {\n",
+ " x += 1;\n",
+ "}", //
+ );
+ while !new_text.is_empty() {
+ let max_len = cmp::min(new_text.len(), 10);
+ let len = rng.gen_range(1..=max_len);
+ let (chunk, suffix) = new_text.split_at(len);
+ chunks_tx.unbounded_send(chunk.to_string()).unwrap();
+ new_text = suffix;
+ cx.background_executor.run_until_parked();
+ }
+ drop(chunks_tx);
+ cx.background_executor.run_until_parked();
+
+ assert_eq!(
+ buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
+ indoc! {"
+ fn main() {
+ let mut x = 0;
+ while x < 10 {
+ x += 1;
+ }
+ }
+ "}
+ );
+ }
+
+ #[gpui::test(iterations = 10)]
+ async fn test_autoindent_when_generating_before_indentation(
+ cx: &mut TestAppContext,
+ mut rng: StdRng,
+ ) {
+ cx.update(LanguageModelRegistry::test);
+ cx.set_global(cx.update(SettingsStore::test));
+ cx.update(language_settings::init);
+
+ let text = concat!(
+ "fn main() {\n",
+ " \n",
+ "}\n" //
+ );
+ let buffer =
+ cx.new_model(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
+ let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
+ let range = buffer.read_with(cx, |buffer, cx| {
+ let snapshot = buffer.snapshot(cx);
+ snapshot.anchor_before(Point::new(1, 2))..snapshot.anchor_after(Point::new(1, 2))
+ });
+ let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+ let codegen = cx.new_model(|cx| {
+ CodegenAlternative::new(
+ buffer.clone(),
+ range.clone(),
+ true,
+ None,
+ prompt_builder,
+ cx,
+ )
+ });
+
+ let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+
+ cx.background_executor.run_until_parked();
+
+ let mut new_text = concat!(
+ "let mut x = 0;\n",
+ "while x < 10 {\n",
+ " x += 1;\n",
+ "}", //
+ );
+ while !new_text.is_empty() {
+ let max_len = cmp::min(new_text.len(), 10);
+ let len = rng.gen_range(1..=max_len);
+ let (chunk, suffix) = new_text.split_at(len);
+ chunks_tx.unbounded_send(chunk.to_string()).unwrap();
+ new_text = suffix;
+ cx.background_executor.run_until_parked();
+ }
+ drop(chunks_tx);
+ cx.background_executor.run_until_parked();
+
+ assert_eq!(
+ buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
+ indoc! {"
+ fn main() {
+ let mut x = 0;
+ while x < 10 {
+ x += 1;
+ }
+ }
+ "}
+ );
+ }
+
+ #[gpui::test(iterations = 10)]
+ async fn test_autoindent_respects_tabs_in_selection(cx: &mut TestAppContext) {
+ cx.update(LanguageModelRegistry::test);
+ cx.set_global(cx.update(SettingsStore::test));
+ cx.update(language_settings::init);
+
+ let text = indoc! {"
+ func main() {
+ \tx := 0
+ \tfor i := 0; i < 10; i++ {
+ \t\tx++
+ \t}
+ }
+ "};
+ let buffer = cx.new_model(|cx| Buffer::local(text, cx));
+ let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
+ let range = buffer.read_with(cx, |buffer, cx| {
+ let snapshot = buffer.snapshot(cx);
+ snapshot.anchor_before(Point::new(0, 0))..snapshot.anchor_after(Point::new(4, 2))
+ });
+ let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+ let codegen = cx.new_model(|cx| {
+ CodegenAlternative::new(
+ buffer.clone(),
+ range.clone(),
+ true,
+ None,
+ prompt_builder,
+ cx,
+ )
+ });
+
+ let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+ let new_text = concat!(
+ "func main() {\n",
+ "\tx := 0\n",
+ "\tfor x < 10 {\n",
+ "\t\tx++\n",
+ "\t}", //
+ );
+ chunks_tx.unbounded_send(new_text.to_string()).unwrap();
+ drop(chunks_tx);
+ cx.background_executor.run_until_parked();
+
+ assert_eq!(
+ buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
+ indoc! {"
+ func main() {
+ \tx := 0
+ \tfor x < 10 {
+ \t\tx++
+ \t}
+ }
+ "}
+ );
+ }
+
+ #[gpui::test]
+ async fn test_inactive_codegen_alternative(cx: &mut TestAppContext) {
+ cx.update(LanguageModelRegistry::test);
+ cx.set_global(cx.update(SettingsStore::test));
+ cx.update(language_settings::init);
+
+ let text = indoc! {"
+ fn main() {
+ let x = 0;
+ }
+ "};
+ let buffer =
+ cx.new_model(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
+ let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
+ let range = buffer.read_with(cx, |buffer, cx| {
+ let snapshot = buffer.snapshot(cx);
+ snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(1, 14))
+ });
+ let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+ let codegen = cx.new_model(|cx| {
+ CodegenAlternative::new(
+ buffer.clone(),
+ range.clone(),
+ false,
+ None,
+ prompt_builder,
+ cx,
+ )
+ });
+
+ let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+ chunks_tx
+ .unbounded_send("let mut x = 0;\nx += 1;".to_string())
+ .unwrap();
+ drop(chunks_tx);
+ cx.run_until_parked();
+
+ // The codegen is inactive, so the buffer doesn't get modified.
+ assert_eq!(
+ buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
+ text
+ );
+
+ // Activating the codegen applies the changes.
+ codegen.update(cx, |codegen, cx| codegen.set_active(true, cx));
+ assert_eq!(
+ buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
+ indoc! {"
+ fn main() {
+ let mut x = 0;
+ x += 1;
+ }
+ "}
+ );
+
+ // Deactivating the codegen undoes the changes.
+ codegen.update(cx, |codegen, cx| codegen.set_active(false, cx));
+ cx.run_until_parked();
+ assert_eq!(
+ buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx).text()),
+ text
+ );
+ }
+
+ #[gpui::test]
+ async fn test_strip_invalid_spans_from_codeblock() {
+ assert_chunks("Lorem ipsum dolor", "Lorem ipsum dolor").await;
+ assert_chunks("```\nLorem ipsum dolor", "Lorem ipsum dolor").await;
+ assert_chunks("```\nLorem ipsum dolor\n```", "Lorem ipsum dolor").await;
+ assert_chunks(
+ "```html\n```js\nLorem ipsum dolor\n```\n```",
+ "```js\nLorem ipsum dolor\n```",
+ )
+ .await;
+ assert_chunks("``\nLorem ipsum dolor\n```", "``\nLorem ipsum dolor\n```").await;
+ assert_chunks("Lorem<|CURSOR|> ipsum", "Lorem ipsum").await;
+ assert_chunks("Lorem ipsum", "Lorem ipsum").await;
+ assert_chunks("```\n<|CURSOR|>Lorem ipsum\n```", "Lorem ipsum").await;
+
+ async fn assert_chunks(text: &str, expected_text: &str) {
+ for chunk_size in 1..=text.len() {
+ let actual_text = StripInvalidSpans::new(chunks(text, chunk_size))
+ .map(|chunk| chunk.unwrap())
+ .collect::<String>()
+ .await;
+ assert_eq!(
+ actual_text, expected_text,
+ "failed to strip invalid spans, chunk size: {}",
+ chunk_size
+ );
+ }
+ }
+
+ fn chunks(text: &str, size: usize) -> impl Stream<Item = Result<String>> {
+ stream::iter(
+ text.chars()
+ .collect::<Vec<_>>()
+ .chunks(size)
+ .map(|chunk| Ok(chunk.iter().collect::<String>()))
+ .collect::<Vec<_>>(),
+ )
+ }
+ }
+
+ fn simulate_response_stream(
+ codegen: Model<CodegenAlternative>,
+ cx: &mut TestAppContext,
+ ) -> mpsc::UnboundedSender<String> {
+ let (chunks_tx, chunks_rx) = mpsc::unbounded();
+ codegen.update(cx, |codegen, cx| {
+ codegen.handle_stream(
+ String::new(),
+ String::new(),
+ None,
+ future::ready(Ok(LanguageModelTextStream {
+ message_id: None,
+ stream: chunks_rx.map(Ok).boxed(),
+ })),
+ cx,
+ );
+ });
+ chunks_tx
+ }
+
+ fn rust_lang() -> Language {
+ Language::new(
+ LanguageConfig {
+ name: "Rust".into(),
+ matcher: LanguageMatcher {
+ path_suffixes: vec!["rs".to_string()],
+ ..Default::default()
+ },
+ ..Default::default()
+ },
+ Some(tree_sitter_rust::LANGUAGE.into()),
+ )
+ .with_indents_query(
+ r#"
+ (call_expression) @indent
+ (field_expression) @indent
+ (_ "(" ")" @end) @indent
+ (_ "{" "}" @end) @indent
+ "#,
+ )
+ .unwrap()
+ }
+}
@@ -0,0 +1,1102 @@
+use ordered_float::OrderedFloat;
+use rope::{Point, Rope, TextSummary};
+use std::collections::{BTreeSet, HashMap};
+use std::{
+ cmp,
+ fmt::{self, Debug},
+ ops::Range,
+};
+
+struct Matrix {
+ cells: Vec<f64>,
+ rows: usize,
+ cols: usize,
+}
+
+impl Matrix {
+ fn new() -> Self {
+ Self {
+ cells: Vec::new(),
+ rows: 0,
+ cols: 0,
+ }
+ }
+
+ fn resize(&mut self, rows: usize, cols: usize) {
+ self.cells.resize(rows * cols, 0.);
+ self.rows = rows;
+ self.cols = cols;
+ }
+
+ fn swap_columns(&mut self, col1: usize, col2: usize) {
+ if col1 == col2 {
+ return;
+ }
+
+ if col1 >= self.cols {
+ panic!("column out of bounds");
+ }
+
+ if col2 >= self.cols {
+ panic!("column out of bounds");
+ }
+
+ unsafe {
+ let ptr = self.cells.as_mut_ptr();
+ std::ptr::swap_nonoverlapping(
+ ptr.add(col1 * self.rows),
+ ptr.add(col2 * self.rows),
+ self.rows,
+ );
+ }
+ }
+
+ fn get(&self, row: usize, col: usize) -> f64 {
+ if row >= self.rows {
+ panic!("row out of bounds")
+ }
+
+ if col >= self.cols {
+ panic!("column out of bounds")
+ }
+ self.cells[col * self.rows + row]
+ }
+
+ fn set(&mut self, row: usize, col: usize, value: f64) {
+ if row >= self.rows {
+ panic!("row out of bounds")
+ }
+
+ if col >= self.cols {
+ panic!("column out of bounds")
+ }
+
+ self.cells[col * self.rows + row] = value;
+ }
+}
+
+impl Debug for Matrix {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ writeln!(f)?;
+ for i in 0..self.rows {
+ for j in 0..self.cols {
+ write!(f, "{:5}", self.get(i, j))?;
+ }
+ writeln!(f)?;
+ }
+ Ok(())
+ }
+}
+
+#[derive(Debug, Clone)]
+pub enum CharOperation {
+ Insert { text: String },
+ Delete { bytes: usize },
+ Keep { bytes: usize },
+}
+
+pub struct StreamingDiff {
+ old: Vec<char>,
+ new: Vec<char>,
+ scores: Matrix,
+ old_text_ix: usize,
+ new_text_ix: usize,
+ equal_runs: HashMap<(usize, usize), u32>,
+}
+
+impl StreamingDiff {
+ const INSERTION_SCORE: f64 = -1.;
+ const DELETION_SCORE: f64 = -20.;
+ const EQUALITY_BASE: f64 = 1.8;
+ const MAX_EQUALITY_EXPONENT: i32 = 16;
+
+ pub fn new(old: String) -> Self {
+ let old = old.chars().collect::<Vec<_>>();
+ let mut scores = Matrix::new();
+ scores.resize(old.len() + 1, 1);
+ for i in 0..=old.len() {
+ scores.set(i, 0, i as f64 * Self::DELETION_SCORE);
+ }
+ Self {
+ old,
+ new: Vec::new(),
+ scores,
+ old_text_ix: 0,
+ new_text_ix: 0,
+ equal_runs: Default::default(),
+ }
+ }
+
+ pub fn push_new(&mut self, text: &str) -> Vec<CharOperation> {
+ self.new.extend(text.chars());
+ self.scores.swap_columns(0, self.scores.cols - 1);
+ self.scores
+ .resize(self.old.len() + 1, self.new.len() - self.new_text_ix + 1);
+ self.equal_runs.retain(|(_i, j), _| *j == self.new_text_ix);
+
+ for j in self.new_text_ix + 1..=self.new.len() {
+ let relative_j = j - self.new_text_ix;
+
+ self.scores
+ .set(0, relative_j, j as f64 * Self::INSERTION_SCORE);
+ for i in 1..=self.old.len() {
+ let insertion_score = self.scores.get(i, relative_j - 1) + Self::INSERTION_SCORE;
+ let deletion_score = self.scores.get(i - 1, relative_j) + Self::DELETION_SCORE;
+ let equality_score = if self.old[i - 1] == self.new[j - 1] {
+ let mut equal_run = self.equal_runs.get(&(i - 1, j - 1)).copied().unwrap_or(0);
+ equal_run += 1;
+ self.equal_runs.insert((i, j), equal_run);
+
+ let exponent = cmp::min(equal_run as i32 / 4, Self::MAX_EQUALITY_EXPONENT);
+ self.scores.get(i - 1, relative_j - 1) + Self::EQUALITY_BASE.powi(exponent)
+ } else {
+ f64::NEG_INFINITY
+ };
+
+ let score = insertion_score.max(deletion_score).max(equality_score);
+ self.scores.set(i, relative_j, score);
+ }
+ }
+
+ let mut max_score = f64::NEG_INFINITY;
+ let mut next_old_text_ix = self.old_text_ix;
+ let next_new_text_ix = self.new.len();
+ for i in self.old_text_ix..=self.old.len() {
+ let score = self.scores.get(i, next_new_text_ix - self.new_text_ix);
+ if score > max_score {
+ max_score = score;
+ next_old_text_ix = i;
+ }
+ }
+
+ let hunks = self.backtrack(next_old_text_ix, next_new_text_ix);
+ self.old_text_ix = next_old_text_ix;
+ self.new_text_ix = next_new_text_ix;
+ hunks
+ }
+
+ fn backtrack(&self, old_text_ix: usize, new_text_ix: usize) -> Vec<CharOperation> {
+ let mut pending_insert: Option<Range<usize>> = None;
+ let mut hunks = Vec::new();
+ let mut i = old_text_ix;
+ let mut j = new_text_ix;
+ while (i, j) != (self.old_text_ix, self.new_text_ix) {
+ let insertion_score = if j > self.new_text_ix {
+ Some((i, j - 1))
+ } else {
+ None
+ };
+ let deletion_score = if i > self.old_text_ix {
+ Some((i - 1, j))
+ } else {
+ None
+ };
+ let equality_score = if i > self.old_text_ix && j > self.new_text_ix {
+ if self.old[i - 1] == self.new[j - 1] {
+ Some((i - 1, j - 1))
+ } else {
+ None
+ }
+ } else {
+ None
+ };
+
+ let (prev_i, prev_j) = [insertion_score, deletion_score, equality_score]
+ .iter()
+ .max_by_key(|cell| {
+ cell.map(|(i, j)| OrderedFloat(self.scores.get(i, j - self.new_text_ix)))
+ })
+ .unwrap()
+ .unwrap();
+
+ if prev_i == i && prev_j == j - 1 {
+ if let Some(pending_insert) = pending_insert.as_mut() {
+ pending_insert.start = prev_j;
+ } else {
+ pending_insert = Some(prev_j..j);
+ }
+ } else {
+ if let Some(range) = pending_insert.take() {
+ hunks.push(CharOperation::Insert {
+ text: self.new[range].iter().collect(),
+ });
+ }
+
+ let char_len = self.old[i - 1].len_utf8();
+ if prev_i == i - 1 && prev_j == j {
+ if let Some(CharOperation::Delete { bytes: len }) = hunks.last_mut() {
+ *len += char_len;
+ } else {
+ hunks.push(CharOperation::Delete { bytes: char_len })
+ }
+ } else if let Some(CharOperation::Keep { bytes: len }) = hunks.last_mut() {
+ *len += char_len;
+ } else {
+ hunks.push(CharOperation::Keep { bytes: char_len })
+ }
+ }
+
+ i = prev_i;
+ j = prev_j;
+ }
+
+ if let Some(range) = pending_insert.take() {
+ hunks.push(CharOperation::Insert {
+ text: self.new[range].iter().collect(),
+ });
+ }
+
+ hunks.reverse();
+ hunks
+ }
+
+ pub fn finish(self) -> Vec<CharOperation> {
+ self.backtrack(self.old.len(), self.new.len())
+ }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum LineOperation {
+ Insert { lines: u32 },
+ Delete { lines: u32 },
+ Keep { lines: u32 },
+}
+
+#[derive(Debug, Default)]
+pub struct LineDiff {
+ inserted_newline_at_end: bool,
+ /// The extent of kept and deleted text.
+ old_end: Point,
+ /// The extent of kept and inserted text.
+ new_end: Point,
+ /// Deleted rows, expressed in terms of the old text.
+ deleted_rows: BTreeSet<u32>,
+ /// Inserted rows, expressed in terms of the new text.
+ inserted_rows: BTreeSet<u32>,
+ buffered_insert: String,
+ /// After deleting a newline, we buffer deletion until we keep or insert a character.
+ buffered_delete: usize,
+}
+
+impl LineDiff {
+ pub fn push_char_operations<'a>(
+ &mut self,
+ operations: impl IntoIterator<Item = &'a CharOperation>,
+ old_text: &Rope,
+ ) {
+ for operation in operations {
+ self.push_char_operation(operation, old_text);
+ }
+ }
+
+ pub fn push_char_operation(&mut self, operation: &CharOperation, old_text: &Rope) {
+ match operation {
+ CharOperation::Insert { text } => {
+ self.flush_delete(old_text);
+
+ if is_line_start(self.old_end) {
+ if let Some(newline_ix) = text.rfind('\n') {
+ let (prefix, suffix) = text.split_at(newline_ix + 1);
+ self.buffered_insert.push_str(prefix);
+ self.flush_insert(old_text);
+ self.buffered_insert.push_str(suffix);
+ } else {
+ self.buffered_insert.push_str(&text);
+ }
+ } else {
+ self.buffered_insert.push_str(&text);
+ if !text.ends_with('\n') {
+ self.flush_insert(old_text);
+ }
+ }
+ }
+ CharOperation::Delete { bytes } => {
+ self.buffered_delete += bytes;
+
+ let common_suffix_len = self.trim_buffered_end(old_text);
+ self.flush_insert(old_text);
+
+ if common_suffix_len > 0 || !is_line_end(self.old_end, old_text) {
+ self.flush_delete(old_text);
+ self.keep(common_suffix_len, old_text);
+ }
+ }
+ CharOperation::Keep { bytes } => {
+ self.flush_delete(old_text);
+ self.flush_insert(old_text);
+ self.keep(*bytes, old_text);
+ }
+ }
+ }
+
+ fn flush_insert(&mut self, old_text: &Rope) {
+ if self.buffered_insert.is_empty() {
+ return;
+ }
+
+ let new_start = self.new_end;
+ let lines = TextSummary::from(self.buffered_insert.as_str()).lines;
+ self.new_end += lines;
+
+ if is_line_start(self.old_end) {
+ if self.new_end.column == 0 {
+ self.inserted_rows.extend(new_start.row..self.new_end.row);
+ } else {
+ self.deleted_rows.insert(self.old_end.row);
+ self.inserted_rows.extend(new_start.row..=self.new_end.row);
+ }
+ } else if is_line_end(self.old_end, old_text) {
+ if self.buffered_insert.starts_with('\n') {
+ self.inserted_rows
+ .extend(new_start.row + 1..=self.new_end.row);
+ self.inserted_newline_at_end = true;
+ } else {
+ if !self.inserted_newline_at_end {
+ self.deleted_rows.insert(self.old_end.row);
+ }
+ self.inserted_rows.extend(new_start.row..=self.new_end.row);
+ }
+ } else {
+ self.deleted_rows.insert(self.old_end.row);
+ self.inserted_rows.extend(new_start.row..=self.new_end.row);
+ }
+
+ self.buffered_insert.clear();
+ }
+
+ fn flush_delete(&mut self, old_text: &Rope) {
+ if self.buffered_delete == 0 {
+ return;
+ }
+
+ let old_start = self.old_end;
+ self.old_end =
+ old_text.offset_to_point(old_text.point_to_offset(self.old_end) + self.buffered_delete);
+
+ if is_line_end(old_start, old_text) && is_line_end(self.old_end, old_text) {
+ self.deleted_rows
+ .extend(old_start.row + 1..=self.old_end.row);
+ } else if is_line_start(old_start)
+ && (is_line_start(self.old_end) && self.old_end < old_text.max_point())
+ && self.new_end.column == 0
+ {
+ self.deleted_rows.extend(old_start.row..self.old_end.row);
+ } else {
+ self.inserted_rows.insert(self.new_end.row);
+ self.deleted_rows.extend(old_start.row..=self.old_end.row);
+ }
+
+ self.inserted_newline_at_end = false;
+ self.buffered_delete = 0;
+ }
+
+ fn keep(&mut self, bytes: usize, old_text: &Rope) {
+ if bytes == 0 {
+ return;
+ }
+
+ let lines =
+ old_text.offset_to_point(old_text.point_to_offset(self.old_end) + bytes) - self.old_end;
+ self.old_end += lines;
+ self.new_end += lines;
+ self.inserted_newline_at_end = false;
+ }
+
+ fn trim_buffered_end(&mut self, old_text: &Rope) -> usize {
+ let old_start_offset = old_text.point_to_offset(self.old_end);
+ let old_end_offset = old_start_offset + self.buffered_delete;
+
+ let new_chars = self.buffered_insert.chars().rev();
+ let old_chars = old_text
+ .chunks_in_range(old_start_offset..old_end_offset)
+ .flat_map(|chunk| chunk.chars().rev());
+
+ let mut common_suffix_len = 0;
+ for (new_ch, old_ch) in new_chars.zip(old_chars) {
+ if new_ch == old_ch {
+ common_suffix_len += new_ch.len_utf8();
+ } else {
+ break;
+ }
+ }
+
+ self.buffered_delete -= common_suffix_len;
+ self.buffered_insert
+ .truncate(self.buffered_insert.len() - common_suffix_len);
+
+ common_suffix_len
+ }
+
+ pub fn finish(&mut self, old_text: &Rope) {
+ self.flush_insert(old_text);
+ self.flush_delete(old_text);
+
+ let old_start = self.old_end;
+ self.old_end = old_text.max_point();
+ self.new_end += self.old_end - old_start;
+ }
+
+ pub fn line_operations(&self) -> Vec<LineOperation> {
+ let mut ops = Vec::new();
+ let mut deleted_rows = self.deleted_rows.iter().copied().peekable();
+ let mut inserted_rows = self.inserted_rows.iter().copied().peekable();
+ let mut old_row = 0;
+ let mut new_row = 0;
+
+ while deleted_rows.peek().is_some() || inserted_rows.peek().is_some() {
+ // Check for a run of deleted lines at current old row.
+ if Some(old_row) == deleted_rows.peek().copied() {
+ if let Some(LineOperation::Delete { lines }) = ops.last_mut() {
+ *lines += 1;
+ } else {
+ ops.push(LineOperation::Delete { lines: 1 });
+ }
+ old_row += 1;
+ deleted_rows.next();
+ } else if Some(new_row) == inserted_rows.peek().copied() {
+ if let Some(LineOperation::Insert { lines }) = ops.last_mut() {
+ *lines += 1;
+ } else {
+ ops.push(LineOperation::Insert { lines: 1 });
+ }
+ new_row += 1;
+ inserted_rows.next();
+ } else {
+ // Keep lines until the next deletion, insertion, or the end of the old text.
+ let lines_to_next_deletion = inserted_rows
+ .peek()
+ .copied()
+ .unwrap_or(self.new_end.row + 1)
+ - new_row;
+ let lines_to_next_insertion =
+ deleted_rows.peek().copied().unwrap_or(self.old_end.row + 1) - old_row;
+ let kept_lines =
+ cmp::max(1, cmp::min(lines_to_next_insertion, lines_to_next_deletion));
+ if kept_lines > 0 {
+ ops.push(LineOperation::Keep { lines: kept_lines });
+ old_row += kept_lines;
+ new_row += kept_lines;
+ }
+ }
+ }
+
+ if old_row < self.old_end.row + 1 {
+ ops.push(LineOperation::Keep {
+ lines: self.old_end.row + 1 - old_row,
+ });
+ }
+
+ ops
+ }
+}
+
+fn is_line_start(point: Point) -> bool {
+ point.column == 0
+}
+
+fn is_line_end(point: Point, text: &Rope) -> bool {
+ text.line_len(point.row) == point.column
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use rand::prelude::*;
+ use std::env;
+
+ #[test]
+ fn test_delete_first_of_two_lines() {
+ let old_text = "aaaa\nbbbb";
+ let char_ops = vec![
+ CharOperation::Delete { bytes: 5 },
+ CharOperation::Keep { bytes: 4 },
+ ];
+ let expected_line_ops = vec![
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Keep { lines: 1 },
+ ];
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &expected_line_ops)
+ );
+
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(line_ops, expected_line_ops);
+ }
+
+ #[test]
+ fn test_delete_second_of_two_lines() {
+ let old_text = "aaaa\nbbbb";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 5 },
+ CharOperation::Delete { bytes: 4 },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Keep { lines: 1 },
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Insert { lines: 1 }
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_add_new_line() {
+ let old_text = "aaaa\nbbbb";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 9 },
+ CharOperation::Insert {
+ text: "\ncccc".into(),
+ },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Keep { lines: 2 },
+ LineOperation::Insert { lines: 1 }
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_delete_line_in_middle() {
+ let old_text = "aaaa\nbbbb\ncccc";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 5 },
+ CharOperation::Delete { bytes: 5 },
+ CharOperation::Keep { bytes: 4 },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Keep { lines: 1 },
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Keep { lines: 1 }
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_replace_line() {
+ let old_text = "aaaa\nbbbb\ncccc";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 5 },
+ CharOperation::Delete { bytes: 4 },
+ CharOperation::Insert {
+ text: "BBBB".into(),
+ },
+ CharOperation::Keep { bytes: 5 },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Keep { lines: 1 },
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Insert { lines: 1 },
+ LineOperation::Keep { lines: 1 }
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_multiple_edits_on_different_lines() {
+ let old_text = "aaaa\nbbbb\ncccc\ndddd";
+ let char_ops = vec![
+ CharOperation::Insert { text: "A".into() },
+ CharOperation::Keep { bytes: 9 },
+ CharOperation::Delete { bytes: 5 },
+ CharOperation::Keep { bytes: 4 },
+ CharOperation::Insert {
+ text: "\nEEEE".into(),
+ },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Insert { lines: 1 },
+ LineOperation::Keep { lines: 1 },
+ LineOperation::Delete { lines: 2 },
+ LineOperation::Insert { lines: 2 },
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_edit_at_end_of_line() {
+ let old_text = "aaaa\nbbbb\ncccc";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 4 },
+ CharOperation::Insert { text: "A".into() },
+ CharOperation::Keep { bytes: 10 },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Insert { lines: 1 },
+ LineOperation::Keep { lines: 2 }
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_insert_newline_character() {
+ let old_text = "aaaabbbb";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 4 },
+ CharOperation::Insert { text: "\n".into() },
+ CharOperation::Keep { bytes: 4 },
+ ];
+ let new_text = apply_char_operations(old_text, &char_ops);
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Insert { lines: 2 }
+ ]
+ );
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_insert_newline_at_beginning() {
+ let old_text = "aaaa\nbbbb";
+ let char_ops = vec![
+ CharOperation::Insert { text: "\n".into() },
+ CharOperation::Keep { bytes: 9 },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Insert { lines: 1 },
+ LineOperation::Keep { lines: 2 }
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_delete_newline() {
+ let old_text = "aaaa\nbbbb";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 4 },
+ CharOperation::Delete { bytes: 1 },
+ CharOperation::Keep { bytes: 4 },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Delete { lines: 2 },
+ LineOperation::Insert { lines: 1 }
+ ]
+ );
+
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_insert_multiple_newlines() {
+ let old_text = "aaaa\nbbbb";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 5 },
+ CharOperation::Insert {
+ text: "\n\n".into(),
+ },
+ CharOperation::Keep { bytes: 4 },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Keep { lines: 1 },
+ LineOperation::Insert { lines: 2 },
+ LineOperation::Keep { lines: 1 }
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_delete_multiple_newlines() {
+ let old_text = "aaaa\n\n\nbbbb";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 5 },
+ CharOperation::Delete { bytes: 2 },
+ CharOperation::Keep { bytes: 4 },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Keep { lines: 1 },
+ LineOperation::Delete { lines: 2 },
+ LineOperation::Keep { lines: 1 }
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_complex_scenario() {
+ let old_text = "line1\nline2\nline3\nline4";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 6 },
+ CharOperation::Insert {
+ text: "inserted\n".into(),
+ },
+ CharOperation::Delete { bytes: 6 },
+ CharOperation::Keep { bytes: 5 },
+ CharOperation::Insert {
+ text: "\nnewline".into(),
+ },
+ CharOperation::Keep { bytes: 6 },
+ ];
+ let line_ops = char_ops_to_line_ops(&old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Keep { lines: 1 },
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Insert { lines: 1 },
+ LineOperation::Keep { lines: 1 },
+ LineOperation::Insert { lines: 1 },
+ LineOperation::Keep { lines: 1 }
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(new_text, "line1\ninserted\nline3\nnewline\nline4");
+ assert_eq!(
+ apply_line_operations(old_text, &new_text, &line_ops),
+ new_text,
+ );
+ }
+
+ #[test]
+ fn test_cleaning_up_common_suffix() {
+ let old_text = concat!(
+ " for y in 0..size.y() {\n",
+ " let a = 10;\n",
+ " let b = 20;\n",
+ " }",
+ );
+ let char_ops = [
+ CharOperation::Keep { bytes: 8 },
+ CharOperation::Insert { text: "let".into() },
+ CharOperation::Insert {
+ text: " mut".into(),
+ },
+ CharOperation::Insert { text: " y".into() },
+ CharOperation::Insert { text: " =".into() },
+ CharOperation::Insert { text: " 0".into() },
+ CharOperation::Insert { text: ";".into() },
+ CharOperation::Insert { text: "\n".into() },
+ CharOperation::Insert {
+ text: " while".into(),
+ },
+ CharOperation::Insert { text: " y".into() },
+ CharOperation::Insert {
+ text: " < size".into(),
+ },
+ CharOperation::Insert { text: ".".into() },
+ CharOperation::Insert { text: "y".into() },
+ CharOperation::Insert { text: "()".into() },
+ CharOperation::Insert { text: " {".into() },
+ CharOperation::Insert { text: "\n".into() },
+ CharOperation::Delete { bytes: 23 },
+ CharOperation::Keep { bytes: 23 },
+ CharOperation::Keep { bytes: 1 },
+ CharOperation::Keep { bytes: 23 },
+ CharOperation::Keep { bytes: 1 },
+ CharOperation::Keep { bytes: 8 },
+ CharOperation::Insert {
+ text: " y".into(),
+ },
+ CharOperation::Insert { text: " +=".into() },
+ CharOperation::Insert { text: " 1".into() },
+ CharOperation::Insert { text: ";".into() },
+ CharOperation::Insert { text: "\n".into() },
+ CharOperation::Insert {
+ text: " ".into(),
+ },
+ CharOperation::Keep { bytes: 1 },
+ ];
+ let line_ops = char_ops_to_line_ops(old_text, &char_ops);
+ assert_eq!(
+ line_ops,
+ vec![
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Insert { lines: 2 },
+ LineOperation::Keep { lines: 2 },
+ LineOperation::Delete { lines: 1 },
+ LineOperation::Insert { lines: 2 },
+ ]
+ );
+ let new_text = apply_char_operations(old_text, &char_ops);
+ assert_eq!(
+ new_text,
+ apply_line_operations(old_text, &new_text, &line_ops)
+ );
+ }
+
+ #[test]
+ fn test_random_diffs() {
+ random_test(|mut rng| {
+ let old_text_len = env::var("OLD_TEXT_LEN")
+ .map(|i| i.parse().expect("invalid `OLD_TEXT_LEN` variable"))
+ .unwrap_or(10);
+
+ let old = random_text(&mut rng, old_text_len);
+ println!("old text: {:?}", old);
+
+ let new = randomly_edit(&old, &mut rng);
+ println!("new text: {:?}", new);
+
+ let char_operations = random_streaming_diff(&mut rng, &old, &new);
+ println!("char operations: {:?}", char_operations);
+
+ // Use apply_char_operations to verify the result
+ let patched = apply_char_operations(&old, &char_operations);
+ assert_eq!(patched, new);
+
+ // Test char_ops_to_line_ops
+ let line_ops = char_ops_to_line_ops(&old, &char_operations);
+ println!("line operations: {:?}", line_ops);
+ let patched = apply_line_operations(&old, &new, &line_ops);
+ assert_eq!(patched, new);
+ });
+ }
+
+ fn char_ops_to_line_ops(old_text: &str, char_ops: &[CharOperation]) -> Vec<LineOperation> {
+ let old_rope = Rope::from(old_text);
+ let mut diff = LineDiff::default();
+ for op in char_ops {
+ diff.push_char_operation(op, &old_rope);
+ }
+ diff.finish(&old_rope);
+ diff.line_operations()
+ }
+
+ fn random_streaming_diff(rng: &mut impl Rng, old: &str, new: &str) -> Vec<CharOperation> {
+ let mut diff = StreamingDiff::new(old.to_string());
+ let mut char_operations = Vec::new();
+ let mut new_len = 0;
+
+ while new_len < new.len() {
+ let mut chunk_len = rng.gen_range(1..=new.len() - new_len);
+ while !new.is_char_boundary(new_len + chunk_len) {
+ chunk_len += 1;
+ }
+ let chunk = &new[new_len..new_len + chunk_len];
+ let new_hunks = diff.push_new(chunk);
+ char_operations.extend(new_hunks);
+ new_len += chunk_len;
+ }
+
+ char_operations.extend(diff.finish());
+ char_operations
+ }
+
+ fn random_test<F>(mut test_fn: F)
+ where
+ F: FnMut(StdRng),
+ {
+ let iterations = env::var("ITERATIONS")
+ .map(|i| i.parse().expect("invalid `ITERATIONS` variable"))
+ .unwrap_or(100);
+
+ let seed: u64 = env::var("SEED")
+ .map(|s| s.parse().expect("invalid `SEED` variable"))
+ .unwrap_or(0);
+
+ println!(
+ "Running test with {} iterations and seed {}",
+ iterations, seed
+ );
+
+ for i in 0..iterations {
+ println!("Iteration {}", i + 1);
+ let rng = StdRng::seed_from_u64(seed + i);
+ test_fn(rng);
+ }
+ }
+
+ fn apply_line_operations(old_text: &str, new_text: &str, line_ops: &[LineOperation]) -> String {
+ let mut result: Vec<&str> = Vec::new();
+
+ let old_lines: Vec<&str> = old_text.split('\n').collect();
+ let new_lines: Vec<&str> = new_text.split('\n').collect();
+ let mut old_start = 0_usize;
+ let mut new_start = 0_usize;
+
+ for op in line_ops {
+ match op {
+ LineOperation::Keep { lines } => {
+ let old_end = old_start + *lines as usize;
+ result.extend(&old_lines[old_start..old_end]);
+ old_start = old_end;
+ new_start += *lines as usize;
+ }
+ LineOperation::Delete { lines } => {
+ old_start += *lines as usize;
+ }
+ LineOperation::Insert { lines } => {
+ let new_end = new_start + *lines as usize;
+ result.extend(&new_lines[new_start..new_end]);
+ new_start = new_end;
+ }
+ }
+ }
+
+ result.join("\n")
+ }
+
+ #[test]
+ fn test_apply_char_operations() {
+ let old_text = "Hello, world!";
+ let char_ops = vec![
+ CharOperation::Keep { bytes: 7 },
+ CharOperation::Delete { bytes: 5 },
+ CharOperation::Insert {
+ text: "Rust".to_string(),
+ },
+ CharOperation::Keep { bytes: 1 },
+ ];
+ let result = apply_char_operations(old_text, &char_ops);
+ assert_eq!(result, "Hello, Rust!");
+ }
+
+ fn random_text(rng: &mut impl Rng, length: usize) -> String {
+ util::RandomCharIter::new(rng).take(length).collect()
+ }
+
+ fn randomly_edit(text: &str, rng: &mut impl Rng) -> String {
+ let mut result = String::from(text);
+ let edit_count = rng.gen_range(1..=5);
+
+ fn random_char_range(text: &str, rng: &mut impl Rng) -> (usize, usize) {
+ let mut start = rng.gen_range(0..=text.len());
+ while !text.is_char_boundary(start) {
+ start -= 1;
+ }
+ let mut end = rng.gen_range(start..=text.len());
+ while !text.is_char_boundary(end) {
+ end += 1;
+ }
+ (start, end)
+ }
+
+ for _ in 0..edit_count {
+ match rng.gen_range(0..3) {
+ 0 => {
+ // Insert
+ let (pos, _) = random_char_range(&result, rng);
+ let insert_len = rng.gen_range(1..=5);
+ let insert_text: String = random_text(rng, insert_len);
+ result.insert_str(pos, &insert_text);
+ }
+ 1 => {
+ // Delete
+ if !result.is_empty() {
+ let (start, end) = random_char_range(&result, rng);
+ result.replace_range(start..end, "");
+ }
+ }
+ 2 => {
+ // Replace
+ if !result.is_empty() {
+ let (start, end) = random_char_range(&result, rng);
+ let replace_len = end - start;
+ let replace_text: String = random_text(rng, replace_len);
+ result.replace_range(start..end, &replace_text);
+ }
+ }
+ _ => unreachable!(),
+ }
+ }
+
+ result
+ }
+
+ fn apply_char_operations(old_text: &str, char_ops: &[CharOperation]) -> String {
+ let mut result = String::new();
+ let mut old_ix = 0;
+
+ for operation in char_ops {
+ match operation {
+ CharOperation::Keep { bytes } => {
+ result.push_str(&old_text[old_ix..old_ix + bytes]);
+ old_ix += bytes;
+ }
+ CharOperation::Delete { bytes } => {
+ old_ix += bytes;
+ }
+ CharOperation::Insert { text } => {
+ result.push_str(text);
+ }
+ }
+ }
+
+ result
+ }
+}