History

Merge branch 'main' into Z-1292/show_search_results_in_scrollbar

Piotr Osiewicz committed 3 years ago

Commit 8ced7ab2 parents 86247bf c298cf7700 files · +30751 −10544Browse files

Unified · Split

700 files
  1. .cargo/config.toml +2 −0
  2. .config/nextest.toml +6 −0
  3. .github/workflows/ci.yml +2 −1
  4. .gitignore +3 −0
  5. Cargo.lock +611 −59
  6. Cargo.toml +5 −1
  7. assets/icons/assist_15.svg +1 −0
  8. assets/icons/hamburger_15.svg +3 −0
  9. assets/icons/quote_15.svg +1 −0
  10. assets/icons/radix/accessibility.svg +8 −0
  11. assets/icons/radix/activity-log.svg +8 −0
  12. assets/icons/radix/align-baseline.svg +8 −0
  13. assets/icons/radix/align-bottom.svg +8 −0
  14. assets/icons/radix/align-center-horizontally.svg +8 −0
  15. assets/icons/radix/align-center-vertically.svg +8 −0
  16. assets/icons/radix/align-center.svg +8 −0
  17. assets/icons/radix/align-end.svg +8 −0
  18. assets/icons/radix/align-horizontal-centers.svg +8 −0
  19. assets/icons/radix/align-left.svg +8 −0
  20. assets/icons/radix/align-right.svg +8 −0
  21. assets/icons/radix/align-start.svg +8 −0
  22. assets/icons/radix/align-stretch.svg +8 −0
  23. assets/icons/radix/align-top.svg +8 −0
  24. assets/icons/radix/align-vertical-centers.svg +8 −0
  25. assets/icons/radix/all-sides.svg +8 −0
  26. assets/icons/radix/angle.svg +8 −0
  27. assets/icons/radix/archive.svg +8 −0
  28. assets/icons/radix/arrow-bottom-left.svg +8 −0
  29. assets/icons/radix/arrow-bottom-right.svg +8 −0
  30. assets/icons/radix/arrow-down.svg +8 −0
  31. assets/icons/radix/arrow-left.svg +8 −0
  32. assets/icons/radix/arrow-right.svg +8 −0
  33. assets/icons/radix/arrow-top-left.svg +8 −0
  34. assets/icons/radix/arrow-top-right.svg +8 −0
  35. assets/icons/radix/arrow-up.svg +8 −0
  36. assets/icons/radix/aspect-ratio.svg +8 −0
  37. assets/icons/radix/avatar.svg +8 −0
  38. assets/icons/radix/backpack.svg +8 −0
  39. assets/icons/radix/badge.svg +8 −0
  40. assets/icons/radix/bar-chart.svg +8 −0
  41. assets/icons/radix/bell.svg +8 −0
  42. assets/icons/radix/blending-mode.svg +8 −0
  43. assets/icons/radix/bookmark-filled.svg +8 −0
  44. assets/icons/radix/bookmark.svg +8 −0
  45. assets/icons/radix/border-all.svg +17 −0
  46. assets/icons/radix/border-bottom.svg +29 −0
  47. assets/icons/radix/border-dashed.svg +8 −0
  48. assets/icons/radix/border-dotted.svg +8 −0
  49. assets/icons/radix/border-left.svg +29 −0
  50. assets/icons/radix/border-none.svg +35 −0
  51. assets/icons/radix/border-right.svg +29 −0
  52. assets/icons/radix/border-solid.svg +8 −0
  53. assets/icons/radix/border-split.svg +21 −0
  54. assets/icons/radix/border-style.svg +8 −0
  55. assets/icons/radix/border-top.svg +29 −0
  56. assets/icons/radix/border-width.svg +8 −0
  57. assets/icons/radix/box-model.svg +8 −0
  58. assets/icons/radix/box.svg +8 −0
  59. assets/icons/radix/button.svg +8 −0
  60. assets/icons/radix/calendar.svg +8 −0
  61. assets/icons/radix/camera.svg +8 −0
  62. assets/icons/radix/card-stack-minus.svg +8 −0
  63. assets/icons/radix/card-stack-plus.svg +8 −0
  64. assets/icons/radix/card-stack.svg +8 −0
  65. assets/icons/radix/caret-down.svg +8 −0
  66. assets/icons/radix/caret-left.svg +8 −0
  67. assets/icons/radix/caret-right.svg +8 −0
  68. assets/icons/radix/caret-sort.svg +8 −0
  69. assets/icons/radix/caret-up.svg +8 −0
  70. assets/icons/radix/chat-bubble.svg +8 −0
  71. assets/icons/radix/check-circled.svg +8 −0
  72. assets/icons/radix/check.svg +8 −0
  73. assets/icons/radix/checkbox.svg +8 −0
  74. assets/icons/radix/chevron-down.svg +8 −0
  75. assets/icons/radix/chevron-left.svg +8 −0
  76. assets/icons/radix/chevron-right.svg +8 −0
  77. assets/icons/radix/chevron-up.svg +8 −0
  78. assets/icons/radix/circle-backslash.svg +8 −0
  79. assets/icons/radix/circle.svg +8 −0
  80. assets/icons/radix/clipboard-copy.svg +8 −0
  81. assets/icons/radix/clipboard.svg +8 −0
  82. assets/icons/radix/clock.svg +8 −0
  83. assets/icons/radix/code.svg +8 −0
  84. assets/icons/radix/codesandbox-logo.svg +8 −0
  85. assets/icons/radix/color-wheel.svg +8 −0
  86. assets/icons/radix/column-spacing.svg +8 −0
  87. assets/icons/radix/columns.svg +8 −0
  88. assets/icons/radix/commit.svg +8 −0
  89. assets/icons/radix/component-1.svg +8 −0
  90. assets/icons/radix/component-2.svg +8 −0
  91. assets/icons/radix/component-boolean.svg +8 −0
  92. assets/icons/radix/component-instance.svg +8 −0
  93. assets/icons/radix/component-none.svg +8 −0
  94. assets/icons/radix/component-placeholder.svg +12 −0
  95. assets/icons/radix/container.svg +8 −0
  96. assets/icons/radix/cookie.svg +8 −0
  97. assets/icons/radix/copy.svg +8 −0
  98. assets/icons/radix/corner-bottom-left.svg +8 −0
  99. assets/icons/radix/corner-bottom-right.svg +8 −0
  100. assets/icons/radix/corner-top-left.svg +8 −0
  101. assets/icons/radix/corner-top-right.svg +8 −0
  102. assets/icons/radix/corners.svg +8 −0
  103. assets/icons/radix/countdown-timer.svg +8 −0
  104. assets/icons/radix/counter-clockwise-clock.svg +8 −0
  105. assets/icons/radix/crop.svg +8 −0
  106. assets/icons/radix/cross-1.svg +8 −0
  107. assets/icons/radix/cross-2.svg +8 −0
  108. assets/icons/radix/cross-circled.svg +8 −0
  109. assets/icons/radix/crosshair-1.svg +8 −0
  110. assets/icons/radix/crosshair-2.svg +8 −0
  111. assets/icons/radix/crumpled-paper.svg +8 −0
  112. assets/icons/radix/cube.svg +8 −0
  113. assets/icons/radix/cursor-arrow.svg +8 −0
  114. assets/icons/radix/cursor-text.svg +8 −0
  115. assets/icons/radix/dash.svg +8 −0
  116. assets/icons/radix/dashboard.svg +8 −0
  117. assets/icons/radix/desktop-mute.svg +4 −0
  118. assets/icons/radix/desktop.svg +8 −0
  119. assets/icons/radix/dimensions.svg +8 −0
  120. assets/icons/radix/disc.svg +8 −0
  121. assets/icons/radix/discord-logo.svg +13 −0
  122. assets/icons/radix/divider-horizontal.svg +8 −0
  123. assets/icons/radix/divider-vertical.svg +8 −0
  124. assets/icons/radix/dot-filled.svg +6 −0
  125. assets/icons/radix/dot-solid.svg +6 −0
  126. assets/icons/radix/dot.svg +8 −0
  127. assets/icons/radix/dots-horizontal.svg +8 −0
  128. assets/icons/radix/dots-vertical.svg +8 −0
  129. assets/icons/radix/double-arrow-down.svg +8 −0
  130. assets/icons/radix/double-arrow-left.svg +8 −0
  131. assets/icons/radix/double-arrow-right.svg +8 −0
  132. assets/icons/radix/double-arrow-up.svg +8 −0
  133. assets/icons/radix/download.svg +8 −0
  134. assets/icons/radix/drag-handle-dots-1.svg +26 −0
  135. assets/icons/radix/drag-handle-dots-2.svg +8 −0
  136. assets/icons/radix/drag-handle-horizontal.svg +8 −0
  137. assets/icons/radix/drag-handle-vertical.svg +8 −0
  138. assets/icons/radix/drawing-pin-filled.svg +14 −0
  139. assets/icons/radix/drawing-pin-solid.svg +14 −0
  140. assets/icons/radix/drawing-pin.svg +8 −0
  141. assets/icons/radix/dropdown-menu.svg +8 −0
  142. assets/icons/radix/enter-full-screen.svg +8 −0
  143. assets/icons/radix/enter.svg +8 −0
  144. assets/icons/radix/envelope-closed.svg +8 −0
  145. assets/icons/radix/envelope-open.svg +8 −0
  146. assets/icons/radix/eraser.svg +8 −0
  147. assets/icons/radix/exclamation-triangle.svg +8 −0
  148. assets/icons/radix/exit-full-screen.svg +8 −0
  149. assets/icons/radix/exit.svg +8 −0
  150. assets/icons/radix/external-link.svg +8 −0
  151. assets/icons/radix/eye-closed.svg +8 −0
  152. assets/icons/radix/eye-none.svg +8 −0
  153. assets/icons/radix/eye-open.svg +8 −0
  154. assets/icons/radix/face.svg +8 −0
  155. assets/icons/radix/figma-logo.svg +8 −0
  156. assets/icons/radix/file-minus.svg +8 −0
  157. assets/icons/radix/file-plus.svg +8 −0
  158. assets/icons/radix/file-text.svg +8 −0
  159. assets/icons/radix/file.svg +8 −0
  160. assets/icons/radix/font-bold.svg +6 −0
  161. assets/icons/radix/font-family.svg +6 −0
  162. assets/icons/radix/font-italic.svg +8 −0
  163. assets/icons/radix/font-roman.svg +8 −0
  164. assets/icons/radix/font-size.svg +8 −0
  165. assets/icons/radix/font-style.svg +8 −0
  166. assets/icons/radix/frame.svg +8 −0
  167. assets/icons/radix/framer-logo.svg +8 −0
  168. assets/icons/radix/gear.svg +8 −0
  169. assets/icons/radix/github-logo.svg +8 −0
  170. assets/icons/radix/globe.svg +26 −0
  171. assets/icons/radix/grid.svg +8 −0
  172. assets/icons/radix/group.svg +8 −0
  173. assets/icons/radix/half-1.svg +8 −0
  174. assets/icons/radix/half-2.svg +8 −0
  175. assets/icons/radix/hamburger-menu.svg +8 −0
  176. assets/icons/radix/hand.svg +8 −0
  177. assets/icons/radix/heading.svg +8 −0
  178. assets/icons/radix/heart-filled.svg +8 −0
  179. assets/icons/radix/heart.svg +8 −0
  180. assets/icons/radix/height.svg +8 −0
  181. assets/icons/radix/hobby-knife.svg +8 −0
  182. assets/icons/radix/home.svg +8 −0
  183. assets/icons/radix/iconjar-logo.svg +8 −0
  184. assets/icons/radix/id-card.svg +8 −0
  185. assets/icons/radix/image.svg +8 −0
  186. assets/icons/radix/info-circled.svg +8 −0
  187. assets/icons/radix/inner-shadow.svg +78 −0
  188. assets/icons/radix/input.svg +8 −0
  189. assets/icons/radix/instagram-logo.svg +8 −0
  190. assets/icons/radix/justify-center.svg +8 −0
  191. assets/icons/radix/justify-end.svg +8 −0
  192. assets/icons/radix/justify-start.svg +8 −0
  193. assets/icons/radix/justify-stretch.svg +8 −0
  194. assets/icons/radix/keyboard.svg +7 −0
  195. assets/icons/radix/lap-timer.svg +8 −0
  196. assets/icons/radix/laptop.svg +8 −0
  197. assets/icons/radix/layers.svg +8 −0
  198. assets/icons/radix/layout.svg +8 −0
  199. assets/icons/radix/letter-case-capitalize.svg +8 −0
  200. assets/icons/radix/letter-case-lowercase.svg +8 −0
  201. assets/icons/radix/letter-case-toggle.svg +8 −0
  202. assets/icons/radix/letter-case-uppercase.svg +8 −0
  203. assets/icons/radix/letter-spacing.svg +8 −0
  204. assets/icons/radix/lightning-bolt.svg +8 −0
  205. assets/icons/radix/line-height.svg +8 −0
  206. assets/icons/radix/link-1.svg +8 −0
  207. assets/icons/radix/link-2.svg +8 −0
  208. assets/icons/radix/link-break-1.svg +8 −0
  209. assets/icons/radix/link-break-2.svg +8 −0
  210. assets/icons/radix/link-none-1.svg +8 −0
  211. assets/icons/radix/link-none-2.svg +8 −0
  212. assets/icons/radix/linkedin-logo.svg +8 −0
  213. assets/icons/radix/list-bullet.svg +8 −0
  214. assets/icons/radix/lock-closed.svg +8 −0
  215. assets/icons/radix/lock-open-1.svg +8 −0
  216. assets/icons/radix/lock-open-2.svg +8 −0
  217. assets/icons/radix/loop.svg +8 −0
  218. assets/icons/radix/magic-wand.svg +8 −0
  219. assets/icons/radix/magnifying-glass.svg +8 −0
  220. assets/icons/radix/margin.svg +8 −0
  221. assets/icons/radix/mask-off.svg +8 −0
  222. assets/icons/radix/mask-on.svg +8 −0
  223. assets/icons/radix/mic-mute.svg +3 −0
  224. assets/icons/radix/mic.svg +3 −0
  225. assets/icons/radix/minus-circled.svg +8 −0
  226. assets/icons/radix/minus.svg +8 −0
  227. assets/icons/radix/mix.svg +8 −0
  228. assets/icons/radix/mixer-horizontal.svg +8 −0
  229. assets/icons/radix/mixer-vertical.svg +8 −0
  230. assets/icons/radix/mobile.svg +8 −0
  231. assets/icons/radix/modulz-logo.svg +8 −0
  232. assets/icons/radix/moon.svg +8 −0
  233. assets/icons/radix/move.svg +8 −0
  234. assets/icons/radix/notion-logo.svg +6 −0
  235. assets/icons/radix/opacity.svg +8 −0
  236. assets/icons/radix/open-in-new-window.svg +10 −0
  237. assets/icons/radix/outer-shadow.svg +43 −0
  238. assets/icons/radix/overline.svg +8 −0
  239. assets/icons/radix/padding.svg +8 −0
  240. assets/icons/radix/paper-plane.svg +8 −0
  241. assets/icons/radix/pause.svg +8 −0
  242. assets/icons/radix/pencil-1.svg +8 −0
  243. assets/icons/radix/pencil-2.svg +8 −0
  244. assets/icons/radix/person.svg +8 −0
  245. assets/icons/radix/pie-chart.svg +8 −0
  246. assets/icons/radix/pilcrow.svg +8 −0
  247. assets/icons/radix/pin-bottom.svg +8 −0
  248. assets/icons/radix/pin-left.svg +8 −0
  249. assets/icons/radix/pin-right.svg +8 −0
  250. assets/icons/radix/pin-top.svg +8 −0
  251. assets/icons/radix/play.svg +8 −0
  252. assets/icons/radix/plus-circled.svg +8 −0
  253. assets/icons/radix/plus.svg +8 −0
  254. assets/icons/radix/question-mark-circled.svg +8 −0
  255. assets/icons/radix/question-mark.svg +8 −0
  256. assets/icons/radix/quote.svg +8 −0
  257. assets/icons/radix/radiobutton.svg +8 −0
  258. assets/icons/radix/reader.svg +8 −0
  259. assets/icons/radix/reload.svg +8 −0
  260. assets/icons/radix/reset.svg +8 −0
  261. assets/icons/radix/resume.svg +8 −0
  262. assets/icons/radix/rocket.svg +8 −0
  263. assets/icons/radix/rotate-counter-clockwise.svg +8 −0
  264. assets/icons/radix/row-spacing.svg +8 −0
  265. assets/icons/radix/rows.svg +8 −0
  266. assets/icons/radix/ruler-horizontal.svg +8 −0
  267. assets/icons/radix/ruler-square.svg +8 −0
  268. assets/icons/radix/scissors.svg +8 −0
  269. assets/icons/radix/section.svg +8 −0
  270. assets/icons/radix/sewing-pin-filled.svg +8 −0
  271. assets/icons/radix/sewing-pin-solid.svg +8 −0
  272. assets/icons/radix/sewing-pin.svg +8 −0
  273. assets/icons/radix/shadow-inner.svg +78 −0
  274. assets/icons/radix/shadow-none.svg +78 −0
  275. assets/icons/radix/shadow-outer.svg +43 −0
  276. assets/icons/radix/shadow.svg +78 −0
  277. assets/icons/radix/share-1.svg +8 −0
  278. assets/icons/radix/share-2.svg +8 −0
  279. assets/icons/radix/shuffle.svg +8 −0
  280. assets/icons/radix/size.svg +8 −0
  281. assets/icons/radix/sketch-logo.svg +8 −0
  282. assets/icons/radix/slash.svg +8 −0
  283. assets/icons/radix/slider.svg +8 −0
  284. assets/icons/radix/space-between-horizontally.svg +8 −0
  285. assets/icons/radix/space-between-vertically.svg +8 −0
  286. assets/icons/radix/space-evenly-horizontally.svg +8 −0
  287. assets/icons/radix/space-evenly-vertically.svg +8 −0
  288. assets/icons/radix/speaker-loud.svg +8 −0
  289. assets/icons/radix/speaker-moderate.svg +8 −0
  290. assets/icons/radix/speaker-off.svg +8 −0
  291. assets/icons/radix/speaker-quiet.svg +8 −0
  292. assets/icons/radix/square.svg +8 −0
  293. assets/icons/radix/stack.svg +8 −0
  294. assets/icons/radix/star-filled.svg +6 −0
  295. assets/icons/radix/star.svg +8 −0
  296. assets/icons/radix/stitches-logo.svg +8 −0
  297. assets/icons/radix/stop.svg +8 −0
  298. assets/icons/radix/stopwatch.svg +8 −0
  299. assets/icons/radix/stretch-horizontally.svg +8 −0
  300. assets/icons/radix/stretch-vertically.svg +8 −0
  301. assets/icons/radix/strikethrough.svg +8 −0
  302. assets/icons/radix/sun.svg +8 −0
  303. assets/icons/radix/switch.svg +8 −0
  304. assets/icons/radix/symbol.svg +8 −0
  305. assets/icons/radix/table.svg +8 −0
  306. assets/icons/radix/target.svg +8 −0
  307. assets/icons/radix/text-align-bottom.svg +8 −0
  308. assets/icons/radix/text-align-center.svg +8 −0
  309. assets/icons/radix/text-align-justify.svg +8 −0
  310. assets/icons/radix/text-align-left.svg +8 −0
  311. assets/icons/radix/text-align-middle.svg +8 −0
  312. assets/icons/radix/text-align-right.svg +8 −0
  313. assets/icons/radix/text-align-top.svg +8 −0
  314. assets/icons/radix/text-none.svg +8 −0
  315. assets/icons/radix/text.svg +8 −0
  316. assets/icons/radix/thick-arrow-down.svg +8 −0
  317. assets/icons/radix/thick-arrow-left.svg +8 −0
  318. assets/icons/radix/thick-arrow-right.svg +8 −0
  319. assets/icons/radix/thick-arrow-up.svg +8 −0
  320. assets/icons/radix/timer.svg +8 −0
  321. assets/icons/radix/tokens.svg +8 −0
  322. assets/icons/radix/track-next.svg +8 −0
  323. assets/icons/radix/track-previous.svg +8 −0
  324. assets/icons/radix/transform.svg +8 −0
  325. assets/icons/radix/transparency-grid.svg +9 −0
  326. assets/icons/radix/trash.svg +8 −0
  327. assets/icons/radix/triangle-down.svg +3 −0
  328. assets/icons/radix/triangle-left.svg +3 −0
  329. assets/icons/radix/triangle-right.svg +3 −0
  330. assets/icons/radix/triangle-up.svg +3 −0
  331. assets/icons/radix/twitter-logo.svg +8 −0
  332. assets/icons/radix/underline.svg +8 −0
  333. assets/icons/radix/update.svg +8 −0
  334. assets/icons/radix/upload.svg +8 −0
  335. assets/icons/radix/value-none.svg +8 −0
  336. assets/icons/radix/value.svg +8 −0
  337. assets/icons/radix/vercel-logo.svg +8 −0
  338. assets/icons/radix/video.svg +8 −0
  339. assets/icons/radix/view-grid.svg +8 −0
  340. assets/icons/radix/view-horizontal.svg +8 −0
  341. assets/icons/radix/view-none.svg +8 −0
  342. assets/icons/radix/view-vertical.svg +8 −0
  343. assets/icons/radix/width.svg +8 −0
  344. assets/icons/radix/zoom-in.svg +8 −0
  345. assets/icons/radix/zoom-out.svg +8 −0
  346. assets/icons/split_message_15.svg +1 −0
  347. assets/keymaps/atom.json +35 −4
  348. assets/keymaps/default.json +17 −5
  349. assets/keymaps/sublime_text.json +1 −3
  350. assets/keymaps/textmate.json +3 −3
  351. assets/keymaps/vim.json +31 −29
  352. assets/settings/default.json +39 −29
  353. assets/sounds/joined_call.wav +0 −0
  354. assets/sounds/leave_call.wav +0 −0
  355. assets/sounds/mute.wav +0 −0
  356. assets/sounds/start_screenshare.wav +0 −0
  357. assets/sounds/stop_screenshare.wav +0 −0
  358. assets/sounds/unmute.wav +0 −0
  359. crates/activity_indicator/src/activity_indicator.rs +5 −10
  360. crates/ai/Cargo.toml +4 −1
  361. crates/ai/src/ai.rs +92 −2
  362. crates/ai/src/assistant.rs +1533 −457
  363. crates/audio/Cargo.toml +23 −0
  364. crates/audio/src/assets.rs +44 −0
  365. crates/audio/src/audio.rs +67 −0
  366. crates/auto_update/src/update_notification.rs +2 −2
  367. crates/breadcrumbs/src/breadcrumbs.rs +1 −1
  368. crates/call/Cargo.toml +1 −0
  369. crates/call/src/participant.rs +5 −1
  370. crates/call/src/room.rs +397 −31
  371. crates/client/src/telemetry.rs +8 −34
  372. crates/collab/Cargo.toml +3 −2
  373. crates/collab/migrations.sqlite/20221109000000_test_schema.sql +1 −0
  374. crates/collab/migrations/20230616134535_add_is_external_to_worktree_entries.sql +2 −0
  375. crates/collab/src/db.rs +3 −0
  376. crates/collab/src/db/worktree_entry.rs +1 −0
  377. crates/collab/src/rpc.rs +16 −1
  378. crates/collab/src/tests.rs +1 −0
  379. crates/collab/src/tests/integration_tests.rs +649 −12
  380. crates/collab_ui/Cargo.toml +4 −0
  381. crates/collab_ui/src/branch_list.rs +238 −0
  382. crates/collab_ui/src/collab_titlebar_item.rs +500 −134
  383. crates/collab_ui/src/collab_ui.rs +40 −2
  384. crates/collab_ui/src/contact_finder.rs +2 −1
  385. crates/collab_ui/src/contact_list.rs +27 −18
  386. crates/collab_ui/src/notifications.rs +2 −2
  387. crates/command_palette/src/command_palette.rs +2 −2
  388. crates/context_menu/src/context_menu.rs +51 −18
  389. crates/copilot/src/copilot.rs +8 −5
  390. crates/copilot/src/sign_in.rs +3 −3
  391. crates/copilot_button/src/copilot_button.rs +8 −4
  392. crates/diagnostics/src/diagnostics.rs +3 −1
  393. crates/diagnostics/src/items.rs +2 −2
  394. crates/editor/src/display_map.rs +86 −70
  395. crates/editor/src/display_map/block_map.rs +43 −37
  396. crates/editor/src/display_map/fold_map.rs +408 −453
  397. crates/editor/src/display_map/inlay_map.rs +1787 −0
  398. crates/editor/src/display_map/suggestion_map.rs +0 −871
  399. crates/editor/src/display_map/tab_map.rs +105 −119
  400. crates/editor/src/display_map/wrap_map.rs +42 −44
  401. crates/editor/src/editor.rs +362 −56
  402. crates/editor/src/editor_tests.rs +280 −3
  403. crates/editor/src/element.rs +16 −7
  404. crates/editor/src/inlay_hint_cache.rs +2275 −0
  405. crates/editor/src/multi_buffer.rs +5 −5
  406. crates/editor/src/multi_buffer/anchor.rs +17 −0
  407. crates/editor/src/scroll.rs +21 −5
  408. crates/editor/src/scroll/actions.rs +6 −6
  409. crates/editor/src/scroll/scroll_amount.rs +15 −17
  410. crates/feedback/src/deploy_feedback_button.rs +2 −1
  411. crates/feedback/src/submit_feedback_button.rs +1 −1
  412. crates/file_finder/src/file_finder.rs +1 −1
  413. crates/fs/Cargo.toml +4 −0
  414. crates/fs/src/fs.rs +86 −26
  415. crates/fs/src/repository.rs +47 −1
  416. crates/go_to_line/src/go_to_line.rs +11 −0
  417. crates/gpui/src/app.rs +39 −15
  418. crates/gpui/src/app/action.rs +4 −4
  419. crates/gpui/src/app/window.rs +40 −25
  420. crates/gpui/src/color.rs +3 −2
  421. crates/gpui/src/elements.rs +1 −91
  422. crates/gpui/src/elements/container.rs +6 −4
  423. crates/gpui/src/elements/image.rs +2 −1
  424. crates/gpui/src/elements/label.rs +3 −1
  425. crates/gpui/src/elements/list.rs +5 −5
  426. crates/gpui/src/elements/mouse_event_handler.rs +11 −2
  427. crates/gpui/src/elements/svg.rs +31 −6
  428. crates/gpui/src/elements/tooltip.rs +3 −2
  429. crates/gpui/src/executor.rs +4 −1
  430. crates/gpui/src/font_cache.rs +2 −1
  431. crates/gpui/src/fonts.rs +29 −4
  432. crates/gpui/src/gpui.rs +3 −1
  433. crates/gpui/src/platform.rs +2 −1
  434. crates/gpui/src/platform/mac/platform.rs +6 −3
  435. crates/gpui/src/scene.rs +2 −1
  436. crates/gpui/src/scene/mouse_event.rs +22 −0
  437. crates/gpui/src/scene/mouse_region.rs +36 −1
  438. crates/gpui_macros/src/gpui_macros.rs +67 −2
  439. crates/language/src/language.rs +193 −77
  440. crates/language/src/language_settings.rs +60 −1
  441. crates/language/src/syntax_map.rs +169 −78
  442. crates/language/src/syntax_map/syntax_map_tests.rs +32 −1
  443. crates/language_selector/src/active_buffer_language.rs +1 −1
  444. crates/language_selector/src/language_selector.rs +1 −1
  445. crates/language_tools/src/lsp_log.rs +5 −3
  446. crates/language_tools/src/syntax_tree_view.rs +3 −2
  447. crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift +131 −1
  448. crates/live_kit_client/examples/test_app.rs +94 −12
  449. crates/live_kit_client/src/live_kit_client.rs +1 −1
  450. crates/live_kit_client/src/prod.rs +384 −1
  451. crates/live_kit_client/src/test.rs +162 −6
  452. crates/lsp/src/lsp.rs +61 −24
  453. crates/node_runtime/Cargo.toml +1 −0
  454. crates/node_runtime/src/node_runtime.rs +120 −83
  455. crates/outline/src/outline.rs +1 −1
  456. crates/picker/src/picker.rs +25 −0
  457. crates/project/Cargo.toml +1 −1
  458. crates/project/src/lsp_command.rs +349 −4
  459. crates/project/src/project.rs +989 −442
  460. crates/project/src/project_tests.rs +118 −15
  461. crates/project/src/worktree.rs +719 −391
  462. crates/project/src/worktree_tests.rs +708 −90
  463. crates/project_panel/Cargo.toml +1 −0
  464. crates/project_panel/src/project_panel.rs +219 −43
  465. crates/project_symbols/src/project_symbols.rs +5 −2
  466. crates/recent_projects/Cargo.toml +1 −0
  467. crates/recent_projects/src/recent_projects.rs +20 −4
  468. crates/rope/src/rope.rs +7 −1
  469. crates/rpc/proto/zed.proto +79 −1
  470. crates/rpc/src/proto.rs +11 −0
  471. crates/rpc/src/rpc.rs +1 −1
  472. crates/search/src/buffer_search.rs +14 −6
  473. crates/search/src/project_search.rs +6 −2
  474. crates/settings/Cargo.toml +3 −3
  475. crates/settings/src/keymap_file.rs +55 −15
  476. crates/settings/src/settings_store.rs +1 −4
  477. crates/sum_tree/src/cursor.rs +38 −2
  478. crates/sum_tree/src/sum_tree.rs +49 −31
  479. crates/sum_tree/src/tree_map.rs +3 −3
  480. crates/terminal_view/src/terminal_element.rs +11 −10
  481. crates/terminal_view/src/terminal_panel.rs +3 −0
  482. crates/text/src/text.rs +21 −16
  483. crates/theme/src/theme.rs +181 −146
  484. crates/theme/src/theme_settings.rs +2 −1
  485. crates/theme/src/ui.rs +12 −31
  486. crates/theme_selector/src/theme_selector.rs +1 −1
  487. crates/theme_testbench/Cargo.toml +0 −19
  488. crates/theme_testbench/src/theme_testbench.rs +0 −300
  489. crates/util/src/paths.rs +1 −0
  490. crates/util/src/util.rs +12 −2
  491. crates/vim/src/motion.rs +18 −9
  492. crates/vim/src/normal.rs +26 −64
  493. crates/vim/src/normal/case.rs +64 −0
  494. crates/vim/src/normal/change.rs +5 −4
  495. crates/vim/src/normal/delete.rs +1 −1
  496. crates/vim/src/normal/scroll.rs +120 −0
  497. crates/vim/src/normal/substitute.rs +73 −0
  498. crates/vim/src/normal/yank.rs +1 −1
  499. crates/vim/src/test.rs +41 −0
  500. crates/vim/src/vim.rs +3 −4
  501. crates/vim/src/visual.rs +1 −1
  502. crates/welcome/src/base_keymap_picker.rs +1 −1
  503. crates/workspace/src/dock.rs +7 −4
  504. crates/workspace/src/item.rs +2 −2
  505. crates/workspace/src/notifications.rs +2 −2
  506. crates/workspace/src/pane.rs +48 −23
  507. crates/workspace/src/persistence.rs +21 −6
  508. crates/workspace/src/persistence/model.rs +5 −1
  509. crates/workspace/src/toolbar.rs +33 −43
  510. crates/workspace/src/workspace.rs +145 −44
  511. crates/xtask/Cargo.toml +13 −0
  512. crates/xtask/src/cli.rs +23 −0
  513. crates/xtask/src/main.rs +29 −0
  514. crates/zed-actions/Cargo.toml +10 −0
  515. crates/zed-actions/src/lib.rs +28 −0
  516. crates/zed/Cargo.toml +3 −3
  517. crates/zed/src/assets.rs +1 −0
  518. crates/zed/src/languages/c.rs +57 −36
  519. crates/zed/src/languages/elixir.rs +91 −29
  520. crates/zed/src/languages/elixir/highlights.scm +7 −2
  521. crates/zed/src/languages/go.rs +95 −36
  522. crates/zed/src/languages/heex/highlights.scm +9 −6
  523. crates/zed/src/languages/heex/injections.scm +10 −10
  524. crates/zed/src/languages/html.rs +58 −37
  525. crates/zed/src/languages/json.rs +48 −30
  526. crates/zed/src/languages/language_plugin.rs +17 −5
  527. crates/zed/src/languages/lua.rs +61 −35
  528. crates/zed/src/languages/python.rs +51 −33
  529. crates/zed/src/languages/ruby.rs +17 −5
  530. crates/zed/src/languages/rust.rs +45 −21
  531. crates/zed/src/languages/typescript.rs +88 −49
  532. crates/zed/src/languages/yaml.rs +50 −33
  533. crates/zed/src/main.rs +88 −93
  534. crates/zed/src/zed.rs +173 −42
  535. docs/backend-development.md +52 −0
  536. docs/building-zed.md +79 −0
  537. docs/company-and-vision.md +34 −0
  538. docs/design-tools.md +74 −0
  539. docs/index.md +14 −0
  540. docs/local-collaboration.md +22 −0
  541. docs/release-process.md +96 −0
  542. docs/tools.md +82 −0
  543. docs/zed/syntax-highlighting.md +79 −0
  544. script/build-theme-types +10 −0
  545. script/start-local-collaboration +1 −1
  546. styles/.eslintrc.js +33 −0
  547. styles/.gitignore +1 −0
  548. styles/.prettierrc +6 −0
  549. styles/.zed/settings.json +20 −0
  550. styles/package-lock.json +4207 −257
  551. styles/package.json +21 −15
  552. styles/src/buildLicenses.ts +0 −50
  553. styles/src/buildThemes.ts +0 −43
  554. styles/src/buildTokens.ts +0 −85
  555. styles/src/build_licenses.ts +50 −0
  556. styles/src/build_themes.ts +47 −0
  557. styles/src/build_tokens.ts +90 −0
  558. styles/src/build_types.ts +62 −0
  559. styles/src/common.ts +4 −22
  560. styles/src/component/icon_button.ts +85 −0
  561. styles/src/component/text_button.ts +93 −0
  562. styles/src/element/index.ts +4 −0
  563. styles/src/element/interactive.test.ts +56 −0
  564. styles/src/element/interactive.ts +97 −0
  565. styles/src/element/toggle.test.ts +52 −0
  566. styles/src/element/toggle.ts +47 −0
  567. styles/src/styleTree/app.ts +0 −74
  568. styles/src/styleTree/assistant.ts +0 −85
  569. styles/src/styleTree/commandPalette.ts +0 −30
  570. styles/src/styleTree/contactFinder.ts +0 −70
  571. styles/src/styleTree/contactList.ts +0 −182
  572. styles/src/styleTree/contactNotification.ts +0 −45
  573. styles/src/styleTree/contactsPopover.ts +0 −16
  574. styles/src/styleTree/contextMenu.ts +0 −49
  575. styles/src/styleTree/copilot.ts +0 −267
  576. styles/src/styleTree/editor.ts +0 −281
  577. styles/src/styleTree/feedback.ts +0 −44
  578. styles/src/styleTree/hoverPopover.ts +0 −46
  579. styles/src/styleTree/incomingCallNotification.ts +0 −53
  580. styles/src/styleTree/picker.ts +0 −82
  581. styles/src/styleTree/projectDiagnostics.ts +0 −13
  582. styles/src/styleTree/projectPanel.ts +0 −107
  583. styles/src/styleTree/projectSharedNotification.ts +0 −54
  584. styles/src/styleTree/search.ts +0 −113
  585. styles/src/styleTree/sharedScreen.ts +0 −9
  586. styles/src/styleTree/simpleMessageNotification.ts +0 −44
  587. styles/src/styleTree/statusBar.ts +0 −126
  588. styles/src/styleTree/tabBar.ts +0 −109
  589. styles/src/styleTree/terminal.ts +0 −52
  590. styles/src/styleTree/toolbarDropdownMenu.ts +0 −46
  591. styles/src/styleTree/tooltip.ts +0 −23
  592. styles/src/styleTree/updateNotification.ts +0 −31
  593. styles/src/styleTree/welcome.ts +0 −129
  594. styles/src/styleTree/workspace.ts +0 −338
  595. styles/src/style_tree/app.ts +62 −0
  596. styles/src/style_tree/assistant.ts +281 −0
  597. styles/src/style_tree/command_palette.ts +46 −0
  598. styles/src/style_tree/components.ts +67 −63
  599. styles/src/style_tree/contact_finder.ts +74 −0
  600. styles/src/style_tree/contact_list.ts +247 −0
  601. styles/src/style_tree/contact_notification.ts +55 −0
  602. styles/src/style_tree/contacts_popover.ts +16 −0
  603. styles/src/style_tree/context_menu.ts +70 −0
  604. styles/src/style_tree/copilot.ts +293 −0
  605. styles/src/style_tree/editor.ts +319 −0
  606. styles/src/style_tree/feedback.ts +51 −0
  607. styles/src/style_tree/hover_popover.ts +49 −0
  608. styles/src/style_tree/incoming_call_notification.ts +55 −0
  609. styles/src/style_tree/picker.ts +132 −0
  610. styles/src/style_tree/project_diagnostics.ts +14 −0
  611. styles/src/style_tree/project_panel.ts +199 −0
  612. styles/src/style_tree/project_shared_notification.ts +55 −0
  613. styles/src/style_tree/search.ts +138 −0
  614. styles/src/style_tree/shared_screen.ts +10 −0
  615. styles/src/style_tree/simple_message_notification.ts +52 −0
  616. styles/src/style_tree/status_bar.ts +156 −0
  617. styles/src/style_tree/tab_bar.ts +131 −0
  618. styles/src/style_tree/terminal.ts +54 −0
  619. styles/src/style_tree/titlebar.ts +278 −0
  620. styles/src/style_tree/toolbar_dropdown_menu.ts +66 −0
  621. styles/src/style_tree/tooltip.ts +24 −0
  622. styles/src/style_tree/update_notification.ts +41 −0
  623. styles/src/style_tree/welcome.ts +157 −0
  624. styles/src/style_tree/workspace.ts +192 −0
  625. styles/src/system/lib/convert.ts +0 −11
  626. styles/src/system/lib/curve.ts +0 −26
  627. styles/src/system/lib/generate.ts +0 −159
  628. styles/src/system/ref/color.ts +0 −445
  629. styles/src/system/ref/curves.ts +0 −25
  630. styles/src/system/system.ts +0 −32
  631. styles/src/system/types.ts +0 −66
  632. styles/src/theme/color.ts +1 −1
  633. styles/src/theme/colorScheme.ts +0 −286
  634. styles/src/theme/create_theme.ts +282 −0
  635. styles/src/theme/index.ts +23 −2
  636. styles/src/theme/ramps.ts +22 −22
  637. styles/src/theme/syntax.ts +68 −55
  638. styles/src/theme/themeConfig.ts +0 −148
  639. styles/src/theme/theme_config.ts +81 −0
  640. styles/src/theme/tokens/colorScheme.ts +0 −81
  641. styles/src/theme/tokens/layer.ts +25 −22
  642. styles/src/theme/tokens/players.ts +26 −17
  643. styles/src/theme/tokens/theme.ts +101 −0
  644. styles/src/theme/tokens/token.ts +7 −2
  645. styles/src/themes/andromeda/LICENSE +1 −1
  646. styles/src/themes/andromeda/andromeda.ts +13 −13
  647. styles/src/themes/atelier/LICENSE +1 −1
  648. styles/src/themes/atelier/atelier-cave-dark.ts +17 −17
  649. styles/src/themes/atelier/atelier-cave-light.ts +17 −17
  650. styles/src/themes/atelier/atelier-dune-dark.ts +17 −17
  651. styles/src/themes/atelier/atelier-dune-light.ts +17 −17
  652. styles/src/themes/atelier/atelier-estuary-dark.ts +17 −17
  653. styles/src/themes/atelier/atelier-estuary-light.ts +17 −17
  654. styles/src/themes/atelier/atelier-forest-dark.ts +17 −17
  655. styles/src/themes/atelier/atelier-forest-light.ts +18 −18
  656. styles/src/themes/atelier/atelier-heath-dark.ts +17 −17
  657. styles/src/themes/atelier/atelier-heath-light.ts +17 −17
  658. styles/src/themes/atelier/atelier-lakeside-dark.ts +17 −17
  659. styles/src/themes/atelier/atelier-lakeside-light.ts +17 −17
  660. styles/src/themes/atelier/atelier-plateau-dark.ts +17 −17
  661. styles/src/themes/atelier/atelier-plateau-light.ts +17 −17
  662. styles/src/themes/atelier/atelier-savanna-dark.ts +17 −17
  663. styles/src/themes/atelier/atelier-savanna-light.ts +17 −17
  664. styles/src/themes/atelier/atelier-seaside-dark.ts +17 −17
  665. styles/src/themes/atelier/atelier-seaside-light.ts +17 −17
  666. styles/src/themes/atelier/atelier-sulphurpool-dark.ts +17 −17
  667. styles/src/themes/atelier/atelier-sulphurpool-light.ts +17 −17
  668. styles/src/themes/atelier/common.ts +3 −3
  669. styles/src/themes/ayu/LICENSE +1 −1
  670. styles/src/themes/ayu/ayu-dark.ts +6 −6
  671. styles/src/themes/ayu/ayu-light.ts +6 −6
  672. styles/src/themes/ayu/ayu-mirage.ts +6 −6
  673. styles/src/themes/ayu/common.ts +15 −15
  674. styles/src/themes/gruvbox/LICENSE +1 −1
  675. styles/src/themes/gruvbox/gruvbox-common.ts +58 −59
  676. styles/src/themes/gruvbox/gruvbox-dark-hard.ts +1 −1
  677. styles/src/themes/gruvbox/gruvbox-dark-soft.ts +1 −1
  678. styles/src/themes/gruvbox/gruvbox-dark.ts +1 −1
  679. styles/src/themes/gruvbox/gruvbox-light-hard.ts +1 −1
  680. styles/src/themes/gruvbox/gruvbox-light-soft.ts +1 −1
  681. styles/src/themes/gruvbox/gruvbox-light.ts +1 −1
  682. styles/src/themes/index.ts +74 −74
  683. styles/src/themes/one/LICENSE +1 −1
  684. styles/src/themes/one/one-dark.ts +20 −19
  685. styles/src/themes/one/one-light.ts +19 −19
  686. styles/src/themes/rose-pine/LICENSE +1 −1
  687. styles/src/themes/rose-pine/common.ts +75 −0
  688. styles/src/themes/rose-pine/rose-pine-dawn.ts +34 −24
  689. styles/src/themes/rose-pine/rose-pine-moon.ts +30 −22
  690. styles/src/themes/rose-pine/rose-pine.ts +29 −22
  691. styles/src/themes/sandcastle/LICENSE +1 −1
  692. styles/src/themes/sandcastle/sandcastle.ts +13 −13
  693. styles/src/themes/solarized/LICENSE +1 −1
  694. styles/src/themes/solarized/solarized.ts +17 −17
  695. styles/src/themes/summercamp/LICENSE +1 −1
  696. styles/src/themes/summercamp/summercamp.ts +13 −13
  697. styles/src/utils/slugify.ts +10 −1
  698. styles/src/utils/snakeCase.ts +0 −35
  699. styles/tsconfig.json +6 −2
  700. styles/vitest.config.ts +8 −0
.cargo/config.toml+2−0
@@ -0,0 +1,2 @@
1[alias]
2xtask = "run --package xtask --"
.config/nextest.toml+6−0
@@ -0,0 +1,6 @@
1[test-groups]
2sequential-db-tests = { max-threads = 1 }
3
4[[profile.default.overrides]]
5filter = 'package(db)'
6test-group = 'sequential-db-tests'
.github/workflows/ci.yml+2−1
@@ -51,6 +51,7 @@ jobs: · 50 unmodified lines
51 rustup set profile minimal51 rustup set profile minimal
52 rustup update stable52 rustup update stable
53 rustup target add wasm32-wasi53 rustup target add wasm32-wasi
54 cargo install cargo-nextest
54 55
55 - name: Install Node56 - name: Install Node
56 uses: actions/setup-node@v257 uses: actions/setup-node@v2
@@ -70,7 +71,7 @@ jobs: · 13 unmodified lines
70 run: cargo check --workspace71 run: cargo check --workspace
71 72
72 - name: Run tests73 - name: Run tests
73 run: cargo test --workspace --no-fail-fast74 run: cargo nextest run --workspace --no-fail-fast
74 75
75 - name: Build collab76 - name: Build collab
76 run: cargo build -p collab77 run: cargo build -p collab
.gitignore+3−0
@@ -4,6 +4,8 @@ · 3 unmodified lines
4/plugins/bin4/plugins/bin
5/script/node_modules5/script/node_modules
6/styles/node_modules6/styles/node_modules
7/styles/src/types/zed.ts
8/crates/theme/schemas/theme.json
7/crates/collab/static/styles.css9/crates/collab/static/styles.css
8/vendor/bin10/vendor/bin
9/assets/themes/*.json11/assets/themes/*.json
@@ -18,4 +20,5 @@ DerivedData/ · 8 unmodified lines
18.swiftpm/config/registries.json20.swiftpm/config/registries.json
19.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata21.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
20.netrc22.netrc
23.swiftpm
21**/*.db24**/*.db
Cargo.lock+611−59
@@ -109,11 +109,14 @@ dependencies = [ · 108 unmodified lines
109 "isahc",109 "isahc",
110 "language",110 "language",
111 "menu",111 "menu",
112 "project",
113 "regex",
112 "schemars",114 "schemars",
113 "search",115 "search",
114 "serde",116 "serde",
115 "serde_json",117 "serde_json",
116 "settings",118 "settings",
119 "smol",
117 "theme",120 "theme",
118 "tiktoken-rs",121 "tiktoken-rs",
119 "util",122 "util",
@@ -174,6 +177,28 @@ version = "0.1.3" · 54 unmodified lines
174source = "registry+https://github.com/rust-lang/crates.io-index"177source = "registry+https://github.com/rust-lang/crates.io-index"
175checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"178checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
176 179
180[[package]]
181name = "alsa"
182version = "0.7.0"
183source = "registry+https://github.com/rust-lang/crates.io-index"
184checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44"
185dependencies = [
186 "alsa-sys",
187 "bitflags",
188 "libc",
189 "nix",
190]
191
192[[package]]
193name = "alsa-sys"
194version = "0.3.1"
195source = "registry+https://github.com/rust-lang/crates.io-index"
196checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
197dependencies = [
198 "libc",
199 "pkg-config",
200]
201
177[[package]]202[[package]]
178name = "ambient-authority"203name = "ambient-authority"
179version = "0.0.1"204version = "0.0.1"
@@ -189,6 +214,55 @@ dependencies = [ · 9 unmodified lines
189 "libc",214 "libc",
190]215]
191 216
217[[package]]
218name = "anstream"
219version = "0.3.2"
220source = "registry+https://github.com/rust-lang/crates.io-index"
221checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
222dependencies = [
223 "anstyle",
224 "anstyle-parse",
225 "anstyle-query",
226 "anstyle-wincon",
227 "colorchoice",
228 "is-terminal 0.4.7",
229 "utf8parse",
230]
231
232[[package]]
233name = "anstyle"
234version = "1.0.1"
235source = "registry+https://github.com/rust-lang/crates.io-index"
236checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
237
238[[package]]
239name = "anstyle-parse"
240version = "0.2.1"
241source = "registry+https://github.com/rust-lang/crates.io-index"
242checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
243dependencies = [
244 "utf8parse",
245]
246
247[[package]]
248name = "anstyle-query"
249version = "1.0.0"
250source = "registry+https://github.com/rust-lang/crates.io-index"
251checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
252dependencies = [
253 "windows-sys 0.48.0",
254]
255
256[[package]]
257name = "anstyle-wincon"
258version = "1.0.1"
259source = "registry+https://github.com/rust-lang/crates.io-index"
260checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
261dependencies = [
262 "anstyle",
263 "windows-sys 0.48.0",
264]
265
192[[package]]266[[package]]
193name = "anyhow"267name = "anyhow"
194version = "1.0.71"268version = "1.0.71"
@@ -538,6 +612,19 @@ dependencies = [ · 343 unmodified lines
538 "winapi 0.3.9",612 "winapi 0.3.9",
539]613]
540 614
615[[package]]
616name = "audio"
617version = "0.1.0"
618dependencies = [
619 "anyhow",
620 "collections",
621 "gpui",
622 "log",
623 "parking_lot 0.11.2",
624 "rodio",
625 "util",
626]
627
541[[package]]628[[package]]
542name = "auto_update"629name = "auto_update"
543version = "0.1.0"630version = "0.1.0"
@@ -593,7 +680,7 @@ dependencies = [ · 49 unmodified lines
593 "http",680 "http",
594 "http-body",681 "http-body",
595 "hyper",682 "hyper",
596 "itoa",683 "itoa 1.0.6",
597 "matchit",684 "matchit",
598 "memchr",685 "memchr",
599 "mime",686 "mime",
@@ -704,6 +791,26 @@ dependencies = [ · 104 unmodified lines
704 "serde",791 "serde",
705]792]
706 793
794[[package]]
795name = "bindgen"
796version = "0.64.0"
797source = "registry+https://github.com/rust-lang/crates.io-index"
798checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
799dependencies = [
800 "bitflags",
801 "cexpr",
802 "clang-sys",
803 "lazy_static",
804 "lazycell",
805 "peeking_take_while",
806 "proc-macro2",
807 "quote",
808 "regex",
809 "rustc-hash",
810 "shlex",
811 "syn 1.0.109",
812]
813
707[[package]]814[[package]]
708name = "bindgen"815name = "bindgen"
709version = "0.65.1"816version = "0.65.1"
@@ -805,7 +912,7 @@ checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" · 95 unmodified lines
805dependencies = [912dependencies = [
806 "borsh-derive-internal",913 "borsh-derive-internal",
807 "borsh-schema-derive-internal",914 "borsh-schema-derive-internal",
808 "proc-macro-crate",915 "proc-macro-crate 0.1.5",
809 "proc-macro2",916 "proc-macro2",
810 "syn 1.0.109",917 "syn 1.0.109",
811]918]
@@ -934,6 +1041,7 @@ version = "0.1.0" · 122 unmodified lines
934dependencies = [1041dependencies = [
935 "anyhow",1042 "anyhow",
936 "async-broadcast",1043 "async-broadcast",
1044 "audio",
937 "client",1045 "client",
938 "collections",1046 "collections",
939 "fs",1047 "fs",
@@ -1030,6 +1138,12 @@ dependencies = [ · 90 unmodified lines
1030 "jobserver",1138 "jobserver",
1031]1139]
1032 1140
1141[[package]]
1142name = "cesu8"
1143version = "1.1.0"
1144source = "registry+https://github.com/rust-lang/crates.io-index"
1145checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
1146
1033[[package]]1147[[package]]
1034name = "cexpr"1148name = "cexpr"
1035version = "0.6.0"1149version = "0.6.0"
@@ -1101,15 +1215,39 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" · 65 unmodified lines
1101dependencies = [1215dependencies = [
1102 "atty",1216 "atty",
1103 "bitflags",1217 "bitflags",
1104 "clap_derive",1218 "clap_derive 3.2.25",
1105 "clap_lex",1219 "clap_lex 0.2.4",
1106 "indexmap",1220 "indexmap 1.9.3",
1107 "once_cell",1221 "once_cell",
1108 "strsim",1222 "strsim",
1109 "termcolor",1223 "termcolor",
1110 "textwrap",1224 "textwrap",
1111]1225]
1112 1226
1227[[package]]
1228name = "clap"
1229version = "4.3.5"
1230source = "registry+https://github.com/rust-lang/crates.io-index"
1231checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc"
1232dependencies = [
1233 "clap_builder",
1234 "clap_derive 4.3.2",
1235 "once_cell",
1236]
1237
1238[[package]]
1239name = "clap_builder"
1240version = "4.3.5"
1241source = "registry+https://github.com/rust-lang/crates.io-index"
1242checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae"
1243dependencies = [
1244 "anstream",
1245 "anstyle",
1246 "bitflags",
1247 "clap_lex 0.5.0",
1248 "strsim",
1249]
1250
1113[[package]]1251[[package]]
1114name = "clap_derive"1252name = "clap_derive"
1115version = "3.2.25"1253version = "3.2.25"
@@ -1123,6 +1261,18 @@ dependencies = [ · 7 unmodified lines
1123 "syn 1.0.109",1261 "syn 1.0.109",
1124]1262]
1125 1263
1264[[package]]
1265name = "clap_derive"
1266version = "4.3.2"
1267source = "registry+https://github.com/rust-lang/crates.io-index"
1268checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
1269dependencies = [
1270 "heck 0.4.1",
1271 "proc-macro2",
1272 "quote",
1273 "syn 2.0.18",
1274]
1275
1126[[package]]1276[[package]]
1127name = "clap_lex"1277name = "clap_lex"
1128version = "0.2.4"1278version = "0.2.4"
@@ -1132,12 +1282,24 @@ dependencies = [ · 3 unmodified lines
1132 "os_str_bytes",1282 "os_str_bytes",
1133]1283]
1134 1284
1285[[package]]
1286name = "clap_lex"
1287version = "0.5.0"
1288source = "registry+https://github.com/rust-lang/crates.io-index"
1289checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
1290
1291[[package]]
1292name = "claxon"
1293version = "0.4.3"
1294source = "registry+https://github.com/rust-lang/crates.io-index"
1295checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
1296
1135[[package]]1297[[package]]
1136name = "cli"1298name = "cli"
1137version = "0.1.0"1299version = "0.1.0"
1138dependencies = [1300dependencies = [
1139 "anyhow",1301 "anyhow",
1140 "clap",1302 "clap 3.2.25",
1141 "core-foundation",1303 "core-foundation",
1142 "core-services",1304 "core-services",
1143 "dirs 3.0.2",1305 "dirs 3.0.2",
@@ -1239,15 +1401,16 @@ dependencies = [ · 95 unmodified lines
1239 1401
1240[[package]]1402[[package]]
1241name = "collab"1403name = "collab"
1242version = "0.14.2"1404version = "0.16.0"
1243dependencies = [1405dependencies = [
1244 "anyhow",1406 "anyhow",
1245 "async-tungstenite",1407 "async-tungstenite",
1408 "audio",
1246 "axum",1409 "axum",
1247 "axum-extra",1410 "axum-extra",
1248 "base64 0.13.1",1411 "base64 0.13.1",
1249 "call",1412 "call",
1250 "clap",1413 "clap 3.2.25",
1251 "client",1414 "client",
1252 "collections",1415 "collections",
1253 "ctor",1416 "ctor",
@@ -1321,12 +1484,15 @@ dependencies = [ · 67 unmodified lines
1321 "picker",1484 "picker",
1322 "postage",1485 "postage",
1323 "project",1486 "project",
1487 "recent_projects",
1324 "serde",1488 "serde",
1325 "serde_derive",1489 "serde_derive",
1326 "settings",1490 "settings",
1327 "theme",1491 "theme",
1492 "theme_selector",
1328 "util",1493 "util",
1329 "workspace",1494 "workspace",
1495 "zed-actions",
1330]1496]
1331 1497
1332[[package]]1498[[package]]
@@ -1342,6 +1508,22 @@ version = "1.1.0" · 9 unmodified lines
1342source = "registry+https://github.com/rust-lang/crates.io-index"1508source = "registry+https://github.com/rust-lang/crates.io-index"
1343checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"1509checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
1344 1510
1511[[package]]
1512name = "colorchoice"
1513version = "1.0.0"
1514source = "registry+https://github.com/rust-lang/crates.io-index"
1515checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
1516
1517[[package]]
1518name = "combine"
1519version = "4.6.6"
1520source = "registry+https://github.com/rust-lang/crates.io-index"
1521checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
1522dependencies = [
1523 "bytes 1.4.0",
1524 "memchr",
1525]
1526
1345[[package]]1527[[package]]
1346name = "command_palette"1528name = "command_palette"
1347version = "0.1.0"1529version = "0.1.0"
@@ -1438,11 +1620,17 @@ name = "core-foundation" · 90 unmodified lines
1438version = "0.9.3"1620version = "0.9.3"
1439source = "git+https://github.com/servo/core-foundation-rs?rev=079665882507dd5e2ff77db3de5070c1f6c0fb85#079665882507dd5e2ff77db3de5070c1f6c0fb85"1621source = "git+https://github.com/servo/core-foundation-rs?rev=079665882507dd5e2ff77db3de5070c1f6c0fb85#079665882507dd5e2ff77db3de5070c1f6c0fb85"
1440dependencies = [1622dependencies = [
1441 "core-foundation-sys",1623 "core-foundation-sys 0.8.3",
1442 "libc",1624 "libc",
1443 "uuid 0.5.1",1625 "uuid 0.5.1",
1444]1626]
1445 1627
1628[[package]]
1629name = "core-foundation-sys"
1630version = "0.6.2"
1631source = "registry+https://github.com/rust-lang/crates.io-index"
1632checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
1633
1446[[package]]1634[[package]]
1447name = "core-foundation-sys"1635name = "core-foundation-sys"
1448version = "0.8.3"1636version = "0.8.3"
@@ -1492,6 +1680,51 @@ dependencies = [ · 43 unmodified lines
1492 "libc",1680 "libc",
1493]1681]
1494 1682
1683[[package]]
1684name = "coreaudio-rs"
1685version = "0.11.2"
1686source = "registry+https://github.com/rust-lang/crates.io-index"
1687checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff"
1688dependencies = [
1689 "bitflags",
1690 "core-foundation-sys 0.6.2",
1691 "coreaudio-sys",
1692]
1693
1694[[package]]
1695name = "coreaudio-sys"
1696version = "0.2.12"
1697source = "registry+https://github.com/rust-lang/crates.io-index"
1698checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24"
1699dependencies = [
1700 "bindgen 0.64.0",
1701]
1702
1703[[package]]
1704name = "cpal"
1705version = "0.15.2"
1706source = "registry+https://github.com/rust-lang/crates.io-index"
1707checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c"
1708dependencies = [
1709 "alsa",
1710 "core-foundation-sys 0.8.3",
1711 "coreaudio-rs",
1712 "dasp_sample",
1713 "jni 0.19.0",
1714 "js-sys",
1715 "libc",
1716 "mach2",
1717 "ndk",
1718 "ndk-context",
1719 "oboe",
1720 "once_cell",
1721 "parking_lot 0.12.1",
1722 "wasm-bindgen",
1723 "wasm-bindgen-futures",
1724 "web-sys",
1725 "windows 0.46.0",
1726]
1727
1495[[package]]1728[[package]]
1496name = "cpp_demangle"1729name = "cpp_demangle"
1497version = "0.3.5"1730version = "0.3.5"
@@ -1822,6 +2055,12 @@ dependencies = [ · 324 unmodified lines
1822 "parking_lot_core 0.9.7",2055 "parking_lot_core 0.9.7",
1823]2056]
1824 2057
2058[[package]]
2059name = "dasp_sample"
2060version = "0.11.0"
2061source = "registry+https://github.com/rust-lang/crates.io-index"
2062checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
2063
1825[[package]]2064[[package]]
1826name = "data-url"2065name = "data-url"
1827version = "0.1.1"2066version = "0.1.1"
@@ -2131,6 +2370,12 @@ dependencies = [ · 303 unmodified lines
2131 "serde",2370 "serde",
2132]2371]
2133 2372
2373[[package]]
2374name = "equivalent"
2375version = "1.0.0"
2376source = "registry+https://github.com/rust-lang/crates.io-index"
2377checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
2378
2134[[package]]2379[[package]]
2135name = "erased-serde"2380name = "erased-serde"
2136version = "0.3.25"2381version = "0.3.25"
@@ -2447,6 +2692,7 @@ dependencies = [ · 310 unmodified lines
2447 "smol",2692 "smol",
2448 "sum_tree",2693 "sum_tree",
2449 "tempfile",2694 "tempfile",
2695 "time 0.3.21",
2450 "util",2696 "util",
2451]2697]
2452 2698
@@ -2691,7 +2937,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" · 238 unmodified lines
2691checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"2937checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
2692dependencies = [2938dependencies = [
2693 "fallible-iterator",2939 "fallible-iterator",
2694 "indexmap",2940 "indexmap 1.9.3",
2695 "stable_deref_trait",2941 "stable_deref_trait",
2696]2942]
2697 2943
@@ -2787,7 +3033,7 @@ dependencies = [ · 89 unmodified lines
2787 "anyhow",3033 "anyhow",
2788 "async-task",3034 "async-task",
2789 "backtrace",3035 "backtrace",
2790 "bindgen",3036 "bindgen 0.65.1",
2791 "block",3037 "block",
2792 "cc",3038 "cc",
2793 "cocoa",3039 "cocoa",
@@ -2859,7 +3105,7 @@ dependencies = [ · 65 unmodified lines
2859 "futures-sink",3105 "futures-sink",
2860 "futures-util",3106 "futures-util",
2861 "http",3107 "http",
2862 "indexmap",3108 "indexmap 1.9.3",
2863 "slab",3109 "slab",
2864 "tokio",3110 "tokio",
2865 "tokio-util 0.7.8",3111 "tokio-util 0.7.8",
@@ -2893,6 +3139,12 @@ dependencies = [ · 27 unmodified lines
2893 "ahash 0.8.3",3139 "ahash 0.8.3",
2894]3140]
2895 3141
3142[[package]]
3143name = "hashbrown"
3144version = "0.14.0"
3145source = "registry+https://github.com/rust-lang/crates.io-index"
3146checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
3147
2896[[package]]3148[[package]]
2897name = "hashlink"3149name = "hashlink"
2898version = "0.8.1"3150version = "0.8.1"
@@ -3003,6 +3255,12 @@ dependencies = [ · 104 unmodified lines
3003 "digest 0.10.6",3255 "digest 0.10.6",
3004]3256]
3005 3257
3258[[package]]
3259name = "hound"
3260version = "3.5.0"
3261source = "registry+https://github.com/rust-lang/crates.io-index"
3262checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1"
3263
3006[[package]]3264[[package]]
3007name = "http"3265name = "http"
3008version = "0.2.9"3266version = "0.2.9"
@@ -3011,7 +3269,7 @@ checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" · 2 unmodified lines
3011dependencies = [3269dependencies = [
3012 "bytes 1.4.0",3270 "bytes 1.4.0",
3013 "fnv",3271 "fnv",
3014 "itoa",3272 "itoa 1.0.6",
3015]3273]
3016 3274
3017[[package]]3275[[package]]
@@ -3070,7 +3328,7 @@ dependencies = [ · 52 unmodified lines
3070 "http-body",3328 "http-body",
3071 "httparse",3329 "httparse",
3072 "httpdate",3330 "httpdate",
3073 "itoa",3331 "itoa 1.0.6",
3074 "pin-project-lite 0.2.9",3332 "pin-project-lite 0.2.9",
3075 "socket2",3333 "socket2",
3076 "tokio",3334 "tokio",
@@ -3111,11 +3369,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" · 34 unmodified lines
3111checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"3369checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
3112dependencies = [3370dependencies = [
3113 "android_system_properties",3371 "android_system_properties",
3114 "core-foundation-sys",3372 "core-foundation-sys 0.8.3",
3115 "iana-time-zone-haiku",3373 "iana-time-zone-haiku",
3116 "js-sys",3374 "js-sys",
3117 "wasm-bindgen",3375 "wasm-bindgen",
3118 "windows",3376 "windows 0.48.0",
3119]3377]
3120 3378
3121[[package]]3379[[package]]
@@ -3185,6 +3443,16 @@ dependencies = [ · 63 unmodified lines
3185 "serde",3443 "serde",
3186]3444]
3187 3445
3446[[package]]
3447name = "indexmap"
3448version = "2.0.0"
3449source = "registry+https://github.com/rust-lang/crates.io-index"
3450checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
3451dependencies = [
3452 "equivalent",
3453 "hashbrown 0.14.0",
3454]
3455
3188[[package]]3456[[package]]
3189name = "indoc"3457name = "indoc"
3190version = "1.0.9"3458version = "1.0.9"
@@ -3336,6 +3604,12 @@ dependencies = [ · 145 unmodified lines
3336 "either",3604 "either",
3337]3605]
3338 3606
3607[[package]]
3608name = "itoa"
3609version = "0.4.8"
3610source = "registry+https://github.com/rust-lang/crates.io-index"
3611checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
3612
3339[[package]]3613[[package]]
3340name = "itoa"3614name = "itoa"
3341version = "1.0.6"3615version = "1.0.6"
@@ -3351,6 +3625,40 @@ dependencies = [ · 9 unmodified lines
3351 "cc",3625 "cc",
3352]3626]
3353 3627
3628[[package]]
3629name = "jni"
3630version = "0.19.0"
3631source = "registry+https://github.com/rust-lang/crates.io-index"
3632checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
3633dependencies = [
3634 "cesu8",
3635 "combine",
3636 "jni-sys",
3637 "log",
3638 "thiserror",
3639 "walkdir",
3640]
3641
3642[[package]]
3643name = "jni"
3644version = "0.20.0"
3645source = "registry+https://github.com/rust-lang/crates.io-index"
3646checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
3647dependencies = [
3648 "cesu8",
3649 "combine",
3650 "jni-sys",
3651 "log",
3652 "thiserror",
3653 "walkdir",
3654]
3655
3656[[package]]
3657name = "jni-sys"
3658version = "0.3.0"
3659source = "registry+https://github.com/rust-lang/crates.io-index"
3660checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
3661
3354[[package]]3662[[package]]
3355name = "jobserver"3663name = "jobserver"
3356version = "0.1.26"3664version = "0.1.26"
@@ -3396,12 +3704,6 @@ dependencies = [ · 39 unmodified lines
3396 "wasm-bindgen",3704 "wasm-bindgen",
3397]3705]
3398 3706
3399[[package]]
3400name = "json_comments"
3401version = "0.2.1"
3402source = "registry+https://github.com/rust-lang/crates.io-index"
3403checksum = "41ee439ee368ba4a77ac70d04f14015415af8600d6c894dc1f11bd79758c57d5"
3404
3405[[package]]3707[[package]]
3406name = "jwt"3708name = "jwt"
3407version = "0.16.0"3709version = "0.16.0"
@@ -3559,6 +3861,17 @@ version = "0.2.5" · 151 unmodified lines
3559source = "registry+https://github.com/rust-lang/crates.io-index"3861source = "registry+https://github.com/rust-lang/crates.io-index"
3560checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"3862checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
3561 3863
3864[[package]]
3865name = "lewton"
3866version = "0.10.2"
3867source = "registry+https://github.com/rust-lang/crates.io-index"
3868checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
3869dependencies = [
3870 "byteorder",
3871 "ogg",
3872 "tinyvec",
3873]
3874
3562[[package]]3875[[package]]
3563name = "libc"3876name = "libc"
3564version = "0.2.144"3877version = "0.2.144"
@@ -3791,6 +4104,15 @@ dependencies = [ · 226 unmodified lines
3791 "libc",4104 "libc",
3792]4105]
3793 4106
4107[[package]]
4108name = "mach2"
4109version = "0.4.1"
4110source = "registry+https://github.com/rust-lang/crates.io-index"
4111checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
4112dependencies = [
4113 "libc",
4114]
4115
3794[[package]]4116[[package]]
3795name = "malloc_buf"4117name = "malloc_buf"
3796version = "0.0.6"4118version = "0.0.6"
@@ -3847,7 +4169,7 @@ name = "media" · 50 unmodified lines
3847version = "0.1.0"4169version = "0.1.0"
3848dependencies = [4170dependencies = [
3849 "anyhow",4171 "anyhow",
3850 "bindgen",4172 "bindgen 0.65.1",
3851 "block",4173 "block",
3852 "bytes 1.4.0",4174 "bytes 1.4.0",
3853 "core-foundation",4175 "core-foundation",
@@ -4105,6 +4427,35 @@ dependencies = [ · 251 unmodified lines
4105 "tempfile",4427 "tempfile",
4106]4428]
4107 4429
4430[[package]]
4431name = "ndk"
4432version = "0.7.0"
4433source = "registry+https://github.com/rust-lang/crates.io-index"
4434checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
4435dependencies = [
4436 "bitflags",
4437 "jni-sys",
4438 "ndk-sys",
4439 "num_enum",
4440 "raw-window-handle",
4441 "thiserror",
4442]
4443
4444[[package]]
4445name = "ndk-context"
4446version = "0.1.1"
4447source = "registry+https://github.com/rust-lang/crates.io-index"
4448checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
4449
4450[[package]]
4451name = "ndk-sys"
4452version = "0.4.1+23.1.7779620"
4453source = "registry+https://github.com/rust-lang/crates.io-index"
4454checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
4455dependencies = [
4456 "jni-sys",
4457]
4458
4108[[package]]4459[[package]]
4109name = "net2"4460name = "net2"
4110version = "0.2.38"4461version = "0.2.38"
@@ -4137,6 +4488,7 @@ dependencies = [ · 26 unmodified lines
4137 "async-tar",4488 "async-tar",
4138 "futures 0.3.28",4489 "futures 0.3.28",
4139 "gpui",4490 "gpui",
4491 "log",
4140 "parking_lot 0.11.2",4492 "parking_lot 0.11.2",
4141 "serde",4493 "serde",
4142 "serde_derive",4494 "serde_derive",
@@ -4212,6 +4564,17 @@ dependencies = [ · 69 unmodified lines
4212 "zeroize",4564 "zeroize",
4213]4565]
4214 4566
4567[[package]]
4568name = "num-derive"
4569version = "0.3.3"
4570source = "registry+https://github.com/rust-lang/crates.io-index"
4571checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
4572dependencies = [
4573 "proc-macro2",
4574 "quote",
4575 "syn 1.0.109",
4576]
4577
4215[[package]]4578[[package]]
4216name = "num-integer"4579name = "num-integer"
4217version = "0.1.45"4580version = "0.1.45"
@@ -4264,6 +4627,27 @@ dependencies = [ · 46 unmodified lines
4264 "libc",4627 "libc",
4265]4628]
4266 4629
4630[[package]]
4631name = "num_enum"
4632version = "0.5.11"
4633source = "registry+https://github.com/rust-lang/crates.io-index"
4634checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
4635dependencies = [
4636 "num_enum_derive",
4637]
4638
4639[[package]]
4640name = "num_enum_derive"
4641version = "0.5.11"
4642source = "registry+https://github.com/rust-lang/crates.io-index"
4643checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
4644dependencies = [
4645 "proc-macro-crate 1.3.1",
4646 "proc-macro2",
4647 "quote",
4648 "syn 1.0.109",
4649]
4650
4267[[package]]4651[[package]]
4268name = "nvim-rs"4652name = "nvim-rs"
4269version = "0.5.0"4653version = "0.5.0"
@@ -4306,7 +4690,7 @@ checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" · 36 unmodified lines
4306dependencies = [4690dependencies = [
4307 "crc32fast",4691 "crc32fast",
4308 "hashbrown 0.11.2",4692 "hashbrown 0.11.2",
4309 "indexmap",4693 "indexmap 1.9.3",
4310 "memchr",4694 "memchr",
4311]4695]
4312 4696
@@ -4319,6 +4703,38 @@ dependencies = [ · 6 unmodified lines
4319 "memchr",4703 "memchr",
4320]4704]
4321 4705
4706[[package]]
4707name = "oboe"
4708version = "0.5.0"
4709source = "registry+https://github.com/rust-lang/crates.io-index"
4710checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0"
4711dependencies = [
4712 "jni 0.20.0",
4713 "ndk",
4714 "ndk-context",
4715 "num-derive",
4716 "num-traits",
4717 "oboe-sys",
4718]
4719
4720[[package]]
4721name = "oboe-sys"
4722version = "0.5.0"
4723source = "registry+https://github.com/rust-lang/crates.io-index"
4724checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2"
4725dependencies = [
4726 "cc",
4727]
4728
4729[[package]]
4730name = "ogg"
4731version = "0.8.0"
4732source = "registry+https://github.com/rust-lang/crates.io-index"
4733checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
4734dependencies = [
4735 "byteorder",
4736]
4737
4322[[package]]4738[[package]]
4323name = "once_cell"4739name = "once_cell"
4324version = "1.17.1"4740version = "1.17.1"
@@ -4608,7 +5024,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" · 283 unmodified lines
4608checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"5024checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
4609dependencies = [5025dependencies = [
4610 "fixedbitset",5026 "fixedbitset",
4611 "indexmap",5027 "indexmap 1.9.3",
4612]5028]
4613 5029
4614[[package]]5030[[package]]
@@ -4685,7 +5101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" · 70 unmodified lines
4685checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590"5101checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590"
4686dependencies = [5102dependencies = [
4687 "base64 0.21.0",5103 "base64 0.21.0",
4688 "indexmap",5104 "indexmap 1.9.3",
4689 "line-wrap",5105 "line-wrap",
4690 "quick-xml",5106 "quick-xml",
4691 "serde",5107 "serde",
@@ -4818,6 +5234,16 @@ dependencies = [ · 126 unmodified lines
4818 "toml",5234 "toml",
4819]5235]
4820 5236
5237[[package]]
5238name = "proc-macro-crate"
5239version = "1.3.1"
5240source = "registry+https://github.com/rust-lang/crates.io-index"
5241checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
5242dependencies = [
5243 "once_cell",
5244 "toml_edit",
5245]
5246
4821[[package]]5247[[package]]
4822name = "proc-macro-error"5248name = "proc-macro-error"
4823version = "1.0.4"5249version = "1.0.4"
@@ -4930,6 +5356,7 @@ dependencies = [ · 106 unmodified lines
4930 "language",5356 "language",
4931 "menu",5357 "menu",
4932 "postage",5358 "postage",
5359 "pretty_assertions",
4933 "project",5360 "project",
4934 "schemars",5361 "schemars",
4935 "serde",5362 "serde",
@@ -5229,6 +5656,12 @@ dependencies = [ · 293 unmodified lines
5229 "rand_core 0.5.1",5656 "rand_core 0.5.1",
5230]5657]
5231 5658
5659[[package]]
5660name = "raw-window-handle"
5661version = "0.5.2"
5662source = "registry+https://github.com/rust-lang/crates.io-index"
5663checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
5664
5232[[package]]5665[[package]]
5233name = "rayon"5666name = "rayon"
5234version = "1.7.0"5667version = "1.7.0"
@@ -5272,6 +5705,7 @@ version = "0.1.0" · 37 unmodified lines
5272dependencies = [5705dependencies = [
5273 "db",5706 "db",
5274 "editor",5707 "editor",
5708 "futures 0.3.28",
5275 "fuzzy",5709 "fuzzy",
5276 "gpui",5710 "gpui",
5277 "language",5711 "language",
@@ -5512,6 +5946,19 @@ dependencies = [ · 234 unmodified lines
5512 "rmp",5946 "rmp",
5513]5947]
5514 5948
5949[[package]]
5950name = "rodio"
5951version = "0.17.1"
5952source = "registry+https://github.com/rust-lang/crates.io-index"
5953checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa"
5954dependencies = [
5955 "claxon",
5956 "cpal",
5957 "hound",
5958 "lewton",
5959 "symphonia",
5960]
5961
5515[[package]]5962[[package]]
5516name = "rope"5963name = "rope"
5517version = "0.1.0"5964version = "0.1.0"
@@ -5667,7 +6114,7 @@ dependencies = [ · 149 unmodified lines
5667 "bitflags",6114 "bitflags",
5668 "errno 0.2.8",6115 "errno 0.2.8",
5669 "io-lifetimes 0.5.3",6116 "io-lifetimes 0.5.3",
5670 "itoa",6117 "itoa 1.0.6",
5671 "libc",6118 "libc",
5672 "linux-raw-sys 0.0.42",6119 "linux-raw-sys 0.0.42",
5673 "once_cell",6120 "once_cell",
@@ -6013,7 +6460,7 @@ checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" · 339 unmodified lines
6013dependencies = [6460dependencies = [
6014 "bitflags",6461 "bitflags",
6015 "core-foundation",6462 "core-foundation",
6016 "core-foundation-sys",6463 "core-foundation-sys 0.8.3",
6017 "libc",6464 "libc",
6018 "security-framework-sys",6465 "security-framework-sys",
6019]6466]
@@ -6024,7 +6471,7 @@ version = "2.8.0" · 4 unmodified lines
6024source = "registry+https://github.com/rust-lang/crates.io-index"6471source = "registry+https://github.com/rust-lang/crates.io-index"
6025checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"6472checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
6026dependencies = [6473dependencies = [
6027 "core-foundation-sys",6474 "core-foundation-sys 0.8.3",
6028 "libc",6475 "libc",
6029]6476]
6030 6477
@@ -6098,8 +6545,20 @@ version = "1.0.96" · 67 unmodified lines
6098source = "registry+https://github.com/rust-lang/crates.io-index"6545source = "registry+https://github.com/rust-lang/crates.io-index"
6099checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"6546checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
6100dependencies = [6547dependencies = [
6101 "indexmap",6548 "indexmap 1.9.3",
6102 "itoa",6549 "itoa 1.0.6",
6550 "ryu",
6551 "serde",
6552]
6553
6554[[package]]
6555name = "serde_json_lenient"
6556version = "0.1.4"
6557source = "registry+https://github.com/rust-lang/crates.io-index"
6558checksum = "7d7b9ce5b0a63c6269b9623ed828b39259545a6ec0d8a35d6135ad6af6232add"
6559dependencies = [
6560 "indexmap 1.9.3",
6561 "itoa 0.4.8",
6103 "ryu",6562 "ryu",
6104 "serde",6563 "serde",
6105]6564]
@@ -6122,7 +6581,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" · 16 unmodified lines
6122checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"6581checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
6123dependencies = [6582dependencies = [
6124 "form_urlencoded",6583 "form_urlencoded",
6125 "itoa",6584 "itoa 1.0.6",
6126 "ryu",6585 "ryu",
6127 "serde",6586 "serde",
6128]6587]
@@ -6133,7 +6592,7 @@ version = "0.8.26" · 4 unmodified lines
6133source = "registry+https://github.com/rust-lang/crates.io-index"6592source = "registry+https://github.com/rust-lang/crates.io-index"
6134checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"6593checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
6135dependencies = [6594dependencies = [
6136 "indexmap",6595 "indexmap 1.9.3",
6137 "ryu",6596 "ryu",
6138 "serde",6597 "serde",
6139 "yaml-rust",6598 "yaml-rust",
@@ -6148,7 +6607,7 @@ dependencies = [ · 8 unmodified lines
6148 "fs",6607 "fs",
6149 "futures 0.3.28",6608 "futures 0.3.28",
6150 "gpui",6609 "gpui",
6151 "json_comments",6610 "indoc",
6152 "lazy_static",6611 "lazy_static",
6153 "postage",6612 "postage",
6154 "pretty_assertions",6613 "pretty_assertions",
@@ -6157,6 +6616,7 @@ dependencies = [ · 2 unmodified lines
6157 "serde",6616 "serde",
6158 "serde_derive",6617 "serde_derive",
6159 "serde_json",6618 "serde_json",
6619 "serde_json_lenient",
6160 "smallvec",6620 "smallvec",
6161 "sqlez",6621 "sqlez",
6162 "staff_mode",6622 "staff_mode",
@@ -6506,8 +6966,8 @@ dependencies = [ · 343 unmodified lines
6506 "hex",6966 "hex",
6507 "hkdf",6967 "hkdf",
6508 "hmac 0.12.1",6968 "hmac 0.12.1",
6509 "indexmap",6969 "indexmap 1.9.3",
6510 "itoa",6970 "itoa 1.0.6",
6511 "libc",6971 "libc",
6512 "libsqlite3-sys",6972 "libsqlite3-sys",
6513 "log",6973 "log",
@@ -6657,6 +7117,56 @@ dependencies = [ · 143 unmodified lines
6657 "siphasher",7117 "siphasher",
6658]7118]
6659 7119
7120[[package]]
7121name = "symphonia"
7122version = "0.5.3"
7123source = "registry+https://github.com/rust-lang/crates.io-index"
7124checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941"
7125dependencies = [
7126 "lazy_static",
7127 "symphonia-bundle-mp3",
7128 "symphonia-core",
7129 "symphonia-metadata",
7130]
7131
7132[[package]]
7133name = "symphonia-bundle-mp3"
7134version = "0.5.3"
7135source = "registry+https://github.com/rust-lang/crates.io-index"
7136checksum = "0f31d7fece546f1e6973011a9eceae948133bbd18fd3d52f6073b1e38ae6368a"
7137dependencies = [
7138 "bitflags",
7139 "lazy_static",
7140 "log",
7141 "symphonia-core",
7142 "symphonia-metadata",
7143]
7144
7145[[package]]
7146name = "symphonia-core"
7147version = "0.5.3"
7148source = "registry+https://github.com/rust-lang/crates.io-index"
7149checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142"
7150dependencies = [
7151 "arrayvec 0.7.2",
7152 "bitflags",
7153 "bytemuck",
7154 "lazy_static",
7155 "log",
7156]
7157
7158[[package]]
7159name = "symphonia-metadata"
7160version = "0.5.3"
7161source = "registry+https://github.com/rust-lang/crates.io-index"
7162checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0"
7163dependencies = [
7164 "encoding_rs",
7165 "lazy_static",
7166 "log",
7167 "symphonia-core",
7168]
7169
6660[[package]]7170[[package]]
6661name = "syn"7171name = "syn"
6662version = "1.0.109"7172version = "1.0.109"
@@ -6702,7 +7212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" · 39 unmodified lines
6702checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33"7212checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33"
6703dependencies = [7213dependencies = [
6704 "cfg-if 1.0.0",7214 "cfg-if 1.0.0",
6705 "core-foundation-sys",7215 "core-foundation-sys 0.8.3",
6706 "libc",7216 "libc",
6707 "ntapi 0.4.1",7217 "ntapi 0.4.1",
6708 "once_cell",7218 "once_cell",
@@ -6871,7 +7381,7 @@ dependencies = [ · 162 unmodified lines
6871 "anyhow",7381 "anyhow",
6872 "fs",7382 "fs",
6873 "gpui",7383 "gpui",
6874 "indexmap",7384 "indexmap 1.9.3",
6875 "parking_lot 0.11.2",7385 "parking_lot 0.11.2",
6876 "schemars",7386 "schemars",
6877 "serde",7387 "serde",
@@ -6902,18 +7412,6 @@ dependencies = [ · 24 unmodified lines
6902 "workspace",7412 "workspace",
6903]7413]
6904 7414
6905[[package]]
6906name = "theme_testbench"
6907version = "0.1.0"
6908dependencies = [
6909 "gpui",
6910 "project",
6911 "settings",
6912 "smallvec",
6913 "theme",
6914 "workspace",
6915]
6916
6917[[package]]7415[[package]]
6918name = "thiserror"7416name = "thiserror"
6919version = "1.0.40"7417version = "1.0.40"
@@ -6993,7 +7491,7 @@ version = "0.3.21" · 73 unmodified lines
6993source = "registry+https://github.com/rust-lang/crates.io-index"7491source = "registry+https://github.com/rust-lang/crates.io-index"
6994checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"7492checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
6995dependencies = [7493dependencies = [
6996 "itoa",7494 "itoa 1.0.6",
6997 "serde",7495 "serde",
6998 "time-core",7496 "time-core",
6999 "time-macros",7497 "time-macros",
@@ -7189,6 +7687,23 @@ dependencies = [ · 189 unmodified lines
7189 "serde",7687 "serde",
7190]7688]
7191 7689
7690[[package]]
7691name = "toml_datetime"
7692version = "0.6.3"
7693source = "registry+https://github.com/rust-lang/crates.io-index"
7694checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
7695
7696[[package]]
7697name = "toml_edit"
7698version = "0.19.11"
7699source = "registry+https://github.com/rust-lang/crates.io-index"
7700checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
7701dependencies = [
7702 "indexmap 2.0.0",
7703 "toml_datetime",
7704 "winnow",
7705]
7706
7192[[package]]7707[[package]]
7193name = "tonic"7708name = "tonic"
7194version = "0.6.2"7709version = "0.6.2"
@@ -7228,7 +7743,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" · 33 unmodified lines
7228dependencies = [7743dependencies = [
7229 "futures-core",7744 "futures-core",
7230 "futures-util",7745 "futures-util",
7231 "indexmap",7746 "indexmap 1.9.3",
7232 "pin-project",7747 "pin-project",
7233 "pin-project-lite 0.2.9",7748 "pin-project-lite 0.2.9",
7234 "rand 0.8.5",7749 "rand 0.8.5",
@@ -8085,7 +8600,7 @@ version = "0.85.0" · 850 unmodified lines
8085source = "registry+https://github.com/rust-lang/crates.io-index"8600source = "registry+https://github.com/rust-lang/crates.io-index"
8086checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7"8601checksum = "570460c58b21e9150d2df0eaaedbb7816c34bcec009ae0dcc976e40ba81463e7"
8087dependencies = [8602dependencies = [
8088 "indexmap",8603 "indexmap 1.9.3",
8089]8604]
8090 8605
8091[[package]]8606[[package]]
@@ -8099,7 +8614,7 @@ dependencies = [ · 7 unmodified lines
8099 "backtrace",8614 "backtrace",
8100 "bincode",8615 "bincode",
8101 "cfg-if 1.0.0",8616 "cfg-if 1.0.0",
8102 "indexmap",8617 "indexmap 1.9.3",
8103 "lazy_static",8618 "lazy_static",
8104 "libc",8619 "libc",
8105 "log",8620 "log",
@@ -8173,7 +8688,7 @@ dependencies = [ · 67 unmodified lines
8173 "anyhow",8688 "anyhow",
8174 "cranelift-entity",8689 "cranelift-entity",
8175 "gimli 0.26.2",8690 "gimli 0.26.2",
8176 "indexmap",8691 "indexmap 1.9.3",
8177 "log",8692 "log",
8178 "more-asserts",8693 "more-asserts",
8179 "object 0.28.4",8694 "object 0.28.4",
@@ -8243,7 +8758,7 @@ dependencies = [ · 63 unmodified lines
8243 "backtrace",8758 "backtrace",
8244 "cc",8759 "cc",
8245 "cfg-if 1.0.0",8760 "cfg-if 1.0.0",
8246 "indexmap",8761 "indexmap 1.9.3",
8247 "libc",8762 "libc",
8248 "log",8763 "log",
8249 "mach",8764 "mach",
@@ -8499,6 +9014,15 @@ version = "0.4.0" · 249 unmodified lines
8499source = "registry+https://github.com/rust-lang/crates.io-index"9014source = "registry+https://github.com/rust-lang/crates.io-index"
8500checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"9015checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
8501 9016
9017[[package]]
9018name = "windows"
9019version = "0.46.0"
9020source = "registry+https://github.com/rust-lang/crates.io-index"
9021checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25"
9022dependencies = [
9023 "windows-targets 0.42.2",
9024]
9025
8502[[package]]9026[[package]]
8503name = "windows"9027name = "windows"
8504version = "0.48.0"9028version = "0.48.0"
@@ -8655,6 +9179,15 @@ version = "0.48.0" · 150 unmodified lines
8655source = "registry+https://github.com/rust-lang/crates.io-index"9179source = "registry+https://github.com/rust-lang/crates.io-index"
8656checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"9180checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
8657 9181
9182[[package]]
9183name = "winnow"
9184version = "0.4.7"
9185source = "registry+https://github.com/rust-lang/crates.io-index"
9186checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
9187dependencies = [
9188 "memchr",
9189]
9190
8658[[package]]9191[[package]]
8659name = "winreg"9192name = "winreg"
8660version = "0.10.1"9193version = "0.10.1"
@@ -8766,6 +9299,17 @@ version = "0.1.0" · 105 unmodified lines
8766source = "registry+https://github.com/rust-lang/crates.io-index"9299source = "registry+https://github.com/rust-lang/crates.io-index"
8767checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"9300checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
8768 9301
9302[[package]]
9303name = "xtask"
9304version = "0.1.0"
9305dependencies = [
9306 "anyhow",
9307 "clap 4.3.5",
9308 "schemars",
9309 "serde_json",
9310 "theme",
9311]
9312
8769[[package]]9313[[package]]
8770name = "yaml-rust"9314name = "yaml-rust"
8771version = "0.4.5"9315version = "0.4.5"
@@ -8795,7 +9339,7 @@ dependencies = [ · 23 unmodified lines
8795 9339
8796[[package]]9340[[package]]
8797name = "zed"9341name = "zed"
8798version = "0.92.0"9342version = "0.95.0"
8799dependencies = [9343dependencies = [
8800 "activity_indicator",9344 "activity_indicator",
8801 "ai",9345 "ai",
@@ -8804,6 +9348,7 @@ dependencies = [ · 2 unmodified lines
8804 "async-recursion 0.3.2",9348 "async-recursion 0.3.2",
8805 "async-tar",9349 "async-tar",
8806 "async-trait",9350 "async-trait",
9351 "audio",
8807 "auto_update",9352 "auto_update",
8808 "backtrace",9353 "backtrace",
8809 "breadcrumbs",9354 "breadcrumbs",
@@ -8833,7 +9378,7 @@ dependencies = [ · 23 unmodified lines
8833 "gpui",9378 "gpui",
8834 "ignore",9379 "ignore",
8835 "image",9380 "image",
8836 "indexmap",9381 "indexmap 1.9.3",
8837 "install_cli",9382 "install_cli",
8838 "isahc",9383 "isahc",
8839 "journal",9384 "journal",
@@ -8874,7 +9419,6 @@ dependencies = [ · 34 unmodified lines
8874 "text",9419 "text",
8875 "theme",9420 "theme",
8876 "theme_selector",9421 "theme_selector",
8877 "theme_testbench",
8878 "thiserror",9422 "thiserror",
8879 "tiny_http",9423 "tiny_http",
8880 "toml",9424 "toml",
@@ -8906,6 +9450,14 @@ dependencies = [ · 25 unmodified lines
8906 "vim",9450 "vim",
8907 "welcome",9451 "welcome",
8908 "workspace",9452 "workspace",
9453 "zed-actions",
9454]
9455
9456[[package]]
9457name = "zed-actions"
9458version = "0.1.0"
9459dependencies = [
9460 "gpui",
8909]9461]
8910 9462
8911[[package]]9463[[package]]
Cargo.toml+5−1
@@ -2,6 +2,7 @@ · 1 unmodified line
2members = [2members = [
3 "crates/activity_indicator",3 "crates/activity_indicator",
4 "crates/ai",4 "crates/ai",
5 "crates/audio",
5 "crates/auto_update",6 "crates/auto_update",
6 "crates/breadcrumbs",7 "crates/breadcrumbs",
7 "crates/call",8 "crates/call",
@@ -61,12 +62,13 @@ members = [ · 53 unmodified lines
61 "crates/text",62 "crates/text",
62 "crates/theme",63 "crates/theme",
63 "crates/theme_selector",64 "crates/theme_selector",
64 "crates/theme_testbench",
65 "crates/util",65 "crates/util",
66 "crates/vim",66 "crates/vim",
67 "crates/workspace",67 "crates/workspace",
68 "crates/welcome",68 "crates/welcome",
69 "crates/xtask",
69 "crates/zed",70 "crates/zed",
71 "crates/zed-actions"
70]72]
71default-members = ["crates/zed"]73default-members = ["crates/zed"]
72resolver = "2"74resolver = "2"
@@ -100,6 +102,7 @@ time = { version = "0.3", features = ["serde", "serde-well-known"] } · 27 unmodified lines
100toml = { version = "0.5" }102toml = { version = "0.5" }
101tree-sitter = "0.20"103tree-sitter = "0.20"
102unindent = { version = "0.1.7" }104unindent = { version = "0.1.7" }
105pretty_assertions = "1.3.0"
103 106
104[patch.crates-io]107[patch.crates-io]
105tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "49226023693107fba9a1191136a4f47f38cdca73" }108tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "49226023693107fba9a1191136a4f47f38cdca73" }
@@ -118,3 +121,4 @@ split-debuginfo = "unpacked" · 12 unmodified lines
118[profile.release]121[profile.release]
119debug = true122debug = true
120lto = "thin"123lto = "thin"
124codegen-units = 1
assets/icons/assist_15.svg+1−0
@@ -0,0 +1 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M13.9 0.499976C13.9 0.279062 13.7209 0.0999756 13.5 0.0999756C13.2791 0.0999756 13.1 0.279062 13.1 0.499976V1.09998H12.5C12.2791 1.09998 12.1 1.27906 12.1 1.49998C12.1 1.72089 12.2791 1.89998 12.5 1.89998H13.1V2.49998C13.1 2.72089 13.2791 2.89998 13.5 2.89998C13.7209 2.89998 13.9 2.72089 13.9 2.49998V1.89998H14.5C14.7209 1.89998 14.9 1.72089 14.9 1.49998C14.9 1.27906 14.7209 1.09998 14.5 1.09998H13.9V0.499976ZM11.8536 3.14642C12.0488 3.34168 12.0488 3.65826 11.8536 3.85353L10.8536 4.85353C10.6583 5.04879 10.3417 5.04879 10.1465 4.85353C9.9512 4.65827 9.9512 4.34169 10.1465 4.14642L11.1464 3.14643C11.3417 2.95116 11.6583 2.95116 11.8536 3.14642ZM9.85357 5.14642C10.0488 5.34168 10.0488 5.65827 9.85357 5.85353L2.85355 12.8535C2.65829 13.0488 2.34171 13.0488 2.14645 12.8535C1.95118 12.6583 1.95118 12.3417 2.14645 12.1464L9.14646 5.14642C9.34172 4.95116 9.65831 4.95116 9.85357 5.14642ZM13.5 5.09998C13.7209 5.09998 13.9 5.27906 13.9 5.49998V6.09998H14.5C14.7209 6.09998 14.9 6.27906 14.9 6.49998C14.9 6.72089 14.7209 6.89998 14.5 6.89998H13.9V7.49998C13.9 7.72089 13.7209 7.89998 13.5 7.89998C13.2791 7.89998 13.1 7.72089 13.1 7.49998V6.89998H12.5C12.2791 6.89998 12.1 6.72089 12.1 6.49998C12.1 6.27906 12.2791 6.09998 12.5 6.09998H13.1V5.49998C13.1 5.27906 13.2791 5.09998 13.5 5.09998ZM8.90002 0.499976C8.90002 0.279062 8.72093 0.0999756 8.50002 0.0999756C8.2791 0.0999756 8.10002 0.279062 8.10002 0.499976V1.09998H7.50002C7.2791 1.09998 7.10002 1.27906 7.10002 1.49998C7.10002 1.72089 7.2791 1.89998 7.50002 1.89998H8.10002V2.49998C8.10002 2.72089 8.2791 2.89998 8.50002 2.89998C8.72093 2.89998 8.90002 2.72089 8.90002 2.49998V1.89998H9.50002C9.72093 1.89998 9.90002 1.72089 9.90002 1.49998C9.90002 1.27906 9.72093 1.09998 9.50002 1.09998H8.90002V0.499976Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
assets/icons/hamburger_15.svg+3−0
@@ -0,0 +1,3 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2<path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 3C1.22386 3 1 3.22386 1 3.5C1 3.77614 1.22386 4 1.5 4H13.5C13.7761 4 14 3.77614 14 3.5C14 3.22386 13.7761 3 13.5 3H1.5ZM1 7.5C1 7.22386 1.22386 7 1.5 7H13.5C13.7761 7 14 7.22386 14 7.5C14 7.77614 13.7761 8 13.5 8H1.5C1.22386 8 1 7.77614 1 7.5ZM1 11.5C1 11.2239 1.22386 11 1.5 11H13.5C13.7761 11 14 11.2239 14 11.5C14 11.7761 13.7761 12 13.5 12H1.5C1.22386 12 1 11.7761 1 11.5Z" fill="#CCCAC2"/>
3</svg>
assets/icons/quote_15.svg+1−0
@@ -0,0 +1 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M9.42503 3.44136C10.0561 3.23654 10.7837 3.2402 11.3792 3.54623C12.7532 4.25224 13.3477 6.07191 12.7946 8C12.5465 8.8649 12.1102 9.70472 11.1861 10.5524C10.262 11.4 8.98034 11.9 8.38571 11.9C8.17269 11.9 8 11.7321 8 11.525C8 11.3179 8.17644 11.15 8.38571 11.15C9.06497 11.15 9.67189 10.7804 10.3906 10.236C10.9406 9.8193 11.3701 9.28633 11.608 8.82191C12.0628 7.93367 12.0782 6.68174 11.3433 6.34901C10.9904 6.73455 10.5295 6.95946 9.97725 6.95946C8.7773 6.95946 8.0701 5.99412 8.10051 5.12009C8.12957 4.28474 8.66032 3.68954 9.42503 3.44136ZM3.42503 3.44136C4.05614 3.23654 4.78366 3.2402 5.37923 3.54623C6.7532 4.25224 7.34766 6.07191 6.79462 8C6.54654 8.8649 6.11019 9.70472 5.1861 10.5524C4.26201 11.4 2.98034 11.9 2.38571 11.9C2.17269 11.9 2 11.7321 2 11.525C2 11.3179 2.17644 11.15 2.38571 11.15C3.06497 11.15 3.67189 10.7804 4.39058 10.236C4.94065 9.8193 5.37014 9.28633 5.60797 8.82191C6.06282 7.93367 6.07821 6.68174 5.3433 6.34901C4.99037 6.73455 4.52948 6.95946 3.97725 6.95946C2.7773 6.95946 2.0701 5.99412 2.10051 5.12009C2.12957 4.28474 2.66032 3.68954 3.42503 3.44136Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
assets/icons/radix/accessibility.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.877197 7.49984C0.877197 3.84216 3.84234 0.877014 7.50003 0.877014C11.1577 0.877014 14.1229 3.84216 14.1229 7.49984C14.1229 11.1575 11.1577 14.1227 7.50003 14.1227C3.84234 14.1227 0.877197 11.1575 0.877197 7.49984ZM7.50003 1.82701C4.36702 1.82701 1.8272 4.36683 1.8272 7.49984C1.8272 10.6328 4.36702 13.1727 7.50003 13.1727C10.633 13.1727 13.1729 10.6328 13.1729 7.49984C13.1729 4.36683 10.633 1.82701 7.50003 1.82701ZM7.12457 9.00001C7.06994 9.12735 6.33165 11.9592 6.33165 11.9592C6.26018 12.226 5.98601 12.3843 5.71928 12.3128C5.45255 12.2413 5.29425 11.9672 5.36573 11.7004C5.36573 11.7004 6.24661 8.87268 6.24661 8.27007V6.80099L4.28763 6.27608C4.0209 6.20461 3.86261 5.93045 3.93408 5.66371C4.00555 5.39698 4.27972 5.23869 4.54645 5.31016C4.54645 5.31016 6.20042 5.87268 6.84579 5.87268H8.15505C8.80042 5.87268 10.4534 5.31042 10.4534 5.31042C10.7202 5.23895 10.9943 5.39724 11.0658 5.66397C11.1373 5.93071 10.979 6.20487 10.7122 6.27635L8.74661 6.80303V8.27007C8.74661 8.87268 9.62663 11.6971 9.62663 11.6971C9.6981 11.9639 9.5398 12.238 9.27307 12.3095C9.00634 12.381 8.73217 12.2227 8.6607 11.956C8.6607 11.956 7.91994 9.12735 7.86866 9.00001C7.81994 8.87268 7.65006 8.87268 7.65006 8.87268H7.34317C7.34317 8.87268 7.16994 8.87268 7.12457 9.00001ZM7.50043 5.12007C8.12175 5.12007 8.62543 4.61639 8.62543 3.99507C8.62543 3.37375 8.12175 2.87007 7.50043 2.87007C6.87911 2.87007 6.37543 3.37375 6.37543 3.99507C6.37543 4.61639 6.87911 5.12007 7.50043 5.12007Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/activity-log.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0 1.5C0 1.22386 0.223858 1 0.5 1H2.5C2.77614 1 3 1.22386 3 1.5C3 1.77614 2.77614 2 2.5 2H0.5C0.223858 2 0 1.77614 0 1.5ZM4 1.5C4 1.22386 4.22386 1 4.5 1H14.5C14.7761 1 15 1.22386 15 1.5C15 1.77614 14.7761 2 14.5 2H4.5C4.22386 2 4 1.77614 4 1.5ZM4 4.5C4 4.22386 4.22386 4 4.5 4H11.5C11.7761 4 12 4.22386 12 4.5C12 4.77614 11.7761 5 11.5 5H4.5C4.22386 5 4 4.77614 4 4.5ZM0 7.5C0 7.22386 0.223858 7 0.5 7H2.5C2.77614 7 3 7.22386 3 7.5C3 7.77614 2.77614 8 2.5 8H0.5C0.223858 8 0 7.77614 0 7.5ZM4 7.5C4 7.22386 4.22386 7 4.5 7H14.5C14.7761 7 15 7.22386 15 7.5C15 7.77614 14.7761 8 14.5 8H4.5C4.22386 8 4 7.77614 4 7.5ZM4 10.5C4 10.2239 4.22386 10 4.5 10H11.5C11.7761 10 12 10.2239 12 10.5C12 10.7761 11.7761 11 11.5 11H4.5C4.22386 11 4 10.7761 4 10.5ZM0 13.5C0 13.2239 0.223858 13 0.5 13H2.5C2.77614 13 3 13.2239 3 13.5C3 13.7761 2.77614 14 2.5 14H0.5C0.223858 14 0 13.7761 0 13.5ZM4 13.5C4 13.2239 4.22386 13 4.5 13H14.5C14.7761 13 15 13.2239 15 13.5C15 13.7761 14.7761 14 14.5 14H4.5C4.22386 14 4 13.7761 4 13.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-baseline.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M10.5 1.75003C10.7107 1.75003 10.8988 1.88217 10.9703 2.08042L13.9703 10.4C14.064 10.6598 13.9293 10.9463 13.6696 11.04C13.4098 11.1336 13.1233 10.999 13.0296 10.7392L12.0477 8.01606H8.95227L7.97031 10.7392C7.87664 10.999 7.59012 11.1336 7.33035 11.04C7.07058 10.9463 6.93593 10.6598 7.0296 10.4L10.0296 2.08042C10.1011 1.88217 10.2892 1.75003 10.5 1.75003ZM10.5 3.72402L11.7411 7.16606H9.25877L10.5 3.72402ZM2.49949 2.09997C2.7204 2.09997 2.89949 2.27906 2.89949 2.49997L2.89949 9.53428L4.21664 8.21713C4.37285 8.06092 4.62612 8.06092 4.78233 8.21713C4.93854 8.37334 4.93854 8.6266 4.78233 8.78281L2.78233 10.7828C2.70732 10.8578 2.60557 10.9 2.49949 10.9C2.3934 10.9 2.29166 10.8578 2.21664 10.7828L0.216645 8.78281C0.0604349 8.6266 0.0604349 8.37334 0.216645 8.21713C0.372854 8.06092 0.62612 8.06092 0.78233 8.21713L2.09949 9.53428L2.09949 2.49997C2.09949 2.27906 2.27857 2.09997 2.49949 2.09997ZM0.0999695 13.5001C0.0999695 13.2791 0.279056 13.1001 0.499969 13.1001H14.5C14.7209 13.1001 14.9 13.2791 14.9 13.5001C14.9 13.721 14.7209 13.9001 14.5 13.9001H0.499969C0.279056 13.9001 0.0999695 13.721 0.0999695 13.5001Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-bottom.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9 3C9 2.44772 8.55229 2 8 2H7C6.44772 2 6 2.44772 6 3L6 14H1.5C1.22386 14 1 14.2239 1 14.5C1 14.7761 1.22386 15 1.5 15L6 15H9H13.5C13.7761 15 14 14.7761 14 14.5C14 14.2239 13.7761 14 13.5 14H9V3Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-center-horizontally.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.99988 6C1.44759 6 0.999877 6.44772 0.999877 7L0.999877 8C0.999877 8.55228 1.44759 9 1.99988 9L6.99988 9L6.99988 13.5C6.99988 13.7761 7.22374 14 7.49988 14C7.77602 14 7.99988 13.7761 7.99988 13.5L7.99988 9L12.9999 9C13.5522 9 13.9999 8.55228 13.9999 8L13.9999 7C13.9999 6.44772 13.5522 6 12.9999 6L7.99988 6L7.99988 1.5C7.99988 1.22386 7.77602 1 7.49988 1C7.22373 1 6.99988 1.22386 6.99988 1.5L6.99988 6L1.99988 6Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-center-vertically.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.99988 1C6.44759 1 5.99988 1.44772 5.99988 2V7H1.49988C1.22374 7 0.999878 7.22386 0.999878 7.5C0.999878 7.77614 1.22374 8 1.49988 8H5.99988V13C5.99988 13.5523 6.44759 14 6.99988 14H7.99988C8.55216 14 8.99988 13.5523 8.99988 13V8H13.4999C13.776 8 13.9999 7.77614 13.9999 7.5C13.9999 7.22386 13.776 7 13.4999 7H8.99988V2C8.99988 1.44772 8.55216 1 7.99988 1L6.99988 1Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-center.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6 7.05002V4H9V7.05002L6 7.05002ZM5 7.05002H1.49919C1.25067 7.05002 1.04919 7.25149 1.04919 7.50002C1.04919 7.74855 1.25067 7.95002 1.49919 7.95002H5V11.25C5 11.6642 5.33579 12 5.75 12H9.25C9.66421 12 10 11.6642 10 11.25V7.95002H13.4992C13.7477 7.95002 13.9492 7.74855 13.9492 7.50002C13.9492 7.2515 13.7477 7.05002 13.4992 7.05002H10V3.75C10 3.33579 9.66421 3 9.25 3H5.75C5.33579 3 5 3.33579 5 3.75V7.05002ZM9 7.95002V11H6V7.95002L9 7.95002Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-end.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6 11V4H9V11H6ZM5 3.75C5 3.33579 5.33579 3 5.75 3H9.25C9.66421 3 10 3.33579 10 3.75V11.25C10 11.6642 9.66421 12 9.25 12H5.75C5.33579 12 5 11.6642 5 11.25V3.75ZM1.49919 13.05C1.25067 13.05 1.04919 13.2515 1.04919 13.5C1.04919 13.7486 1.25067 13.95 1.49919 13.95L13.4992 13.95C13.7477 13.95 13.9492 13.7486 13.9492 13.5C13.9492 13.2515 13.7477 13.05 13.4992 13.05H1.49919Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-horizontal-centers.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.24988 2C2.55952 2 1.99988 2.55964 1.99988 3.25V11.75C1.99988 12.4404 2.55952 13 3.24988 13H5.74988C6.44023 13 6.99988 12.4404 6.99988 11.75V3.25C6.99988 2.55964 6.44023 2 5.74988 2H3.24988ZM2.99988 3.25C2.99988 3.11193 3.11181 3 3.24988 3H5.74988C5.88795 3 5.99988 3.11193 5.99988 3.25V11.75C5.99988 11.8881 5.88795 12 5.74988 12H3.24988C3.11181 12 2.99988 11.8881 2.99988 11.75V3.25ZM9.25 4C8.55964 4 8 4.55964 8 5.25V9.75C8 10.4404 8.55964 11 9.25 11H11.75C12.4404 11 13 10.4404 13 9.75V5.25C13 4.55964 12.4404 4 11.75 4H9.25Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.499995 0.999995C0.223855 0.999995 -5.58458e-07 1.22385 -5.46388e-07 1.49999L-2.18554e-08 13.4999C-9.78492e-09 13.776 0.223855 13.9999 0.499995 13.9999C0.776136 13.9999 0.999991 13.776 0.999991 13.4999L0.999991 8.99993L12 8.99993C12.5523 8.99993 13 8.55222 13 7.99993L13 6.99994C13 6.44766 12.5523 5.99995 12 5.99995L0.999991 5.99995L0.999991 1.49999C0.999991 1.22385 0.776135 0.999995 0.499995 0.999995Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M14.4999 1C14.2237 1 13.9999 1.22386 13.9999 1.5L13.9999 6L2.99988 6C2.44759 6 1.99988 6.44772 1.99988 7L1.99988 8C1.99988 8.55228 2.44759 9 2.99988 9L13.9999 9L13.9999 13.5C13.9999 13.7761 14.2237 14 14.4999 14C14.776 14 14.9999 13.7761 14.9999 13.5L14.9999 9L14.9999 6L14.9999 1.5C14.9999 1.22386 14.776 1 14.4999 1Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-start.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.49956 1.05002C1.25103 1.05002 1.04956 1.25149 1.04956 1.50002C1.04956 1.74855 1.25103 1.95002 1.49956 1.95002L13.4996 1.95002C13.7481 1.95002 13.9496 1.74855 13.9496 1.50002C13.9496 1.25149 13.7481 1.05002 13.4996 1.05002H1.49956ZM6 11V3.99999H9V11H6ZM5 3.74999C5 3.33578 5.33579 2.99999 5.75 2.99999H9.25C9.66421 2.99999 10 3.33578 10 3.74999V11.25C10 11.6642 9.66421 12 9.25 12H5.75C5.33579 12 5 11.6642 5 11.25V3.74999Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-stretch.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.04956 1.50002C1.04956 1.25149 1.25103 1.05002 1.49956 1.05002H13.4996C13.7481 1.05002 13.9496 1.25149 13.9496 1.50002C13.9496 1.74855 13.7481 1.95002 13.4996 1.95002L1.49956 1.95002C1.25103 1.95002 1.04956 1.74855 1.04956 1.50002ZM1.04966 13.5C1.04966 13.2515 1.25113 13.05 1.49966 13.05H13.4997C13.7482 13.05 13.9497 13.2515 13.9497 13.5C13.9497 13.7485 13.7482 13.95 13.4997 13.95L1.49966 13.95C1.25113 13.95 1.04966 13.7485 1.04966 13.5ZM6 11V3.99999H9V11H6ZM5 3.74999C5 3.33578 5.33579 2.99999 5.75 2.99999H9.25C9.66421 2.99999 10 3.33578 10 3.74999V11.25C10 11.6642 9.66421 12 9.25 12H5.75C5.33579 12 5 11.6642 5 11.25V3.74999Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-top.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.5 0C1.22386 0 1 0.223858 1 0.5C1 0.776142 1.22386 1 1.5 1H6V12C6 12.5523 6.44772 13 7 13H8C8.55228 13 9 12.5523 9 12V1H13.5C13.7761 1 14 0.776142 14 0.5C14 0.223858 13.7761 0 13.5 0H9H6H1.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/align-vertical-centers.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 3.25C2 2.55964 2.55964 2 3.25 2L11.75 2C12.4404 2 13 2.55964 13 3.25L13 5.75C13 6.44036 12.4404 7 11.75 7L3.25 7C2.55964 7 2 6.44036 2 5.75L2 3.25ZM3.25 3C3.11193 3 3 3.11193 3 3.25L3 5.75C3 5.88807 3.11193 6 3.25 6L11.75 6C11.8881 6 12 5.88807 12 5.75L12 3.25C12 3.11193 11.8881 3 11.75 3L3.25 3ZM4 9.25C4 8.55964 4.55964 8 5.25 8L9.75 8C10.4404 8 11 8.55964 11 9.25L11 11.75C11 12.4404 10.4404 13 9.75 13L5.25 13C4.55964 13 4 12.4404 4 11.75L4 9.25Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/all-sides.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 0.75L9.75 3H5.25L7.5 0.75ZM7.5 14.25L9.75 12H5.25L7.5 14.25ZM3 5.25L0.75 7.5L3 9.75V5.25ZM14.25 7.5L12 5.25V9.75L14.25 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/angle.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.8914 2.1937C9.1158 2.35464 9.16725 2.66701 9.00631 2.89141L2.47388 12H13.5C13.7761 12 14 12.2239 14 12.5C14 12.7762 13.7761 13 13.5 13H1.5C1.31254 13 1.14082 12.8952 1.0552 12.7284C0.969578 12.5616 0.984438 12.361 1.09369 12.2086L8.19369 2.30862C8.35462 2.08422 8.667 2.03277 8.8914 2.1937ZM11.1 6.50001C11.1 6.22387 11.3238 6.00001 11.6 6.00001C11.8761 6.00001 12.1 6.22387 12.1 6.50001C12.1 6.77615 11.8761 7.00001 11.6 7.00001C11.3238 7.00001 11.1 6.77615 11.1 6.50001ZM10.4 4.00001C10.1239 4.00001 9.90003 4.22387 9.90003 4.50001C9.90003 4.77615 10.1239 5.00001 10.4 5.00001C10.6762 5.00001 10.9 4.77615 10.9 4.50001C10.9 4.22387 10.6762 4.00001 10.4 4.00001ZM12.1 8.50001C12.1 8.22387 12.3238 8.00001 12.6 8.00001C12.8761 8.00001 13.1 8.22387 13.1 8.50001C13.1 8.77615 12.8761 9.00001 12.6 9.00001C12.3238 9.00001 12.1 8.77615 12.1 8.50001ZM13.4 10C13.1239 10 12.9 10.2239 12.9 10.5C12.9 10.7761 13.1239 11 13.4 11C13.6762 11 13.9 10.7761 13.9 10.5C13.9 10.2239 13.6762 10 13.4 10Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/archive.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.30902 1C2.93025 1 2.58398 1.214 2.41459 1.55279L1.05279 4.27639C1.01807 4.34582 1 4.42238 1 4.5V13C1 13.5523 1.44772 14 2 14H13C13.5523 14 14 13.5523 14 13V4.5C14 4.42238 13.9819 4.34582 13.9472 4.27639L12.5854 1.55281C12.416 1.21403 12.0698 1.00003 11.691 1.00003L7.5 1.00001L3.30902 1ZM3.30902 2L7 2.00001V4H2.30902L3.30902 2ZM8 4V2.00002L11.691 2.00003L12.691 4H8ZM7.5 5H13V13H2V5H7.5ZM5.5 7C5.22386 7 5 7.22386 5 7.5C5 7.77614 5.22386 8 5.5 8H9.5C9.77614 8 10 7.77614 10 7.5C10 7.22386 9.77614 7 9.5 7H5.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/arrow-bottom-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11.3536 3.64644C11.5488 3.8417 11.5488 4.15828 11.3536 4.35354L4.70711 11L9 11C9.27614 11 9.5 11.2239 9.5 11.5C9.5 11.7761 9.27614 12 9 12L3.5 12C3.36739 12 3.24021 11.9473 3.14645 11.8536C3.05268 11.7598 3 11.6326 3 11.5L3 5.99999C3 5.72385 3.22386 5.49999 3.5 5.49999C3.77614 5.49999 4 5.72385 4 5.99999V10.2929L10.6464 3.64643C10.8417 3.45117 11.1583 3.45117 11.3536 3.64644Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/arrow-bottom-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.64645 3.64644C3.45118 3.8417 3.45118 4.15828 3.64645 4.35354L10.2929 11L6 11C5.72386 11 5.5 11.2239 5.5 11.5C5.5 11.7761 5.72386 12 6 12L11.5 12C11.6326 12 11.7598 11.9473 11.8536 11.8536C11.9473 11.7598 12 11.6326 12 11.5L12 5.99999C12 5.72385 11.7761 5.49999 11.5 5.49999C11.2239 5.49999 11 5.72385 11 5.99999V10.2929L4.35355 3.64643C4.15829 3.45117 3.84171 3.45117 3.64645 3.64644Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/arrow-down.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 2C7.77614 2 8 2.22386 8 2.5L8 11.2929L11.1464 8.14645C11.3417 7.95118 11.6583 7.95118 11.8536 8.14645C12.0488 8.34171 12.0488 8.65829 11.8536 8.85355L7.85355 12.8536C7.75979 12.9473 7.63261 13 7.5 13C7.36739 13 7.24021 12.9473 7.14645 12.8536L3.14645 8.85355C2.95118 8.65829 2.95118 8.34171 3.14645 8.14645C3.34171 7.95118 3.65829 7.95118 3.85355 8.14645L7 11.2929L7 2.5C7 2.22386 7.22386 2 7.5 2Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/arrow-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.85355 3.14645C7.04882 3.34171 7.04882 3.65829 6.85355 3.85355L3.70711 7H12.5C12.7761 7 13 7.22386 13 7.5C13 7.77614 12.7761 8 12.5 8H3.70711L6.85355 11.1464C7.04882 11.3417 7.04882 11.6583 6.85355 11.8536C6.65829 12.0488 6.34171 12.0488 6.14645 11.8536L2.14645 7.85355C1.95118 7.65829 1.95118 7.34171 2.14645 7.14645L6.14645 3.14645C6.34171 2.95118 6.65829 2.95118 6.85355 3.14645Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/arrow-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.14645 3.14645C8.34171 2.95118 8.65829 2.95118 8.85355 3.14645L12.8536 7.14645C13.0488 7.34171 13.0488 7.65829 12.8536 7.85355L8.85355 11.8536C8.65829 12.0488 8.34171 12.0488 8.14645 11.8536C7.95118 11.6583 7.95118 11.3417 8.14645 11.1464L11.2929 8H2.5C2.22386 8 2 7.77614 2 7.5C2 7.22386 2.22386 7 2.5 7H11.2929L8.14645 3.85355C7.95118 3.65829 7.95118 3.34171 8.14645 3.14645Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/arrow-top-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11.3536 11.3536C11.5488 11.1583 11.5488 10.8417 11.3536 10.6465L4.70711 4L9 4C9.27614 4 9.5 3.77614 9.5 3.5C9.5 3.22386 9.27614 3 9 3L3.5 3C3.36739 3 3.24021 3.05268 3.14645 3.14645C3.05268 3.24022 3 3.36739 3 3.5L3 9.00001C3 9.27615 3.22386 9.50001 3.5 9.50001C3.77614 9.50001 4 9.27615 4 9.00001V4.70711L10.6464 11.3536C10.8417 11.5488 11.1583 11.5488 11.3536 11.3536Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/arrow-top-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.64645 11.3536C3.45118 11.1583 3.45118 10.8417 3.64645 10.6465L10.2929 4L6 4C5.72386 4 5.5 3.77614 5.5 3.5C5.5 3.22386 5.72386 3 6 3L11.5 3C11.6326 3 11.7598 3.05268 11.8536 3.14645C11.9473 3.24022 12 3.36739 12 3.5L12 9.00001C12 9.27615 11.7761 9.50001 11.5 9.50001C11.2239 9.50001 11 9.27615 11 9.00001V4.70711L4.35355 11.3536C4.15829 11.5488 3.84171 11.5488 3.64645 11.3536Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/arrow-up.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.14645 2.14645C7.34171 1.95118 7.65829 1.95118 7.85355 2.14645L11.8536 6.14645C12.0488 6.34171 12.0488 6.65829 11.8536 6.85355C11.6583 7.04882 11.3417 7.04882 11.1464 6.85355L8 3.70711L8 12.5C8 12.7761 7.77614 13 7.5 13C7.22386 13 7 12.7761 7 12.5L7 3.70711L3.85355 6.85355C3.65829 7.04882 3.34171 7.04882 3.14645 6.85355C2.95118 6.65829 2.95118 6.34171 3.14645 6.14645L7.14645 2.14645Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/aspect-ratio.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.5 2H12.5C12.7761 2 13 2.22386 13 2.5V12.5C13 12.7761 12.7761 13 12.5 13H2.5C2.22386 13 2 12.7761 2 12.5V2.5C2 2.22386 2.22386 2 2.5 2ZM1 2.5C1 1.67157 1.67157 1 2.5 1H12.5C13.3284 1 14 1.67157 14 2.5V12.5C14 13.3284 13.3284 14 12.5 14H2.5C1.67157 14 1 13.3284 1 12.5V2.5ZM7.5 4C7.77614 4 8 3.77614 8 3.5C8 3.22386 7.77614 3 7.5 3C7.22386 3 7 3.22386 7 3.5C7 3.77614 7.22386 4 7.5 4ZM8 5.5C8 5.77614 7.77614 6 7.5 6C7.22386 6 7 5.77614 7 5.5C7 5.22386 7.22386 5 7.5 5C7.77614 5 8 5.22386 8 5.5ZM7.5 8C7.77614 8 8 7.77614 8 7.5C8 7.22386 7.77614 7 7.5 7C7.22386 7 7 7.22386 7 7.5C7 7.77614 7.22386 8 7.5 8ZM10 7.5C10 7.77614 9.77614 8 9.5 8C9.22386 8 9 7.77614 9 7.5C9 7.22386 9.22386 7 9.5 7C9.77614 7 10 7.22386 10 7.5ZM11.5 8C11.7761 8 12 7.77614 12 7.5C12 7.22386 11.7761 7 11.5 7C11.2239 7 11 7.22386 11 7.5C11 7.77614 11.2239 8 11.5 8Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/avatar.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.877014 7.49988C0.877014 3.84219 3.84216 0.877045 7.49985 0.877045C11.1575 0.877045 14.1227 3.84219 14.1227 7.49988C14.1227 11.1575 11.1575 14.1227 7.49985 14.1227C3.84216 14.1227 0.877014 11.1575 0.877014 7.49988ZM7.49985 1.82704C4.36683 1.82704 1.82701 4.36686 1.82701 7.49988C1.82701 8.97196 2.38774 10.3131 3.30727 11.3213C4.19074 9.94119 5.73818 9.02499 7.50023 9.02499C9.26206 9.02499 10.8093 9.94097 11.6929 11.3208C12.6121 10.3127 13.1727 8.97172 13.1727 7.49988C13.1727 4.36686 10.6328 1.82704 7.49985 1.82704ZM10.9818 11.9787C10.2839 10.7795 8.9857 9.97499 7.50023 9.97499C6.01458 9.97499 4.71624 10.7797 4.01845 11.9791C4.97952 12.7272 6.18765 13.1727 7.49985 13.1727C8.81227 13.1727 10.0206 12.727 10.9818 11.9787ZM5.14999 6.50487C5.14999 5.207 6.20212 4.15487 7.49999 4.15487C8.79786 4.15487 9.84999 5.207 9.84999 6.50487C9.84999 7.80274 8.79786 8.85487 7.49999 8.85487C6.20212 8.85487 5.14999 7.80274 5.14999 6.50487ZM7.49999 5.10487C6.72679 5.10487 6.09999 5.73167 6.09999 6.50487C6.09999 7.27807 6.72679 7.90487 7.49999 7.90487C8.27319 7.90487 8.89999 7.27807 8.89999 6.50487C8.89999 5.73167 8.27319 5.10487 7.49999 5.10487Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/backpack.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5 1C5 0.447715 5.44772 0 6 0H9C9.55228 0 10 0.447715 10 1V2H14C14.5523 2 15 2.44772 15 3V6C15 6.8888 14.6131 7.68734 14 8.23608V11.5C14 12.3284 13.3284 13 12.5 13H2.5C1.67157 13 1 12.3284 1 11.5V8.2359C0.38697 7.68721 0 6.88883 0 6V3C0 2.44772 0.447716 2 1 2H5V1ZM9 1V2H6V1H9ZM1 3H5H5.5H9.5H10H14V6C14 6.654 13.6866 7.23467 13.1997 7.6004C12.8655 7.85144 12.4508 8 12 8H8V7.5C8 7.22386 7.77614 7 7.5 7C7.22386 7 7 7.22386 7 7.5V8H3C2.5493 8 2.1346 7.85133 1.80029 7.60022C1.31335 7.23446 1 6.65396 1 6V3ZM7 9H3C2.64961 9 2.31292 8.93972 2 8.82905V11.5C2 11.7761 2.22386 12 2.5 12H12.5C12.7761 12 13 11.7761 13 11.5V8.82915C12.6871 8.93978 12.3504 9 12 9H8V9.5C8 9.77614 7.77614 10 7.5 10C7.22386 10 7 9.77614 7 9.5V9Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/badge.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.5 6H11.5C12.3284 6 13 6.67157 13 7.5C13 8.32843 12.3284 9 11.5 9H3.5C2.67157 9 2 8.32843 2 7.5C2 6.67157 2.67157 6 3.5 6ZM1 7.5C1 6.11929 2.11929 5 3.5 5H11.5C12.8807 5 14 6.11929 14 7.5C14 8.88071 12.8807 10 11.5 10H3.5C2.11929 10 1 8.88071 1 7.5ZM4.5 7C4.22386 7 4 7.22386 4 7.5C4 7.77614 4.22386 8 4.5 8H10.5C10.7761 8 11 7.77614 11 7.5C11 7.22386 10.7761 7 10.5 7H4.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/bar-chart.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11.5 1C11.7761 1 12 1.22386 12 1.5V13.5C12 13.7761 11.7761 14 11.5 14C11.2239 14 11 13.7761 11 13.5V1.5C11 1.22386 11.2239 1 11.5 1ZM9.5 3C9.77614 3 10 3.22386 10 3.5V13.5C10 13.7761 9.77614 14 9.5 14C9.22386 14 9 13.7761 9 13.5V3.5C9 3.22386 9.22386 3 9.5 3ZM13.5 3C13.7761 3 14 3.22386 14 3.5V13.5C14 13.7761 13.7761 14 13.5 14C13.2239 14 13 13.7761 13 13.5V3.5C13 3.22386 13.2239 3 13.5 3ZM5.5 4C5.77614 4 6 4.22386 6 4.5V13.5C6 13.7761 5.77614 14 5.5 14C5.22386 14 5 13.7761 5 13.5V4.5C5 4.22386 5.22386 4 5.5 4ZM1.5 5C1.77614 5 2 5.22386 2 5.5V13.5C2 13.7761 1.77614 14 1.5 14C1.22386 14 1 13.7761 1 13.5V5.5C1 5.22386 1.22386 5 1.5 5ZM7.5 5C7.77614 5 8 5.22386 8 5.5V13.5C8 13.7761 7.77614 14 7.5 14C7.22386 14 7 13.7761 7 13.5V5.5C7 5.22386 7.22386 5 7.5 5ZM3.5 7C3.77614 7 4 7.22386 4 7.5V13.5C4 13.7761 3.77614 14 3.5 14C3.22386 14 3 13.7761 3 13.5V7.5C3 7.22386 3.22386 7 3.5 7Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/bell.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.60124 1.25086C8.60124 1.75459 8.26278 2.17927 7.80087 2.30989C10.1459 2.4647 12 4.41582 12 6.79999V10.25C12 11.0563 12.0329 11.7074 12.7236 12.0528C12.931 12.1565 13.0399 12.3892 12.9866 12.6149C12.9333 12.8406 12.7319 13 12.5 13H8.16144C8.36904 13.1832 8.49997 13.4513 8.49997 13.75C8.49997 14.3023 8.05226 14.75 7.49997 14.75C6.94769 14.75 6.49997 14.3023 6.49997 13.75C6.49997 13.4513 6.63091 13.1832 6.83851 13H2.49999C2.2681 13 2.06664 12.8406 2.01336 12.6149C1.96009 12.3892 2.06897 12.1565 2.27638 12.0528C2.96708 11.7074 2.99999 11.0563 2.99999 10.25V6.79999C2.99999 4.41537 4.85481 2.46396 7.20042 2.3098C6.73867 2.17908 6.40036 1.75448 6.40036 1.25086C6.40036 0.643104 6.89304 0.150421 7.5008 0.150421C8.10855 0.150421 8.60124 0.643104 8.60124 1.25086ZM7.49999 3.29999C5.56699 3.29999 3.99999 4.86699 3.99999 6.79999V10.25L4.00002 10.3009C4.0005 10.7463 4.00121 11.4084 3.69929 12H11.3007C10.9988 11.4084 10.9995 10.7463 11 10.3009L11 10.25V6.79999C11 4.86699 9.43299 3.29999 7.49999 3.29999Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/blending-mode.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3 9C3 6.5 4.5 4.25 7.5 1.5C10.5 4.25 12 6.5 12 9C12 11.4853 9.98528 13.5 7.5 13.5C5.01472 13.5 3 11.4853 3 9ZM10.9524 8.30307C9.67347 7.82121 8.2879 8.46208 6.98956 9.06259C5.9327 9.55142 4.93365 10.0135 4.09695 9.82153C4.03357 9.55804 4 9.28294 4 9C4 7.11203 5.02686 5.27195 7.5 2.87357C9.66837 4.97639 10.725 6.65004 10.9524 8.30307Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/bookmark-filled.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.5 2C3.22386 2 3 2.22386 3 2.5V13.5C3 13.6818 3.09864 13.8492 3.25762 13.9373C3.41659 14.0254 3.61087 14.0203 3.765 13.924L7.5 11.5896L11.235 13.924C11.3891 14.0203 11.5834 14.0254 11.7424 13.9373C11.9014 13.8492 12 13.6818 12 13.5V2.5C12 2.22386 11.7761 2 11.5 2H3.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/bookmark.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3 2.5C3 2.22386 3.22386 2 3.5 2H11.5C11.7761 2 12 2.22386 12 2.5V13.5C12 13.6818 11.9014 13.8492 11.7424 13.9373C11.5834 14.0254 11.3891 14.0203 11.235 13.924L7.5 11.5896L3.765 13.924C3.61087 14.0203 3.41659 14.0254 3.25762 13.9373C3.09864 13.8492 3 13.6818 3 13.5V2.5ZM4 3V12.5979L6.97 10.7416C7.29427 10.539 7.70573 10.539 8.03 10.7416L11 12.5979V3H4Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/border-all.svg+17−0
@@ -0,0 +1,17 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.25 1C0.25 0.585786 0.585786 0.25 1 0.25H14C14.4142 0.25 14.75 0.585786 14.75 1V14C14.75 14.4142 14.4142 14.75 14 14.75H1C0.585786 14.75 0.25 14.4142 0.25 14V1ZM1.75 1.75V13.25H13.25V1.75H1.75Z"
6 fill="currentColor"
7 />
8 <rect x="7" y="5" width="1" height="1" rx=".5" fill="currentColor" />
9 <rect x="7" y="3" width="1" height="1" rx=".5" fill="currentColor" />
10 <rect x="7" y="7" width="1" height="1" rx=".5" fill="currentColor" />
11 <rect x="5" y="7" width="1" height="1" rx=".5" fill="currentColor" />
12 <rect x="3" y="7" width="1" height="1" rx=".5" fill="currentColor" />
13 <rect x="9" y="7" width="1" height="1" rx=".5" fill="currentColor" />
14 <rect x="11" y="7" width="1" height="1" rx=".5" fill="currentColor" />
15 <rect x="7" y="9" width="1" height="1" rx=".5" fill="currentColor" />
16 <rect x="7" y="11" width="1" height="1" rx=".5" fill="currentColor" />
17</svg>
assets/icons/radix/border-bottom.svg+29−0
@@ -0,0 +1,29 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path fill-rule="evenodd" clip-rule="evenodd" d="M1 13.25L14 13.25V14.75L1 14.75V13.25Z" fill="currentColor" />
3 <rect x="7" y="5" width="1" height="1" rx=".5" fill="currentColor" />
4 <rect x="13" y="5" width="1" height="1" rx=".5" fill="currentColor" />
5 <rect x="7" y="3" width="1" height="1" rx=".5" fill="currentColor" />
6 <rect x="13" y="3" width="1" height="1" rx=".5" fill="currentColor" />
7 <rect x="7" y="7" width="1" height="1" rx=".5" fill="currentColor" />
8 <rect x="7" y="1" width="1" height="1" rx=".5" fill="currentColor" />
9 <rect x="13" y="7" width="1" height="1" rx=".5" fill="currentColor" />
10 <rect x="13" y="1" width="1" height="1" rx=".5" fill="currentColor" />
11 <rect x="5" y="7" width="1" height="1" rx=".5" fill="currentColor" />
12 <rect x="5" y="1" width="1" height="1" rx=".5" fill="currentColor" />
13 <rect x="3" y="7" width="1" height="1" rx=".5" fill="currentColor" />
14 <rect x="3" y="1" width="1" height="1" rx=".5" fill="currentColor" />
15 <rect x="9" y="7" width="1" height="1" rx=".5" fill="currentColor" />
16 <rect x="9" y="1" width="1" height="1" rx=".5" fill="currentColor" />
17 <rect x="11" y="7" width="1" height="1" rx=".5" fill="currentColor" />
18 <rect x="11" y="1" width="1" height="1" rx=".5" fill="currentColor" />
19 <rect x="7" y="9" width="1" height="1" rx=".5" fill="currentColor" />
20 <rect x="13" y="9" width="1" height="1" rx=".5" fill="currentColor" />
21 <rect x="7" y="11" width="1" height="1" rx=".5" fill="currentColor" />
22 <rect x="13" y="11" width="1" height="1" rx=".5" fill="currentColor" />
23 <rect x="1" y="5" width="1" height="1" rx=".5" fill="currentColor" />
24 <rect x="1" y="3" width="1" height="1" rx=".5" fill="currentColor" />
25 <rect x="1" y="7" width="1" height="1" rx=".5" fill="currentColor" />
26 <rect x="1" y="1" width="1" height="1" rx=".5" fill="currentColor" />
27 <rect x="1" y="9" width="1" height="1" rx=".5" fill="currentColor" />
28 <rect x="1" y="11" width="1" height="1" rx=".5" fill="currentColor" />
29</svg>
assets/icons/radix/border-dashed.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0 7.5C0 7.22386 0.223858 7 0.5 7H3C3.27614 7 3.5 7.22386 3.5 7.5C3.5 7.77614 3.27614 8 3 8H0.5C0.223858 8 0 7.77614 0 7.5ZM5.75 7.5C5.75 7.22386 5.97386 7 6.25 7H8.75C9.02614 7 9.25 7.22386 9.25 7.5C9.25 7.77614 9.02614 8 8.75 8H6.25C5.97386 8 5.75 7.77614 5.75 7.5ZM12 7C11.7239 7 11.5 7.22386 11.5 7.5C11.5 7.77614 11.7239 8 12 8H14.5C14.7761 8 15 7.77614 15 7.5C15 7.22386 14.7761 7 14.5 7H12Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/border-dotted.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.5 6.625C1.01675 6.625 0.625 7.01675 0.625 7.5C0.625 7.98325 1.01675 8.375 1.5 8.375C1.98325 8.375 2.375 7.98325 2.375 7.5C2.375 7.01675 1.98325 6.625 1.5 6.625ZM5.5 6.625C5.01675 6.625 4.625 7.01675 4.625 7.5C4.625 7.98325 5.01675 8.375 5.5 8.375C5.98325 8.375 6.375 7.98325 6.375 7.5C6.375 7.01675 5.98325 6.625 5.5 6.625ZM9.5 6.625C9.01675 6.625 8.625 7.01675 8.625 7.5C8.625 7.98325 9.01675 8.375 9.5 8.375C9.98325 8.375 10.375 7.98325 10.375 7.5C10.375 7.01675 9.98325 6.625 9.5 6.625ZM12.625 7.5C12.625 7.01675 13.0168 6.625 13.5 6.625C13.9832 6.625 14.375 7.01675 14.375 7.5C14.375 7.98325 13.9832 8.375 13.5 8.375C13.0168 8.375 12.625 7.98325 12.625 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/border-left.svg+29−0
@@ -0,0 +1,29 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path fill-rule="evenodd" clip-rule="evenodd" d="M1.75 1L1.75 14L0.249999 14L0.25 1L1.75 1Z" fill="currentColor" />
3 <rect x="10" y="7" width="1" height="1" rx=".5" transform="rotate(90 10 7)" fill="currentColor" />
4 <rect x="10" y="13" width="1" height="1" rx=".5" transform="rotate(90 10 13)" fill="currentColor" />
5 <rect x="12" y="7" width="1" height="1" rx=".5" transform="rotate(90 12 7)" fill="currentColor" />
6 <rect x="12" y="13" width="1" height="1" rx=".5" transform="rotate(90 12 13)" fill="currentColor" />
7 <rect x="8" y="7" width="1" height="1" rx=".5" transform="rotate(90 8 7)" fill="currentColor" />
8 <rect x="14" y="7" width="1" height="1" rx=".5" transform="rotate(90 14 7)" fill="currentColor" />
9 <rect x="8" y="13" width="1" height="1" rx=".5" transform="rotate(90 8 13)" fill="currentColor" />
10 <rect x="14" y="13" width="1" height="1" rx=".5" transform="rotate(90 14 13)" fill="currentColor" />
11 <rect x="8" y="5" width="1" height="1" rx=".5" transform="rotate(90 8 5)" fill="currentColor" />
12 <rect x="14" y="5" width="1" height="1" rx=".5" transform="rotate(90 14 5)" fill="currentColor" />
13 <rect x="8" y="3" width="1" height="1" rx=".5" transform="rotate(90 8 3)" fill="currentColor" />
14 <rect x="14" y="3" width="1" height="1" rx=".5" transform="rotate(90 14 3)" fill="currentColor" />
15 <rect x="8" y="9" width="1" height="1" rx=".5" transform="rotate(90 8 9)" fill="currentColor" />
16 <rect x="14" y="9" width="1" height="1" rx=".5" transform="rotate(90 14 9)" fill="currentColor" />
17 <rect x="8" y="11" width="1" height="1" rx=".5" transform="rotate(90 8 11)" fill="currentColor" />
18 <rect x="14" y="11" width="1" height="1" rx=".5" transform="rotate(90 14 11)" fill="currentColor" />
19 <rect x="6" y="7" width="1" height="1" rx=".5" transform="rotate(90 6 7)" fill="currentColor" />
20 <rect x="6" y="13" width="1" height="1" rx=".5" transform="rotate(90 6 13)" fill="currentColor" />
21 <rect x="4" y="7" width="1" height="1" rx=".5" transform="rotate(90 4 7)" fill="currentColor" />
22 <rect x="4" y="13" width="1" height="1" rx=".5" transform="rotate(90 4 13)" fill="currentColor" />
23 <rect x="10" y="1" width="1" height="1" rx=".5" transform="rotate(90 10 1)" fill="currentColor" />
24 <rect x="12" y="1" width="1" height="1" rx=".5" transform="rotate(90 12 1)" fill="currentColor" />
25 <rect x="8" y="1" width="1" height="1" rx=".5" transform="rotate(90 8 1)" fill="currentColor" />
26 <rect x="14" y="1" width="1" height="1" rx=".5" transform="rotate(90 14 1)" fill="currentColor" />
27 <rect x="6" y="1" width="1" height="1" rx=".5" transform="rotate(90 6 1)" fill="currentColor" />
28 <rect x="4" y="1" width="1" height="1" rx=".5" transform="rotate(90 4 1)" fill="currentColor" />
29</svg>
assets/icons/radix/border-none.svg+35−0
@@ -0,0 +1,35 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <rect x="7" y="5.025" width="1" height="1" rx=".5" fill="currentColor" />
3 <rect x="13" y="5.025" width="1" height="1" rx=".5" fill="currentColor" />
4 <rect x="7" y="3.025" width="1" height="1" rx=".5" fill="currentColor" />
5 <rect x="13" y="3.025" width="1" height="1" rx=".5" fill="currentColor" />
6 <rect x="7" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
7 <rect x="7" y="13.025" width="1" height="1" rx=".5" fill="currentColor" />
8 <rect x="7" y="1.025" width="1" height="1" rx=".5" fill="currentColor" />
9 <rect x="13" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
10 <rect x="13" y="13.025" width="1" height="1" rx=".5" fill="currentColor" />
11 <rect x="13" y="1.025" width="1" height="1" rx=".5" fill="currentColor" />
12 <rect x="5" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
13 <rect x="5" y="13.025" width="1" height="1" rx=".5" fill="currentColor" />
14 <rect x="5" y="1.025" width="1" height="1" rx=".5" fill="currentColor" />
15 <rect x="3" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
16 <rect x="3" y="13.025" width="1" height="1" rx=".5" fill="currentColor" />
17 <rect x="3" y="1.025" width="1" height="1" rx=".5" fill="currentColor" />
18 <rect x="9" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
19 <rect x="9" y="13.025" width="1" height="1" rx=".5" fill="currentColor" />
20 <rect x="9" y="1.025" width="1" height="1" rx=".5" fill="currentColor" />
21 <rect x="11" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
22 <rect x="11" y="13.025" width="1" height="1" rx=".5" fill="currentColor" />
23 <rect x="11" y="1.025" width="1" height="1" rx=".5" fill="currentColor" />
24 <rect x="7" y="9.025" width="1" height="1" rx=".5" fill="currentColor" />
25 <rect x="13" y="9.025" width="1" height="1" rx=".5" fill="currentColor" />
26 <rect x="7" y="11.025" width="1" height="1" rx=".5" fill="currentColor" />
27 <rect x="13" y="11.025" width="1" height="1" rx=".5" fill="currentColor" />
28 <rect x="1" y="5.025" width="1" height="1" rx=".5" fill="currentColor" />
29 <rect x="1" y="3.025" width="1" height="1" rx=".5" fill="currentColor" />
30 <rect x="1" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
31 <rect x="1" y="13.025" width="1" height="1" rx=".5" fill="currentColor" />
32 <rect x="1" y="1.025" width="1" height="1" rx=".5" fill="currentColor" />
33 <rect x="1" y="9.025" width="1" height="1" rx=".5" fill="currentColor" />
34 <rect x="1" y="11.025" width="1" height="1" rx=".5" fill="currentColor" />
35</svg>
assets/icons/radix/border-right.svg+29−0
@@ -0,0 +1,29 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path fill-rule="evenodd" clip-rule="evenodd" d="M13.25 1L13.25 14L14.75 14L14.75 1L13.25 1Z" fill="currentColor" />
3 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 5 7)" fill="currentColor" />
4 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 5 13)" fill="currentColor" />
5 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 3 7)" fill="currentColor" />
6 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 3 13)" fill="currentColor" />
7 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 7 7)" fill="currentColor" />
8 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 1 7)" fill="currentColor" />
9 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 7 13)" fill="currentColor" />
10 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 1 13)" fill="currentColor" />
11 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 7 5)" fill="currentColor" />
12 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 1 5)" fill="currentColor" />
13 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 7 3)" fill="currentColor" />
14 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 1 3)" fill="currentColor" />
15 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 7 9)" fill="currentColor" />
16 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 1 9)" fill="currentColor" />
17 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 7 11)" fill="currentColor" />
18 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 1 11)" fill="currentColor" />
19 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 9 7)" fill="currentColor" />
20 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 9 13)" fill="currentColor" />
21 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 11 7)" fill="currentColor" />
22 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 11 13)" fill="currentColor" />
23 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 5 1)" fill="currentColor" />
24 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 3 1)" fill="currentColor" />
25 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 7 1)" fill="currentColor" />
26 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 1 1)" fill="currentColor" />
27 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 9 1)" fill="currentColor" />
28 <rect width="1" height="1" rx=".5" transform="matrix(0 1 1 0 11 1)" fill="currentColor" />
29</svg>
assets/icons/radix/border-solid.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.25 7.5C1.25 7.22386 1.47386 7 1.75 7H13.25C13.5261 7 13.75 7.22386 13.75 7.5C13.75 7.77614 13.5261 8 13.25 8H1.75C1.47386 8 1.25 7.77614 1.25 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/border-split.svg+21−0
@@ -0,0 +1,21 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <rect x="7" y="5.025" width="1" height="1" rx=".5" fill="currentColor" />
3 <rect x="7" y="3.025" width="1" height="1" rx=".5" fill="currentColor" />
4 <rect x="7" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
5 <rect x="7" y="13.025" width="1" height="1" rx=".5" fill="currentColor" />
6 <rect x="7" y="1.025" width="1" height="1" rx=".5" fill="currentColor" />
7 <rect x="13" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
8 <rect x="5" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
9 <rect x="3" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
10 <rect x="9" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
11 <rect x="11" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
12 <rect x="7" y="9.025" width="1" height="1" rx=".5" fill="currentColor" />
13 <rect x="7" y="11.025" width="1" height="1" rx=".5" fill="currentColor" />
14 <rect x="1" y="7.025" width="1" height="1" rx=".5" fill="currentColor" />
15 <path
16 fill-rule="evenodd"
17 clip-rule="evenodd"
18 d="M1 1.49994C1 1.2238 1.22386 0.999939 1.5 0.999939H6V1.99994H2V5.99994H1V1.49994ZM13 1.99994H9V0.999939H13.5C13.7761 0.999939 14 1.2238 14 1.49994V5.99994H13V1.99994ZM1 13.4999V8.99994H2V12.9999H6V13.9999H1.5C1.22386 13.9999 1 13.7761 1 13.4999ZM13 12.9999V8.99994H14V13.4999C14 13.7761 13.7761 13.9999 13.5 13.9999H9.5V12.9999H13Z"
19 fill="currentColor"
20 />
21</svg>
assets/icons/radix/border-style.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.5 3C1.22386 3 1 3.22386 1 3.5C1 3.77614 1.22386 4 1.5 4H13.5C13.7761 4 14 3.77614 14 3.5C14 3.22386 13.7761 3 13.5 3H1.5ZM1 7.5C1 7.22386 1.22386 7 1.5 7H3.5C3.77614 7 4 7.22386 4 7.5C4 7.77614 3.77614 8 3.5 8H1.5C1.22386 8 1 7.77614 1 7.5ZM1 11.5C1 11.2239 1.22386 11 1.5 11C1.77614 11 2 11.2239 2 11.5C2 11.7761 1.77614 12 1.5 12C1.22386 12 1 11.7761 1 11.5ZM3 11.5C3 11.2239 3.22386 11 3.5 11C3.77614 11 4 11.2239 4 11.5C4 11.7761 3.77614 12 3.5 12C3.22386 12 3 11.7761 3 11.5ZM5.5 11C5.22386 11 5 11.2239 5 11.5C5 11.7761 5.22386 12 5.5 12C5.77614 12 6 11.7761 6 11.5C6 11.2239 5.77614 11 5.5 11ZM7 11.5C7 11.2239 7.22386 11 7.5 11C7.77614 11 8 11.2239 8 11.5C8 11.7761 7.77614 12 7.5 12C7.22386 12 7 11.7761 7 11.5ZM9.5 11C9.22386 11 9 11.2239 9 11.5C9 11.7761 9.22386 12 9.5 12C9.77614 12 10 11.7761 10 11.5C10 11.2239 9.77614 11 9.5 11ZM11 11.5C11 11.2239 11.2239 11 11.5 11C11.7761 11 12 11.2239 12 11.5C12 11.7761 11.7761 12 11.5 12C11.2239 12 11 11.7761 11 11.5ZM13.5 11C13.2239 11 13 11.2239 13 11.5C13 11.7761 13.2239 12 13.5 12C13.7761 12 14 11.7761 14 11.5C14 11.2239 13.7761 11 13.5 11ZM6.5 7C6.22386 7 6 7.22386 6 7.5C6 7.77614 6.22386 8 6.5 8H8.5C8.77614 8 9 7.77614 9 7.5C9 7.22386 8.77614 7 8.5 7H6.5ZM11 7.5C11 7.22386 11.2239 7 11.5 7H13.5C13.7761 7 14 7.22386 14 7.5C14 7.77614 13.7761 8 13.5 8H11.5C11.2239 8 11 7.77614 11 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/border-top.svg+29−0
@@ -0,0 +1,29 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path fill-rule="evenodd" clip-rule="evenodd" d="M14 1.75L1 1.75L1 0.249999L14 0.25L14 1.75Z" fill="currentColor" />
3 <rect x="8" y="10" width="1" height="1" rx=".5" transform="rotate(-180 8 10)" fill="currentColor" />
4 <rect x="2" y="10" width="1" height="1" rx=".5" transform="rotate(-180 2 10)" fill="currentColor" />
5 <rect x="8" y="12" width="1" height="1" rx=".5" transform="rotate(-180 8 12)" fill="currentColor" />
6 <rect x="2" y="12" width="1" height="1" rx=".5" transform="rotate(-180 2 12)" fill="currentColor" />
7 <rect x="8" y="8" width="1" height="1" rx=".5" transform="rotate(-180 8 8)" fill="currentColor" />
8 <rect x="8" y="14" width="1" height="1" rx=".5" transform="rotate(-180 8 14)" fill="currentColor" />
9 <rect x="2" y="8" width="1" height="1" rx=".5" transform="rotate(-180 2 8)" fill="currentColor" />
10 <rect x="2" y="14" width="1" height="1" rx=".5" transform="rotate(-180 2 14)" fill="currentColor" />
11 <rect x="10" y="8" width="1" height="1" rx=".5" transform="rotate(-180 10 8)" fill="currentColor" />
12 <rect x="10" y="14" width="1" height="1" rx=".5" transform="rotate(-180 10 14)" fill="currentColor" />
13 <rect x="12" y="8" width="1" height="1" rx=".5" transform="rotate(-180 12 8)" fill="currentColor" />
14 <rect x="12" y="14" width="1" height="1" rx=".5" transform="rotate(-180 12 14)" fill="currentColor" />
15 <rect x="6" y="8" width="1" height="1" rx=".5" transform="rotate(-180 6 8)" fill="currentColor" />
16 <rect x="6" y="14" width="1" height="1" rx=".5" transform="rotate(-180 6 14)" fill="currentColor" />
17 <rect x="4" y="8" width="1" height="1" rx=".5" transform="rotate(-180 4 8)" fill="currentColor" />
18 <rect x="4" y="14" width="1" height="1" rx=".5" transform="rotate(-180 4 14)" fill="currentColor" />
19 <rect x="8" y="6" width="1" height="1" rx=".5" transform="rotate(-180 8 6)" fill="currentColor" />
20 <rect x="2" y="6" width="1" height="1" rx=".5" transform="rotate(-180 2 6)" fill="currentColor" />
21 <rect x="8" y="4" width="1" height="1" rx=".5" transform="rotate(-180 8 4)" fill="currentColor" />
22 <rect x="2" y="4" width="1" height="1" rx=".5" transform="rotate(-180 2 4)" fill="currentColor" />
23 <rect x="14" y="10" width="1" height="1" rx=".5" transform="rotate(-180 14 10)" fill="currentColor" />
24 <rect x="14" y="12" width="1" height="1" rx=".5" transform="rotate(-180 14 12)" fill="currentColor" />
25 <rect x="14" y="8" width="1" height="1" rx=".5" transform="rotate(-180 14 8)" fill="currentColor" />
26 <rect x="14" y="14" width="1" height="1" rx=".5" transform="rotate(-180 14 14)" fill="currentColor" />
27 <rect x="14" y="6" width="1" height="1" rx=".5" transform="rotate(-180 14 6)" fill="currentColor" />
28 <rect x="14" y="4" width="1" height="1" rx=".5" transform="rotate(-180 14 4)" fill="currentColor" />
29</svg>
assets/icons/radix/border-width.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1 3H14V4H1V3ZM1 6H14V8H1V6ZM14 10.25H1V12.75H14V10.25Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/box-model.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.99998 0.999976C1.44769 0.999976 0.999976 1.44769 0.999976 1.99998V13C0.999976 13.5523 1.44769 14 1.99998 14H13C13.5523 14 14 13.5523 14 13V1.99998C14 1.44769 13.5523 0.999976 13 0.999976H1.99998ZM1.99998 1.99998L13 1.99998V13H1.99998V1.99998ZM4.49996 3.99996C4.22382 3.99996 3.99996 4.22382 3.99996 4.49996V10.5C3.99996 10.7761 4.22382 11 4.49996 11H10.5C10.7761 11 11 10.7761 11 10.5V4.49996C11 4.22382 10.7761 3.99996 10.5 3.99996H4.49996ZM4.99996 9.99996V4.99996H9.99996V9.99996H4.99996Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/box.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.5 2H2.5C2.22386 2 2 2.22386 2 2.5V12.5C2 12.7761 2.22386 13 2.5 13H12.5C12.7761 13 13 12.7761 13 12.5V2.5C13 2.22386 12.7761 2 12.5 2ZM2.5 1C1.67157 1 1 1.67157 1 2.5V12.5C1 13.3284 1.67157 14 2.5 14H12.5C13.3284 14 14 13.3284 14 12.5V2.5C14 1.67157 13.3284 1 12.5 1H2.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/button.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 5H13C13.5523 5 14 5.44772 14 6V9C14 9.55228 13.5523 10 13 10H2C1.44772 10 1 9.55228 1 9V6C1 5.44772 1.44772 5 2 5ZM0 6C0 4.89543 0.895431 4 2 4H13C14.1046 4 15 4.89543 15 6V9C15 10.1046 14.1046 11 13 11H2C0.89543 11 0 10.1046 0 9V6ZM4.5 6.75C4.08579 6.75 3.75 7.08579 3.75 7.5C3.75 7.91421 4.08579 8.25 4.5 8.25C4.91421 8.25 5.25 7.91421 5.25 7.5C5.25 7.08579 4.91421 6.75 4.5 6.75ZM6.75 7.5C6.75 7.08579 7.08579 6.75 7.5 6.75C7.91421 6.75 8.25 7.08579 8.25 7.5C8.25 7.91421 7.91421 8.25 7.5 8.25C7.08579 8.25 6.75 7.91421 6.75 7.5ZM10.5 6.75C10.0858 6.75 9.75 7.08579 9.75 7.5C9.75 7.91421 10.0858 8.25 10.5 8.25C10.9142 8.25 11.25 7.91421 11.25 7.5C11.25 7.08579 10.9142 6.75 10.5 6.75Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/calendar.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.5 1C4.77614 1 5 1.22386 5 1.5V2H10V1.5C10 1.22386 10.2239 1 10.5 1C10.7761 1 11 1.22386 11 1.5V2H12.5C13.3284 2 14 2.67157 14 3.5V12.5C14 13.3284 13.3284 14 12.5 14H2.5C1.67157 14 1 13.3284 1 12.5V3.5C1 2.67157 1.67157 2 2.5 2H4V1.5C4 1.22386 4.22386 1 4.5 1ZM10 3V3.5C10 3.77614 10.2239 4 10.5 4C10.7761 4 11 3.77614 11 3.5V3H12.5C12.7761 3 13 3.22386 13 3.5V5H2V3.5C2 3.22386 2.22386 3 2.5 3H4V3.5C4 3.77614 4.22386 4 4.5 4C4.77614 4 5 3.77614 5 3.5V3H10ZM2 6V12.5C2 12.7761 2.22386 13 2.5 13H12.5C12.7761 13 13 12.7761 13 12.5V6H2ZM7 7.5C7 7.22386 7.22386 7 7.5 7C7.77614 7 8 7.22386 8 7.5C8 7.77614 7.77614 8 7.5 8C7.22386 8 7 7.77614 7 7.5ZM9.5 7C9.22386 7 9 7.22386 9 7.5C9 7.77614 9.22386 8 9.5 8C9.77614 8 10 7.77614 10 7.5C10 7.22386 9.77614 7 9.5 7ZM11 7.5C11 7.22386 11.2239 7 11.5 7C11.7761 7 12 7.22386 12 7.5C12 7.77614 11.7761 8 11.5 8C11.2239 8 11 7.77614 11 7.5ZM11.5 9C11.2239 9 11 9.22386 11 9.5C11 9.77614 11.2239 10 11.5 10C11.7761 10 12 9.77614 12 9.5C12 9.22386 11.7761 9 11.5 9ZM9 9.5C9 9.22386 9.22386 9 9.5 9C9.77614 9 10 9.22386 10 9.5C10 9.77614 9.77614 10 9.5 10C9.22386 10 9 9.77614 9 9.5ZM7.5 9C7.22386 9 7 9.22386 7 9.5C7 9.77614 7.22386 10 7.5 10C7.77614 10 8 9.77614 8 9.5C8 9.22386 7.77614 9 7.5 9ZM5 9.5C5 9.22386 5.22386 9 5.5 9C5.77614 9 6 9.22386 6 9.5C6 9.77614 5.77614 10 5.5 10C5.22386 10 5 9.77614 5 9.5ZM3.5 9C3.22386 9 3 9.22386 3 9.5C3 9.77614 3.22386 10 3.5 10C3.77614 10 4 9.77614 4 9.5C4 9.22386 3.77614 9 3.5 9ZM3 11.5C3 11.2239 3.22386 11 3.5 11C3.77614 11 4 11.2239 4 11.5C4 11.7761 3.77614 12 3.5 12C3.22386 12 3 11.7761 3 11.5ZM5.5 11C5.22386 11 5 11.2239 5 11.5C5 11.7761 5.22386 12 5.5 12C5.77614 12 6 11.7761 6 11.5C6 11.2239 5.77614 11 5.5 11ZM7 11.5C7 11.2239 7.22386 11 7.5 11C7.77614 11 8 11.2239 8 11.5C8 11.7761 7.77614 12 7.5 12C7.22386 12 7 11.7761 7 11.5ZM9.5 11C9.22386 11 9 11.2239 9 11.5C9 11.7761 9.22386 12 9.5 12C9.77614 12 10 11.7761 10 11.5C10 11.2239 9.77614 11 9.5 11Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/camera.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 3C1.44772 3 1 3.44772 1 4V11C1 11.5523 1.44772 12 2 12H13C13.5523 12 14 11.5523 14 11V4C14 3.44772 13.5523 3 13 3H2ZM0 4C0 2.89543 0.895431 2 2 2H13C14.1046 2 15 2.89543 15 4V11C15 12.1046 14.1046 13 13 13H2C0.895431 13 0 12.1046 0 11V4ZM2 4.25C2 4.11193 2.11193 4 2.25 4H4.75C4.88807 4 5 4.11193 5 4.25V5.75454C5 5.89261 4.88807 6.00454 4.75 6.00454H2.25C2.11193 6.00454 2 5.89261 2 5.75454V4.25ZM12.101 7.58421C12.101 9.02073 10.9365 10.1853 9.49998 10.1853C8.06346 10.1853 6.89893 9.02073 6.89893 7.58421C6.89893 6.14769 8.06346 4.98315 9.49998 4.98315C10.9365 4.98315 12.101 6.14769 12.101 7.58421ZM13.101 7.58421C13.101 9.57302 11.4888 11.1853 9.49998 11.1853C7.51117 11.1853 5.89893 9.57302 5.89893 7.58421C5.89893 5.5954 7.51117 3.98315 9.49998 3.98315C11.4888 3.98315 13.101 5.5954 13.101 7.58421Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/card-stack-minus.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.5 3C2.22386 3 2 3.22386 2 3.5V9.5C2 9.77614 2.22386 10 2.5 10H12.5C12.7761 10 13 9.77614 13 9.5V3.5C13 3.22386 12.7761 3 12.5 3H2.5ZM1 9.5C1 10.1531 1.4174 10.7087 2 10.9146V11.5C2 12.3284 2.67157 13 3.5 13H11.5C12.3284 13 13 12.3284 13 11.5V10.9146C13.5826 10.7087 14 10.1531 14 9.5V3.5C14 2.67157 13.3284 2 12.5 2H2.5C1.67157 2 1 2.67157 1 3.5V9.5ZM12 11.5V11H3V11.5C3 11.7761 3.22386 12 3.5 12H11.5C11.7761 12 12 11.7761 12 11.5ZM5.5 6C5.22386 6 5 6.22386 5 6.5C5 6.77614 5.22386 7 5.5 7H9.5C9.77614 7 10 6.77614 10 6.5C10 6.22386 9.77614 6 9.5 6H5.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/card-stack-plus.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 3.5C2 3.22386 2.22386 3 2.5 3H12.5C12.7761 3 13 3.22386 13 3.5V9.5C13 9.77614 12.7761 10 12.5 10H2.5C2.22386 10 2 9.77614 2 9.5V3.5ZM2 10.9146C1.4174 10.7087 1 10.1531 1 9.5V3.5C1 2.67157 1.67157 2 2.5 2H12.5C13.3284 2 14 2.67157 14 3.5V9.5C14 10.1531 13.5826 10.7087 13 10.9146V11.5C13 12.3284 12.3284 13 11.5 13H3.5C2.67157 13 2 12.3284 2 11.5V10.9146ZM12 11V11.5C12 11.7761 11.7761 12 11.5 12H3.5C3.22386 12 3 11.7761 3 11.5V11H12ZM5 6.5C5 6.22386 5.22386 6 5.5 6H7V4.5C7 4.22386 7.22386 4 7.5 4C7.77614 4 8 4.22386 8 4.5V6H9.5C9.77614 6 10 6.22386 10 6.5C10 6.77614 9.77614 7 9.5 7H8V8.5C8 8.77614 7.77614 9 7.5 9C7.22386 9 7 8.77614 7 8.5V7H5.5C5.22386 7 5 6.77614 5 6.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/card-stack.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 3.5C2 3.22386 2.22386 3 2.5 3H12.5C12.7761 3 13 3.22386 13 3.5V9.5C13 9.77614 12.7761 10 12.5 10H2.5C2.22386 10 2 9.77614 2 9.5V3.5ZM2 10.9146C1.4174 10.7087 1 10.1531 1 9.5V3.5C1 2.67157 1.67157 2 2.5 2H12.5C13.3284 2 14 2.67157 14 3.5V9.5C14 10.1531 13.5826 10.7087 13 10.9146V11.5C13 12.3284 12.3284 13 11.5 13H3.5C2.67157 13 2 12.3284 2 11.5V10.9146ZM12 11V11.5C12 11.7761 11.7761 12 11.5 12H3.5C3.22386 12 3 11.7761 3 11.5V11H12Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/caret-down.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.18179 6.18181C4.35753 6.00608 4.64245 6.00608 4.81819 6.18181L7.49999 8.86362L10.1818 6.18181C10.3575 6.00608 10.6424 6.00608 10.8182 6.18181C10.9939 6.35755 10.9939 6.64247 10.8182 6.81821L7.81819 9.81821C7.73379 9.9026 7.61934 9.95001 7.49999 9.95001C7.38064 9.95001 7.26618 9.9026 7.18179 9.81821L4.18179 6.81821C4.00605 6.64247 4.00605 6.35755 4.18179 6.18181Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/caret-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.81809 4.18179C8.99383 4.35753 8.99383 4.64245 8.81809 4.81819L6.13629 7.49999L8.81809 10.1818C8.99383 10.3575 8.99383 10.6424 8.81809 10.8182C8.64236 10.9939 8.35743 10.9939 8.1817 10.8182L5.1817 7.81819C5.09731 7.73379 5.0499 7.61933 5.0499 7.49999C5.0499 7.38064 5.09731 7.26618 5.1817 7.18179L8.1817 4.18179C8.35743 4.00605 8.64236 4.00605 8.81809 4.18179Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/caret-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.18194 4.18185C6.35767 4.00611 6.6426 4.00611 6.81833 4.18185L9.81833 7.18185C9.90272 7.26624 9.95013 7.3807 9.95013 7.50005C9.95013 7.6194 9.90272 7.73386 9.81833 7.81825L6.81833 10.8182C6.6426 10.994 6.35767 10.994 6.18194 10.8182C6.0062 10.6425 6.0062 10.3576 6.18194 10.1819L8.86374 7.50005L6.18194 4.81825C6.0062 4.64251 6.0062 4.35759 6.18194 4.18185Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/caret-sort.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.93179 5.43179C4.75605 5.60753 4.75605 5.89245 4.93179 6.06819C5.10753 6.24392 5.39245 6.24392 5.56819 6.06819L7.49999 4.13638L9.43179 6.06819C9.60753 6.24392 9.89245 6.24392 10.0682 6.06819C10.2439 5.89245 10.2439 5.60753 10.0682 5.43179L7.81819 3.18179C7.73379 3.0974 7.61933 3.04999 7.49999 3.04999C7.38064 3.04999 7.26618 3.0974 7.18179 3.18179L4.93179 5.43179ZM10.0682 9.56819C10.2439 9.39245 10.2439 9.10753 10.0682 8.93179C9.89245 8.75606 9.60753 8.75606 9.43179 8.93179L7.49999 10.8636L5.56819 8.93179C5.39245 8.75606 5.10753 8.75606 4.93179 8.93179C4.75605 9.10753 4.75605 9.39245 4.93179 9.56819L7.18179 11.8182C7.35753 11.9939 7.64245 11.9939 7.81819 11.8182L10.0682 9.56819Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/caret-up.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.18179 8.81819C4.00605 8.64245 4.00605 8.35753 4.18179 8.18179L7.18179 5.18179C7.26618 5.0974 7.38064 5.04999 7.49999 5.04999C7.61933 5.04999 7.73379 5.0974 7.81819 5.18179L10.8182 8.18179C10.9939 8.35753 10.9939 8.64245 10.8182 8.81819C10.6424 8.99392 10.3575 8.99392 10.1818 8.81819L7.49999 6.13638L4.81819 8.81819C4.64245 8.99392 4.35753 8.99392 4.18179 8.81819Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/chat-bubble.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.5 3L2.5 3.00002C1.67157 3.00002 1 3.6716 1 4.50002V9.50003C1 10.3285 1.67157 11 2.5 11H7.50003C7.63264 11 7.75982 11.0527 7.85358 11.1465L10 13.2929V11.5C10 11.2239 10.2239 11 10.5 11H12.5C13.3284 11 14 10.3285 14 9.50003V4.5C14 3.67157 13.3284 3 12.5 3ZM2.49999 2.00002L12.5 2C13.8807 2 15 3.11929 15 4.5V9.50003C15 10.8807 13.8807 12 12.5 12H11V14.5C11 14.7022 10.8782 14.8845 10.6913 14.9619C10.5045 15.0393 10.2894 14.9965 10.1464 14.8536L7.29292 12H2.5C1.11929 12 0 10.8807 0 9.50003V4.50002C0 3.11931 1.11928 2.00003 2.49999 2.00002Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/check-circled.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49991 0.877045C3.84222 0.877045 0.877075 3.84219 0.877075 7.49988C0.877075 11.1575 3.84222 14.1227 7.49991 14.1227C11.1576 14.1227 14.1227 11.1575 14.1227 7.49988C14.1227 3.84219 11.1576 0.877045 7.49991 0.877045ZM1.82708 7.49988C1.82708 4.36686 4.36689 1.82704 7.49991 1.82704C10.6329 1.82704 13.1727 4.36686 13.1727 7.49988C13.1727 10.6329 10.6329 13.1727 7.49991 13.1727C4.36689 13.1727 1.82708 10.6329 1.82708 7.49988ZM10.1589 5.53774C10.3178 5.31191 10.2636 5.00001 10.0378 4.84109C9.81194 4.68217 9.50004 4.73642 9.34112 4.96225L6.51977 8.97154L5.35681 7.78706C5.16334 7.59002 4.84677 7.58711 4.64973 7.78058C4.45268 7.97404 4.44978 8.29061 4.64325 8.48765L6.22658 10.1003C6.33054 10.2062 6.47617 10.2604 6.62407 10.2483C6.77197 10.2363 6.90686 10.1591 6.99226 10.0377L10.1589 5.53774Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/check.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11.4669 3.72684C11.7558 3.91574 11.8369 4.30308 11.648 4.59198L7.39799 11.092C7.29783 11.2452 7.13556 11.3467 6.95402 11.3699C6.77247 11.3931 6.58989 11.3355 6.45446 11.2124L3.70446 8.71241C3.44905 8.48022 3.43023 8.08494 3.66242 7.82953C3.89461 7.57412 4.28989 7.55529 4.5453 7.78749L6.75292 9.79441L10.6018 3.90792C10.7907 3.61902 11.178 3.53795 11.4669 3.72684Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/checkbox.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3 3H12V12H3L3 3ZM2 3C2 2.44771 2.44772 2 3 2H12C12.5523 2 13 2.44772 13 3V12C13 12.5523 12.5523 13 12 13H3C2.44771 13 2 12.5523 2 12V3ZM10.3498 5.51105C10.506 5.28337 10.4481 4.97212 10.2204 4.81587C9.99275 4.65961 9.6815 4.71751 9.52525 4.94519L6.64048 9.14857L5.19733 7.40889C5.02102 7.19635 4.7058 7.16699 4.49327 7.34329C4.28073 7.5196 4.25137 7.83482 4.42767 8.04735L6.2934 10.2964C6.39348 10.4171 6.54437 10.4838 6.70097 10.4767C6.85757 10.4695 7.00177 10.3894 7.09047 10.2601L10.3498 5.51105Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/chevron-down.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.13523 6.15803C3.3241 5.95657 3.64052 5.94637 3.84197 6.13523L7.5 9.56464L11.158 6.13523C11.3595 5.94637 11.6759 5.95657 11.8648 6.15803C12.0536 6.35949 12.0434 6.67591 11.842 6.86477L7.84197 10.6148C7.64964 10.7951 7.35036 10.7951 7.15803 10.6148L3.15803 6.86477C2.95657 6.67591 2.94637 6.35949 3.13523 6.15803Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/chevron-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.84182 3.13514C9.04327 3.32401 9.05348 3.64042 8.86462 3.84188L5.43521 7.49991L8.86462 11.1579C9.05348 11.3594 9.04327 11.6758 8.84182 11.8647C8.64036 12.0535 8.32394 12.0433 8.13508 11.8419L4.38508 7.84188C4.20477 7.64955 4.20477 7.35027 4.38508 7.15794L8.13508 3.15794C8.32394 2.95648 8.64036 2.94628 8.84182 3.13514Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/chevron-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.1584 3.13508C6.35985 2.94621 6.67627 2.95642 6.86514 3.15788L10.6151 7.15788C10.7954 7.3502 10.7954 7.64949 10.6151 7.84182L6.86514 11.8418C6.67627 12.0433 6.35985 12.0535 6.1584 11.8646C5.95694 11.6757 5.94673 11.3593 6.1356 11.1579L9.565 7.49985L6.1356 3.84182C5.94673 3.64036 5.95694 3.32394 6.1584 3.13508Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/chevron-up.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.13523 8.84197C3.3241 9.04343 3.64052 9.05363 3.84197 8.86477L7.5 5.43536L11.158 8.86477C11.3595 9.05363 11.6759 9.04343 11.8648 8.84197C12.0536 8.64051 12.0434 8.32409 11.842 8.13523L7.84197 4.38523C7.64964 4.20492 7.35036 4.20492 7.15803 4.38523L3.15803 8.13523C2.95657 8.32409 2.94637 8.64051 3.13523 8.84197Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/circle-backslash.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49991 0.877075C3.84222 0.877075 0.877075 3.84222 0.877075 7.49991C0.877075 11.1576 3.84222 14.1227 7.49991 14.1227C11.1576 14.1227 14.1227 11.1576 14.1227 7.49991C14.1227 3.84222 11.1576 0.877075 7.49991 0.877075ZM3.85768 3.15057C4.84311 2.32448 6.11342 1.82708 7.49991 1.82708C10.6329 1.82708 13.1727 4.36689 13.1727 7.49991C13.1727 8.88638 12.6753 10.1567 11.8492 11.1421L3.85768 3.15057ZM3.15057 3.85768C2.32448 4.84311 1.82708 6.11342 1.82708 7.49991C1.82708 10.6329 4.36689 13.1727 7.49991 13.1727C8.88638 13.1727 10.1567 12.6753 11.1421 11.8492L3.15057 3.85768Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/circle.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.877075 7.49991C0.877075 3.84222 3.84222 0.877075 7.49991 0.877075C11.1576 0.877075 14.1227 3.84222 14.1227 7.49991C14.1227 11.1576 11.1576 14.1227 7.49991 14.1227C3.84222 14.1227 0.877075 11.1576 0.877075 7.49991ZM7.49991 1.82708C4.36689 1.82708 1.82708 4.36689 1.82708 7.49991C1.82708 10.6329 4.36689 13.1727 7.49991 13.1727C10.6329 13.1727 13.1727 10.6329 13.1727 7.49991C13.1727 4.36689 10.6329 1.82708 7.49991 1.82708Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/clipboard-copy.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5 2V1H10V2H5ZM4.75 0C4.33579 0 4 0.335786 4 0.75V1H3.5C2.67157 1 2 1.67157 2 2.5V12.5C2 13.3284 2.67157 14 3.5 14H7V13H3.5C3.22386 13 3 12.7761 3 12.5V2.5C3 2.22386 3.22386 2 3.5 2H4V2.25C4 2.66421 4.33579 3 4.75 3H10.25C10.6642 3 11 2.66421 11 2.25V2H11.5C11.7761 2 12 2.22386 12 2.5V7H13V2.5C13 1.67157 12.3284 1 11.5 1H11V0.75C11 0.335786 10.6642 0 10.25 0H4.75ZM9 8.5C9 8.77614 8.77614 9 8.5 9C8.22386 9 8 8.77614 8 8.5C8 8.22386 8.22386 8 8.5 8C8.77614 8 9 8.22386 9 8.5ZM10.5 9C10.7761 9 11 8.77614 11 8.5C11 8.22386 10.7761 8 10.5 8C10.2239 8 10 8.22386 10 8.5C10 8.77614 10.2239 9 10.5 9ZM13 8.5C13 8.77614 12.7761 9 12.5 9C12.2239 9 12 8.77614 12 8.5C12 8.22386 12.2239 8 12.5 8C12.7761 8 13 8.22386 13 8.5ZM14.5 9C14.7761 9 15 8.77614 15 8.5C15 8.22386 14.7761 8 14.5 8C14.2239 8 14 8.22386 14 8.5C14 8.77614 14.2239 9 14.5 9ZM15 10.5C15 10.7761 14.7761 11 14.5 11C14.2239 11 14 10.7761 14 10.5C14 10.2239 14.2239 10 14.5 10C14.7761 10 15 10.2239 15 10.5ZM14.5 13C14.7761 13 15 12.7761 15 12.5C15 12.2239 14.7761 12 14.5 12C14.2239 12 14 12.2239 14 12.5C14 12.7761 14.2239 13 14.5 13ZM14.5 15C14.7761 15 15 14.7761 15 14.5C15 14.2239 14.7761 14 14.5 14C14.2239 14 14 14.2239 14 14.5C14 14.7761 14.2239 15 14.5 15ZM8.5 11C8.77614 11 9 10.7761 9 10.5C9 10.2239 8.77614 10 8.5 10C8.22386 10 8 10.2239 8 10.5C8 10.7761 8.22386 11 8.5 11ZM9 12.5C9 12.7761 8.77614 13 8.5 13C8.22386 13 8 12.7761 8 12.5C8 12.2239 8.22386 12 8.5 12C8.77614 12 9 12.2239 9 12.5ZM8.5 15C8.77614 15 9 14.7761 9 14.5C9 14.2239 8.77614 14 8.5 14C8.22386 14 8 14.2239 8 14.5C8 14.7761 8.22386 15 8.5 15ZM11 14.5C11 14.7761 10.7761 15 10.5 15C10.2239 15 10 14.7761 10 14.5C10 14.2239 10.2239 14 10.5 14C10.7761 14 11 14.2239 11 14.5ZM12.5 15C12.7761 15 13 14.7761 13 14.5C13 14.2239 12.7761 14 12.5 14C12.2239 14 12 14.2239 12 14.5C12 14.7761 12.2239 15 12.5 15Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/clipboard.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5 2V1H10V2H5ZM4.75 0C4.33579 0 4 0.335786 4 0.75V1H3.5C2.67157 1 2 1.67157 2 2.5V12.5C2 13.3284 2.67157 14 3.5 14H11.5C12.3284 14 13 13.3284 13 12.5V2.5C13 1.67157 12.3284 1 11.5 1H11V0.75C11 0.335786 10.6642 0 10.25 0H4.75ZM11 2V2.25C11 2.66421 10.6642 3 10.25 3H4.75C4.33579 3 4 2.66421 4 2.25V2H3.5C3.22386 2 3 2.22386 3 2.5V12.5C3 12.7761 3.22386 13 3.5 13H11.5C11.7761 13 12 12.7761 12 12.5V2.5C12 2.22386 11.7761 2 11.5 2H11Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/clock.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.50009 0.877014C3.84241 0.877014 0.877258 3.84216 0.877258 7.49984C0.877258 11.1575 3.8424 14.1227 7.50009 14.1227C11.1578 14.1227 14.1229 11.1575 14.1229 7.49984C14.1229 3.84216 11.1577 0.877014 7.50009 0.877014ZM1.82726 7.49984C1.82726 4.36683 4.36708 1.82701 7.50009 1.82701C10.6331 1.82701 13.1729 4.36683 13.1729 7.49984C13.1729 10.6328 10.6331 13.1727 7.50009 13.1727C4.36708 13.1727 1.82726 10.6328 1.82726 7.49984ZM8 4.50001C8 4.22387 7.77614 4.00001 7.5 4.00001C7.22386 4.00001 7 4.22387 7 4.50001V7.50001C7 7.63262 7.05268 7.7598 7.14645 7.85357L9.14645 9.85357C9.34171 10.0488 9.65829 10.0488 9.85355 9.85357C10.0488 9.65831 10.0488 9.34172 9.85355 9.14646L8 7.29291V4.50001Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/code.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9.96424 2.68571C10.0668 2.42931 9.94209 2.13833 9.6857 2.03577C9.4293 1.93322 9.13832 2.05792 9.03576 2.31432L5.03576 12.3143C4.9332 12.5707 5.05791 12.8617 5.3143 12.9642C5.5707 13.0668 5.86168 12.9421 5.96424 12.6857L9.96424 2.68571ZM3.85355 5.14646C4.04882 5.34172 4.04882 5.6583 3.85355 5.85356L2.20711 7.50001L3.85355 9.14646C4.04882 9.34172 4.04882 9.6583 3.85355 9.85356C3.65829 10.0488 3.34171 10.0488 3.14645 9.85356L1.14645 7.85356C0.951184 7.6583 0.951184 7.34172 1.14645 7.14646L3.14645 5.14646C3.34171 4.9512 3.65829 4.9512 3.85355 5.14646ZM11.1464 5.14646C11.3417 4.9512 11.6583 4.9512 11.8536 5.14646L13.8536 7.14646C14.0488 7.34172 14.0488 7.6583 13.8536 7.85356L11.8536 9.85356C11.6583 10.0488 11.3417 10.0488 11.1464 9.85356C10.9512 9.6583 10.9512 9.34172 11.1464 9.14646L12.7929 7.50001L11.1464 5.85356C10.9512 5.6583 10.9512 5.34172 11.1464 5.14646Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/codesandbox-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.71144 0.796902C7.57741 0.734357 7.42257 0.734357 7.28855 0.796902L1.28855 3.5969C1.11251 3.67905 0.999993 3.85573 0.999993 4.04999V10.95C0.999993 11.1443 1.11251 11.3209 1.28855 11.4031L7.28855 14.2031C7.42257 14.2656 7.57741 14.2656 7.71144 14.2031L13.7114 11.4031C13.8875 11.3209 14 11.1443 14 10.95V4.04999C14 3.85573 13.8875 3.67905 13.7114 3.5969L7.71144 0.796902ZM7.49999 3.15674L5.98039 2.51091L7.49999 1.80176L9.01959 2.51091L7.49999 3.15674ZM7.69556 4.16018L10.2382 3.07958L12.2719 4.02865L7.49999 6.05671L2.72808 4.02865L4.76181 3.07958L7.30442 4.16018C7.42939 4.2133 7.57059 4.2133 7.69556 4.16018ZM7.99999 6.93078L13 4.80578V7.92966L11.0821 8.8119C10.7273 8.97509 10.5 9.32988 10.5 9.72039V11.7982L7.99999 12.9649V6.93078ZM11.5 11.3316L13 10.6316V9.03039L11.5 9.72039V11.3316ZM6.99999 6.93078V12.9649L4.50231 11.7993V9.72036C4.50231 9.32985 4.27499 8.97506 3.92022 8.81187L1.99999 7.92856V4.80578L6.99999 6.93078ZM1.99999 10.6316L3.50231 11.3326L3.50231 9.72036L1.99999 9.02929V10.6316Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/color-wheel.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.877075 7.49985C0.877075 3.84216 3.84222 0.877014 7.49991 0.877014C11.1576 0.877014 14.1227 3.84216 14.1227 7.49985C14.1227 11.1575 11.1576 14.1227 7.49991 14.1227C3.84222 14.1227 0.877075 11.1575 0.877075 7.49985ZM3.78135 3.21565C4.68298 2.43239 5.83429 1.92904 7.09998 1.84089V6.53429L3.78135 3.21565ZM3.21567 3.78134C2.43242 4.68298 1.92909 5.83428 1.84095 7.09997H6.5343L3.21567 3.78134ZM6.5343 7.89997H1.84097C1.92916 9.16562 2.43253 10.3169 3.21579 11.2185L6.5343 7.89997ZM3.78149 11.7842C4.6831 12.5673 5.83435 13.0707 7.09998 13.1588V8.46566L3.78149 11.7842ZM7.89998 8.46566V13.1588C9.16559 13.0706 10.3168 12.5673 11.2184 11.7841L7.89998 8.46566ZM11.7841 11.2184C12.5673 10.3168 13.0707 9.16558 13.1588 7.89997H8.46567L11.7841 11.2184ZM8.46567 7.09997H13.1589C13.0707 5.83432 12.5674 4.68305 11.7842 3.78143L8.46567 7.09997ZM11.2185 3.21573C10.3169 2.43246 9.16565 1.92909 7.89998 1.8409V6.53429L11.2185 3.21573Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/column-spacing.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.00012 1.5C8.00012 1.22386 7.77626 1 7.50012 1C7.22398 1 7.00012 1.22386 7.00012 1.5V13.5C7.00012 13.7761 7.22398 14 7.50012 14C7.77626 14 8.00012 13.7761 8.00012 13.5V1.5ZM3.31812 5.818C3.49386 5.64227 3.49386 5.35734 3.31812 5.18161C3.14239 5.00587 2.85746 5.00587 2.68173 5.18161L0.681729 7.18161C0.505993 7.35734 0.505993 7.64227 0.681729 7.818L2.68173 9.818C2.85746 9.99374 3.14239 9.99374 3.31812 9.818C3.49386 9.64227 3.49386 9.35734 3.31812 9.18161L2.08632 7.9498H5.50017C5.7487 7.9498 5.95017 7.74833 5.95017 7.4998C5.95017 7.25128 5.7487 7.0498 5.50017 7.0498H2.08632L3.31812 5.818ZM12.3181 5.18161C12.1424 5.00587 11.8575 5.00587 11.6817 5.18161C11.506 5.35734 11.506 5.64227 11.6817 5.818L12.9135 7.0498H9.50017C9.25164 7.0498 9.05017 7.25128 9.05017 7.4998C9.05017 7.74833 9.25164 7.9498 9.50017 7.9498H12.9135L11.6817 9.18161C11.506 9.35734 11.506 9.64227 11.6817 9.818C11.8575 9.99374 12.1424 9.99374 12.3181 9.818L14.3181 7.818C14.4939 7.64227 14.4939 7.35734 14.3181 7.18161L12.3181 5.18161Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/columns.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.14998 14V1H0.849976V14H2.14998ZM6.14998 14V1H4.84998V14H6.14998ZM10.15 1V14H8.84998V1H10.15ZM14.15 14V1H12.85V14H14.15Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/commit.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9.94969 7.49989C9.94969 8.85288 8.85288 9.94969 7.49989 9.94969C6.14691 9.94969 5.0501 8.85288 5.0501 7.49989C5.0501 6.14691 6.14691 5.0501 7.49989 5.0501C8.85288 5.0501 9.94969 6.14691 9.94969 7.49989ZM10.8632 8C10.6213 9.64055 9.20764 10.8997 7.49989 10.8997C5.79214 10.8997 4.37847 9.64055 4.13662 8H0.5C0.223858 8 0 7.77614 0 7.5C0 7.22386 0.223858 7 0.5 7H4.13659C4.37835 5.35935 5.79206 4.1001 7.49989 4.1001C9.20772 4.1001 10.6214 5.35935 10.8632 7H14.5C14.7761 7 15 7.22386 15 7.5C15 7.77614 14.7761 8 14.5 8H10.8632Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/component-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.67129 3.14634C4.47603 3.34161 4.47603 3.65819 4.67129 3.85345L7.14616 6.32833C7.34142 6.52359 7.65801 6.52359 7.85327 6.32833L10.3281 3.85345C10.5234 3.65819 10.5234 3.34161 10.3281 3.14634L7.85327 0.671471C7.65801 0.476209 7.34142 0.476209 7.14616 0.671471L4.67129 3.14634ZM7.49971 5.26766L5.73195 3.4999L7.49971 1.73213L9.26748 3.4999L7.49971 5.26766ZM8.67129 7.14634C8.47603 7.34161 8.47603 7.65819 8.67129 7.85345L11.1462 10.3283C11.3414 10.5236 11.658 10.5236 11.8533 10.3283L14.3281 7.85345C14.5234 7.65819 14.5234 7.34161 14.3281 7.14634L11.8533 4.67147C11.658 4.47621 11.3414 4.47621 11.1462 4.67147L8.67129 7.14634ZM11.4997 9.26766L9.73195 7.4999L11.4997 5.73213L13.2675 7.4999L11.4997 9.26766ZM4.67129 11.8535C4.47603 11.6582 4.47603 11.3416 4.67129 11.1463L7.14616 8.67147C7.34142 8.47621 7.65801 8.47621 7.85327 8.67147L10.3281 11.1463C10.5234 11.3416 10.5234 11.6582 10.3281 11.8535L7.85327 14.3283C7.65801 14.5236 7.34142 14.5236 7.14616 14.3283L4.67129 11.8535ZM5.73195 11.4999L7.49971 13.2677L9.26748 11.4999L7.49971 9.73213L5.73195 11.4999ZM0.671288 7.14649C0.476026 7.34175 0.476026 7.65834 0.671288 7.8536L3.14616 10.3285C3.34142 10.5237 3.65801 10.5237 3.85327 10.3285L6.32814 7.8536C6.5234 7.65834 6.5234 7.34175 6.32814 7.14649L3.85327 4.67162C3.65801 4.47636 3.34142 4.47636 3.14616 4.67162L0.671288 7.14649ZM3.49972 9.26781L1.73195 7.50005L3.49972 5.73228L5.26748 7.50005L3.49972 9.26781Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/component-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.87935 1H3.9H11.1H11.1207C11.5231 0.999994 11.8553 0.999989 12.1259 1.0221C12.407 1.04506 12.6653 1.09434 12.908 1.21799C13.2843 1.40973 13.5903 1.7157 13.782 2.09202C13.9057 2.33469 13.9549 2.59304 13.9779 2.87409C14 3.14468 14 3.47686 14 3.87934V3.9V11.1V11.1207C14 11.5231 14 11.8553 13.9779 12.1259C13.9549 12.407 13.9057 12.6653 13.782 12.908C13.5903 13.2843 13.2843 13.5903 12.908 13.782C12.6653 13.9057 12.407 13.9549 12.1259 13.9779C11.8553 14 11.5231 14 11.1207 14H11.1H3.9H3.87934C3.47686 14 3.14468 14 2.87409 13.9779C2.59304 13.9549 2.33469 13.9057 2.09202 13.782C1.7157 13.5903 1.40973 13.2843 1.21799 12.908C1.09434 12.6653 1.04506 12.407 1.0221 12.1259C0.999989 11.8553 0.999994 11.5231 1 11.1207V11.1207V11.1V3.9V3.87935V3.87934C0.999994 3.47686 0.999989 3.14468 1.0221 2.87409C1.04506 2.59304 1.09434 2.33469 1.21799 2.09202C1.40973 1.7157 1.7157 1.40973 2.09202 1.21799C2.33469 1.09434 2.59304 1.04506 2.87409 1.0221C3.14469 0.999989 3.47687 0.999994 3.87935 1ZM2.95552 2.01878C2.73631 2.03669 2.62421 2.06915 2.54601 2.10899C2.35785 2.20487 2.20487 2.35785 2.10899 2.54601C2.06915 2.62421 2.03669 2.73631 2.01878 2.95552C2.00039 3.18056 2 3.47171 2 3.9V7H7V2H3.9C3.47171 2 3.18056 2.00039 2.95552 2.01878ZM7 8H2V11.1C2 11.5283 2.00039 11.8194 2.01878 12.0445C2.03669 12.2637 2.06915 12.3758 2.10899 12.454C2.20487 12.6422 2.35785 12.7951 2.54601 12.891C2.62421 12.9309 2.73631 12.9633 2.95552 12.9812C3.18056 12.9996 3.47171 13 3.9 13H7V8ZM8 8H13V11.1C13 11.5283 12.9996 11.8194 12.9812 12.0445C12.9633 12.2637 12.9309 12.3758 12.891 12.454C12.7951 12.6422 12.6422 12.7951 12.454 12.891C12.3758 12.9309 12.2637 12.9633 12.0445 12.9812C11.8194 12.9996 11.5283 13 11.1 13H8V8ZM13 7H8V2H11.1C11.5283 2 11.8194 2.00039 12.0445 2.01878C12.2637 2.03669 12.3758 2.06915 12.454 2.10899C12.6422 2.20487 12.7951 2.35785 12.891 2.54601C12.9309 2.62421 12.9633 2.73631 12.9812 2.95552C12.9996 3.18056 13 3.47171 13 3.9V7Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/component-boolean.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.85367 1.48956C7.65841 1.29429 7.34182 1.29429 7.14656 1.48956L1.48971 7.14641C1.29445 7.34167 1.29445 7.65825 1.48971 7.85352L7.14656 13.5104C7.34182 13.7056 7.65841 13.7056 7.85367 13.5104L13.5105 7.85352C13.7058 7.65825 13.7058 7.34167 13.5105 7.14641L7.85367 1.48956ZM7.5 2.55033L2.55037 7.49996L7.5 12.4496V2.55033Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/component-instance.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.1465 1.48959C7.34176 1.29432 7.65835 1.29432 7.85361 1.48959L13.5105 7.14644C13.7057 7.3417 13.7057 7.65829 13.5105 7.85355L7.85361 13.5104C7.65835 13.7057 7.34176 13.7057 7.1465 13.5104L1.48965 7.85355C1.29439 7.65829 1.29439 7.3417 1.48965 7.14644L7.1465 1.48959ZM7.50005 2.55025L2.55031 7.49999L7.50005 12.4497L12.4498 7.49999L7.50005 2.55025Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/component-none.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.85361 1.48959C7.65835 1.29432 7.34176 1.29432 7.1465 1.48959L1.48965 7.14644C1.29439 7.3417 1.29439 7.65829 1.48965 7.85355L3.9645 10.3284L1.64644 12.6464C1.45118 12.8417 1.45118 13.1583 1.64644 13.3536C1.84171 13.5488 2.15829 13.5488 2.35355 13.3536L4.6716 11.0355L7.1465 13.5104C7.34176 13.7057 7.65835 13.7057 7.85361 13.5104L13.5105 7.85355C13.7057 7.65829 13.7057 7.3417 13.5105 7.14644L11.0356 4.67154L13.3535 2.35355C13.5488 2.15829 13.5488 1.84171 13.3535 1.64645C13.1583 1.45118 12.8417 1.45118 12.6464 1.64645L10.3285 3.96443L7.85361 1.48959ZM9.62135 4.67154L7.50005 2.55025L2.55031 7.49999L4.6716 9.62129L9.62135 4.67154ZM5.37871 10.3284L7.50005 12.4497L12.4498 7.49999L10.3285 5.37865L5.37871 10.3284Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/component-placeholder.svg+12−0
@@ -0,0 +1,12 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.8034 7.14644C12.9986 6.95118 13.3152 6.95118 13.5105 7.14644C13.7057 7.3417 13.7057 7.65829 13.5105 7.85355C13.3152 8.04881 12.9986 8.04881 12.8034 7.85355C12.6081 7.65828 12.6081 7.3417 12.8034 7.14644ZM12.0962 8.56065C12.2915 8.75592 12.2915 9.0725 12.0962 9.26776C11.901 9.46302 11.5844 9.46302 11.3891 9.26776C11.1939 9.0725 11.1939 8.75592 11.3891 8.56065C11.5844 8.36539 11.901 8.36539 12.0962 8.56065ZM10.682 9.97487C10.8773 10.1701 10.8773 10.4867 10.682 10.682C10.4868 10.8772 10.1702 10.8772 9.97493 10.682C9.77967 10.4867 9.77967 10.1701 9.97493 9.97487C10.1702 9.7796 10.4868 9.7796 10.682 9.97487ZM9.26782 11.3891C9.46308 11.5843 9.46308 11.9009 9.26782 12.0962C9.07256 12.2915 8.75598 12.2915 8.56071 12.0962C8.36545 11.9009 8.36545 11.5843 8.56072 11.3891C8.75598 11.1938 9.07256 11.1938 9.26782 11.3891ZM7.1465 13.5104C6.95124 13.3151 6.95124 12.9986 7.1465 12.8033C7.17091 12.7789 7.19721 12.7575 7.22494 12.7392C7.41901 12.6111 7.68275 12.6324 7.85361 12.8033C8.04887 12.9986 8.04887 13.3151 7.85361 13.5104C7.65835 13.7057 7.34176 13.7057 7.1465 13.5104Z"
6 fill="currentColor"
7 />
8 <path
9 d="M2.90386 8.56065C2.7086 8.75592 2.7086 9.0725 2.90386 9.26776 3.09912 9.46302 3.41571 9.46302 3.61097 9.26776 3.80623 9.0725 3.80623 8.75592 3.61097 8.56065 3.41571 8.36539 3.09912 8.36539 2.90386 8.56065zM4.31807 9.97487C4.12281 10.1701 4.12281 10.4867 4.31807 10.682 4.51334 10.8772 4.82992 10.8772 5.02518 10.682 5.22044 10.4867 5.22044 10.1701 5.02518 9.97487 4.82992 9.7796 4.51334 9.7796 4.31807 9.97487zM5.73229 11.3891C5.53703 11.5843 5.53703 11.9009 5.73229 12.0962 5.92755 12.2914 6.24413 12.2915 6.43939 12.0962 6.63466 11.9009 6.63466 11.5843 6.43939 11.3891 6.24413 11.1938 5.92755 11.1938 5.73229 11.3891zM2.19675 7.85355C2.36761 7.68269 2.38897 7.41895 2.26082 7.22488 2.09046 6.96684 1.71063 6.92546 1.48965 7.14644 1.29439 7.3417 1.29439 7.65829 1.48965 7.85355 1.68491 8.04881 2.00149 8.04881 2.19675 7.85355zM3.61097 5.73223C3.41571 5.53696 3.09912 5.53696 2.90386 5.73223 2.7086 5.92749 2.7086 6.24407 2.90386 6.43933 3.09912 6.6346 3.41571 6.6346 3.61097 6.43933 3.80623 6.24407 3.80623 5.92749 3.61097 5.73223zM5.02518 4.31801C4.82992 4.12275 4.51334 4.12275 4.31807 4.31801 4.12281 4.51328 4.12281 4.82986 4.31807 5.02512 4.51334 5.22038 4.82992 5.22038 5.02518 5.02512 5.22044 4.82986 5.22044 4.51328 5.02518 4.31801zM6.43939 2.9038C6.24413 2.70854 5.92755 2.70854 5.73229 2.9038 5.53703 3.09906 5.53703 3.41564 5.73229 3.61091 5.92755 3.80617 6.24413 3.80617 6.43939 3.61091 6.63466 3.41564 6.63466 3.09906 6.43939 2.9038zM7.85361 1.48959C7.65835 1.29432 7.34176 1.29432 7.1465 1.48959 6.95124 1.68485 6.95124 2.00143 7.1465 2.19669 7.34176 2.39196 7.65835 2.39196 7.85361 2.19669 8.04887 2.00143 8.04887 1.68485 7.85361 1.48959zM9.26782 2.9038C9.07256 2.70854 8.75598 2.70854 8.56071 2.9038 8.36545 3.09906 8.36545 3.41564 8.56071 3.61091 8.75598 3.80617 9.07256 3.80617 9.26782 3.61091 9.46308 3.41564 9.46308 3.09906 9.26782 2.9038zM10.682 4.31801C10.4868 4.12275 10.1702 4.12275 9.97493 4.31801 9.77967 4.51328 9.77967 4.82986 9.97493 5.02512 10.1702 5.22038 10.4868 5.22038 10.682 5.02512 10.8773 4.82986 10.8773 4.51328 10.682 4.31801zM12.0962 5.73223C11.901 5.53696 11.5844 5.53696 11.3891 5.73223 11.1939 5.92749 11.1939 6.24407 11.3891 6.43933 11.5844 6.6346 11.901 6.6346 12.0962 6.43933 12.2915 6.24407 12.2915 5.92749 12.0962 5.73223z"
10 fill="currentColor"
11 />
12</svg>
assets/icons/radix/container.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 1.5C2 1.77614 1.77614 2 1.5 2C1.22386 2 1 1.77614 1 1.5C1 1.22386 1.22386 1 1.5 1C1.77614 1 2 1.22386 2 1.5ZM5 13H10V2L5 2L5 13ZM4 13C4 13.5523 4.44772 14 5 14H10C10.5523 14 11 13.5523 11 13V2C11 1.44772 10.5523 1 10 1H5C4.44772 1 4 1.44771 4 2V13ZM13.5 2C13.7761 2 14 1.77614 14 1.5C14 1.22386 13.7761 1 13.5 1C13.2239 1 13 1.22386 13 1.5C13 1.77614 13.2239 2 13.5 2ZM2 3.5C2 3.77614 1.77614 4 1.5 4C1.22386 4 1 3.77614 1 3.5C1 3.22386 1.22386 3 1.5 3C1.77614 3 2 3.22386 2 3.5ZM13.5 4C13.7761 4 14 3.77614 14 3.5C14 3.22386 13.7761 3 13.5 3C13.2239 3 13 3.22386 13 3.5C13 3.77614 13.2239 4 13.5 4ZM2 5.5C2 5.77614 1.77614 6 1.5 6C1.22386 6 1 5.77614 1 5.5C1 5.22386 1.22386 5 1.5 5C1.77614 5 2 5.22386 2 5.5ZM13.5 6C13.7761 6 14 5.77614 14 5.5C14 5.22386 13.7761 5 13.5 5C13.2239 5 13 5.22386 13 5.5C13 5.77614 13.2239 6 13.5 6ZM2 7.5C2 7.77614 1.77614 8 1.5 8C1.22386 8 1 7.77614 1 7.5C1 7.22386 1.22386 7 1.5 7C1.77614 7 2 7.22386 2 7.5ZM13.5 8C13.7761 8 14 7.77614 14 7.5C14 7.22386 13.7761 7 13.5 7C13.2239 7 13 7.22386 13 7.5C13 7.77614 13.2239 8 13.5 8ZM2 9.5C2 9.77614 1.77614 10 1.5 10C1.22386 10 1 9.77614 1 9.5C1 9.22386 1.22386 9 1.5 9C1.77614 9 2 9.22386 2 9.5ZM13.5 10C13.7761 10 14 9.77614 14 9.5C14 9.22386 13.7761 9 13.5 9C13.2239 9 13 9.22386 13 9.5C13 9.77614 13.2239 10 13.5 10ZM2 11.5C2 11.7761 1.77614 12 1.5 12C1.22386 12 1 11.7761 1 11.5C1 11.2239 1.22386 11 1.5 11C1.77614 11 2 11.2239 2 11.5ZM13.5 12C13.7761 12 14 11.7761 14 11.5C14 11.2239 13.7761 11 13.5 11C13.2239 11 13 11.2239 13 11.5C13 11.7761 13.2239 12 13.5 12ZM2 13.5C2 13.7761 1.77614 14 1.5 14C1.22386 14 1 13.7761 1 13.5C1 13.2239 1.22386 13 1.5 13C1.77614 13 2 13.2239 2 13.5ZM13.5 14C13.7761 14 14 13.7761 14 13.5C14 13.2239 13.7761 13 13.5 13C13.2239 13 13 13.2239 13 13.5C13 13.7761 13.2239 14 13.5 14Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/cookie.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.0697 1.76746C12.4807 1.21947 11.4605 0.454311 11.0495 1.0023C10.6385 1.55028 11.6588 2.31544 12.0697 1.76746ZM8.39263 1.07811C7.15585 0.950602 5.7823 1.16348 4.58433 1.70937C3.38552 2.25563 2.32735 3.15309 1.78844 4.41832C1.37574 5.38724 1.01715 6.28113 1.00088 7.44354C0.984724 8.59844 1.30522 9.96898 2.13174 11.928C2.61142 13.0649 4.03963 13.5446 5.13895 13.8079C6.40836 14.1119 7.80857 14.1914 8.6644 14.0742C9.36515 13.9782 10.1448 13.8284 10.7987 13.297C11.8977 12.4039 12.9009 11.3955 13.4994 10.3393C14.104 9.27221 14.3256 8.09207 13.7216 6.95324C13.5628 6.65373 13.316 6.57734 13.0412 6.4923C12.9374 6.46016 12.8295 6.42678 12.7209 6.37966C11.6211 5.90234 10.9646 5.34963 10.9135 5.02876C10.8656 4.72808 10.9221 4.51463 10.9811 4.29181C11.0129 4.17199 11.0453 4.04947 11.0626 3.90922C11.0838 3.73737 11.0814 3.33319 10.6996 3.12761C10.4048 2.96888 10.2164 2.65843 10.0407 2.36904C9.99742 2.29775 9.95492 2.22773 9.9118 2.16158C9.62634 1.72367 9.20769 1.16213 8.39263 1.07811ZM4.99899 2.61935C3.96483 3.09058 3.12554 3.83097 2.70846 4.81018C2.29808 5.77368 2.01406 6.50873 2.00079 7.45753C1.98741 8.41385 2.25043 9.6368 3.0531 11.5393C3.39181 12.3421 4.62167 12.6557 5.37186 12.8354C6.5493 13.1174 7.822 13.1802 8.52868 13.0834C9.21271 12.9897 9.74568 12.8642 10.1681 12.5209C11.229 11.6587 12.121 10.7435 12.6293 9.84635C12.9349 9.30709 13.5141 7.7028 12.6292 7.3873C10.7539 6.71875 10.262 6.06669 9.99011 5.41268C9.80915 4.97744 9.82868 4.52282 9.95741 4.07885L9.95741 4.07884C9.97662 4.0126 9.99538 3.94791 10.0334 3.88882C9.81857 3.73676 9.6515 3.55195 9.51464 3.3715C9.42876 3.25828 9.3469 3.12099 9.26197 2.97856C9.01866 2.57052 8.75018 2.12027 8.29008 2.07283C7.22889 1.96343 6.03398 2.14772 4.99899 2.61935ZM13.2081 3.77471C13.441 3.22671 12.4547 2.63606 12.0822 3.10163C11.5817 3.72732 12.9029 4.49281 13.2081 3.77471ZM14.3672 2.26031C14.9668 2.27493 15.1551 1.11603 14.5718 0.949371C13.8076 0.731026 13.5918 2.24139 14.3672 2.26031ZM14.2857 5.09098C14.8644 5.10004 15.0462 4.38222 14.4832 4.27899C13.7455 4.14375 13.5373 5.07927 14.2857 5.09098ZM6.9075 4.28672C6.46898 4.66754 6.0522 4.15185 5.97983 3.7365C5.86848 3.09744 6.33696 2.56856 6.94823 2.91156C7.43344 3.18382 7.26678 3.97471 6.9075 4.28672ZM4.94455 5.88184C5.40885 5.41754 4.59567 4.57013 4.11425 5.05154C3.83338 5.33242 4.00936 5.65376 4.23744 5.88184C4.43271 6.0771 4.74929 6.0771 4.94455 5.88184ZM6.97716 6.71984C7.31181 7.38914 8.48804 6.79159 7.99413 6.14788C7.86519 5.97983 7.68657 5.9494 7.62145 5.94207C7.21217 5.89601 6.76349 6.2925 6.97716 6.71984ZM6.98798 8.72461C7.14066 9.1188 7.51122 9.3187 7.91915 9.1633C8.27434 9.02799 8.33186 8.39689 8.17175 8.07427C8.02331 7.77514 7.63956 7.67793 7.33747 7.79417C6.98512 7.92976 6.85672 8.38708 6.98576 8.71889L6.98798 8.72461ZM10.3885 8.84081C10.7575 8.6566 11.4617 8.82771 11.4617 9.31199C11.4617 9.71286 10.9587 10.2165 10.5634 10.2826C10.1813 10.3465 9.70515 9.97581 9.76648 9.57718C9.81445 9.26539 10.1217 8.97401 10.3885 8.84081ZM7.56704 10.8432C7.33461 10.7502 7.14353 10.8601 7.11437 10.8769L7.11279 10.8778C6.90782 10.9949 6.71383 11.2439 6.6747 11.4842C6.59018 12.0034 7.13199 12.1239 7.52661 12.0987C8.2074 12.0553 8.06547 11.0426 7.56704 10.8432ZM4.8805 10.8932C5.0674 10.7723 5.15658 10.5363 5.08293 10.3153C4.93046 9.79687 4.3246 9.71252 3.96561 10.1297C3.79336 10.3299 3.80749 10.6274 3.99214 10.8105L3.99495 10.814L3.9979 10.8176C4.22025 11.0942 4.63624 11.1857 4.8805 10.8932ZM3.04695 7.81318C3.33147 8.0977 3.60077 8.15067 3.98443 8.05859C4.60826 7.90887 4.13814 6.24299 3.047 6.87296C2.70939 7.06788 2.86716 7.63339 3.04695 7.81318Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/copy.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1 9.50006C1 10.3285 1.67157 11.0001 2.5 11.0001H4L4 10.0001H2.5C2.22386 10.0001 2 9.7762 2 9.50006L2 2.50006C2 2.22392 2.22386 2.00006 2.5 2.00006L9.5 2.00006C9.77614 2.00006 10 2.22392 10 2.50006V4.00002H5.5C4.67158 4.00002 4 4.67159 4 5.50002V12.5C4 13.3284 4.67158 14 5.5 14H12.5C13.3284 14 14 13.3284 14 12.5V5.50002C14 4.67159 13.3284 4.00002 12.5 4.00002H11V2.50006C11 1.67163 10.3284 1.00006 9.5 1.00006H2.5C1.67157 1.00006 1 1.67163 1 2.50006V9.50006ZM5 5.50002C5 5.22388 5.22386 5.00002 5.5 5.00002H12.5C12.7761 5.00002 13 5.22388 13 5.50002V12.5C13 12.7762 12.7761 13 12.5 13H5.5C5.22386 13 5 12.7762 5 12.5V5.50002Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/corner-bottom-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9.87737 12H9.9H11.5C11.7761 12 12 11.7761 12 11.5C12 11.2239 11.7761 11 11.5 11H9.9C8.77164 11 7.95545 10.9996 7.31352 10.9472C6.67744 10.8952 6.25662 10.7946 5.91103 10.6185C5.25247 10.283 4.71703 9.74753 4.38148 9.08897C4.20539 8.74338 4.10481 8.32256 4.05284 7.68648C4.00039 7.04455 4 6.22836 4 5.1V3.5C4 3.22386 3.77614 3 3.5 3C3.22386 3 3 3.22386 3 3.5V5.1V5.12263C3 6.22359 3 7.08052 3.05616 7.76791C3.11318 8.46584 3.23058 9.0329 3.49047 9.54296C3.9219 10.3897 4.61031 11.0781 5.45704 11.5095C5.9671 11.7694 6.53416 11.8868 7.23209 11.9438C7.91948 12 8.77641 12 9.87737 12Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/corner-bottom-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.12263 12H5.1H3.5C3.22386 12 3 11.7761 3 11.5C3 11.2239 3.22386 11 3.5 11H5.1C6.22836 11 7.04455 10.9996 7.68648 10.9472C8.32256 10.8952 8.74338 10.7946 9.08897 10.6185C9.74753 10.283 10.283 9.74753 10.6185 9.08897C10.7946 8.74338 10.8952 8.32256 10.9472 7.68648C10.9996 7.04455 11 6.22836 11 5.1V3.5C11 3.22386 11.2239 3 11.5 3C11.7761 3 12 3.22386 12 3.5V5.1V5.12263C12 6.22359 12 7.08052 11.9438 7.76791C11.8868 8.46584 11.7694 9.0329 11.5095 9.54296C11.0781 10.3897 10.3897 11.0781 9.54296 11.5095C9.0329 11.7694 8.46584 11.8868 7.76791 11.9438C7.08052 12 6.22359 12 5.12263 12Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/corner-top-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9.87737 3H9.9H11.5C11.7761 3 12 3.22386 12 3.5C12 3.77614 11.7761 4 11.5 4H9.9C8.77164 4 7.95545 4.00039 7.31352 4.05284C6.67744 4.10481 6.25662 4.20539 5.91103 4.38148C5.25247 4.71703 4.71703 5.25247 4.38148 5.91103C4.20539 6.25662 4.10481 6.67744 4.05284 7.31352C4.00039 7.95545 4 8.77164 4 9.9V11.5C4 11.7761 3.77614 12 3.5 12C3.22386 12 3 11.7761 3 11.5V9.9V9.87737C3 8.77641 3 7.91948 3.05616 7.23209C3.11318 6.53416 3.23058 5.9671 3.49047 5.45704C3.9219 4.61031 4.61031 3.9219 5.45704 3.49047C5.9671 3.23058 6.53416 3.11318 7.23209 3.05616C7.91948 3 8.77641 3 9.87737 3Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/corner-top-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.12263 3H5.1H3.5C3.22386 3 3 3.22386 3 3.5C3 3.77614 3.22386 4 3.5 4H5.1C6.22836 4 7.04455 4.00039 7.68648 4.05284C8.32256 4.10481 8.74338 4.20539 9.08897 4.38148C9.74753 4.71703 10.283 5.25247 10.6185 5.91103C10.7946 6.25662 10.8952 6.67744 10.9472 7.31352C10.9996 7.95545 11 8.77164 11 9.9V11.5C11 11.7761 11.2239 12 11.5 12C11.7761 12 12 11.7761 12 11.5V9.9V9.87737C12 8.77641 12 7.91948 11.9438 7.23209C11.8868 6.53416 11.7694 5.9671 11.5095 5.45704C11.0781 4.61031 10.3897 3.9219 9.54296 3.49047C9.0329 3.23058 8.46584 3.11318 7.76791 3.05616C7.08052 3 6.22359 3 5.12263 3Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/corners.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.5 2L4.87935 2C4.47687 1.99999 4.14469 1.99999 3.87409 2.0221C3.59304 2.04506 3.33469 2.09434 3.09202 2.21799C2.7157 2.40973 2.40973 2.7157 2.21799 3.09202C2.09434 3.33469 2.04506 3.59304 2.0221 3.87409C1.99999 4.14468 1.99999 4.47686 2 4.87933V4.87935V5.5C2 5.77614 2.22386 6 2.5 6C2.77614 6 3 5.77614 3 5.5V4.9C3 4.47171 3.00039 4.18056 3.01878 3.95552C3.03669 3.73631 3.06915 3.62421 3.10899 3.54601C3.20487 3.35785 3.35785 3.20487 3.54601 3.10899C3.62421 3.06915 3.73631 3.03669 3.95552 3.01878C4.18056 3.00039 4.47171 3 4.9 3H5.5C5.77614 3 6 2.77614 6 2.5C6 2.22386 5.77614 2 5.5 2ZM13 9.5C13 9.22386 12.7761 9 12.5 9C12.2239 9 12 9.22386 12 9.5V10.1C12 10.5283 11.9996 10.8194 11.9812 11.0445C11.9633 11.2637 11.9309 11.3758 11.891 11.454C11.7951 11.6422 11.6422 11.7951 11.454 11.891C11.3758 11.9309 11.2637 11.9633 11.0445 11.9812C10.8194 11.9996 10.5283 12 10.1 12H9.5C9.22386 12 9 12.2239 9 12.5C9 12.7761 9.22386 13 9.5 13H10.1206C10.5231 13 10.8553 13 11.1259 12.9779C11.407 12.9549 11.6653 12.9057 11.908 12.782C12.2843 12.5903 12.5903 12.2843 12.782 11.908C12.9057 11.6653 12.9549 11.407 12.9779 11.1259C13 10.8553 13 10.5232 13 10.1207V10.1207V10.1207V10.1206V9.5ZM2.5 9C2.77614 9 3 9.22386 3 9.5V10.1C3 10.5283 3.00039 10.8194 3.01878 11.0445C3.03669 11.2637 3.06915 11.3758 3.10899 11.454C3.20487 11.6422 3.35785 11.7951 3.54601 11.891C3.62421 11.9309 3.73631 11.9633 3.95552 11.9812C4.18056 11.9996 4.47171 12 4.9 12H5.5C5.77614 12 6 12.2239 6 12.5C6 12.7761 5.77614 13 5.5 13H4.87935C4.47687 13 4.14469 13 3.87409 12.9779C3.59304 12.9549 3.33469 12.9057 3.09202 12.782C2.7157 12.5903 2.40973 12.2843 2.21799 11.908C2.09434 11.6653 2.04506 11.407 2.0221 11.1259C1.99999 10.8553 1.99999 10.5231 2 10.1207V10.1206V10.1V9.5C2 9.22386 2.22386 9 2.5 9ZM10.1 3C10.5283 3 10.8194 3.00039 11.0445 3.01878C11.2637 3.03669 11.3758 3.06915 11.454 3.10899C11.6422 3.20487 11.7951 3.35785 11.891 3.54601C11.9309 3.62421 11.9633 3.73631 11.9812 3.95552C11.9996 4.18056 12 4.47171 12 4.9V5.5C12 5.77614 12.2239 6 12.5 6C12.7761 6 13 5.77614 13 5.5V4.87935V4.87934C13 4.47686 13 4.14468 12.9779 3.87409C12.9549 3.59304 12.9057 3.33469 12.782 3.09202C12.5903 2.7157 12.2843 2.40973 11.908 2.21799C11.6653 2.09434 11.407 2.04506 11.1259 2.0221C10.8553 1.99999 10.5231 1.99999 10.1206 2L10.1 2H9.5C9.22386 2 9 2.22386 9 2.5C9 2.77614 9.22386 3 9.5 3H10.1Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/countdown-timer.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.15 7.49998C13.15 4.66458 10.9402 1.84998 7.50002 1.84998C4.7217 1.84998 3.34851 3.90636 2.76336 4.99997H4.5C4.77614 4.99997 5 5.22383 5 5.49997C5 5.77611 4.77614 5.99997 4.5 5.99997H1.5C1.22386 5.99997 1 5.77611 1 5.49997V2.49997C1 2.22383 1.22386 1.99997 1.5 1.99997C1.77614 1.99997 2 2.22383 2 2.49997V4.31318C2.70453 3.07126 4.33406 0.849976 7.50002 0.849976C11.5628 0.849976 14.15 4.18537 14.15 7.49998C14.15 10.8146 11.5628 14.15 7.50002 14.15C5.55618 14.15 3.93778 13.3808 2.78548 12.2084C2.16852 11.5806 1.68668 10.839 1.35816 10.0407C1.25306 9.78536 1.37488 9.49315 1.63024 9.38806C1.8856 9.28296 2.17781 9.40478 2.2829 9.66014C2.56374 10.3425 2.97495 10.9745 3.4987 11.5074C4.47052 12.4963 5.83496 13.15 7.50002 13.15C10.9402 13.15 13.15 10.3354 13.15 7.49998ZM7 10V5.00001H8V10H7Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/counter-clockwise-clock.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.15 7.49998C13.15 4.66458 10.9402 1.84998 7.50002 1.84998C4.72167 1.84998 3.34849 3.9064 2.76335 5H4.5C4.77614 5 5 5.22386 5 5.5C5 5.77614 4.77614 6 4.5 6H1.5C1.22386 6 1 5.77614 1 5.5V2.5C1 2.22386 1.22386 2 1.5 2C1.77614 2 2 2.22386 2 2.5V4.31318C2.70453 3.07126 4.33406 0.849976 7.50002 0.849976C11.5628 0.849976 14.15 4.18537 14.15 7.49998C14.15 10.8146 11.5628 14.15 7.50002 14.15C5.55618 14.15 3.93778 13.3808 2.78548 12.2084C2.16852 11.5806 1.68668 10.839 1.35816 10.0407C1.25306 9.78536 1.37488 9.49315 1.63024 9.38806C1.8856 9.28296 2.17781 9.40478 2.2829 9.66014C2.56374 10.3425 2.97495 10.9745 3.4987 11.5074C4.47052 12.4963 5.83496 13.15 7.50002 13.15C10.9402 13.15 13.15 10.3354 13.15 7.49998ZM7.5 4.00001C7.77614 4.00001 8 4.22387 8 4.50001V7.29291L9.85355 9.14646C10.0488 9.34172 10.0488 9.65831 9.85355 9.85357C9.65829 10.0488 9.34171 10.0488 9.14645 9.85357L7.14645 7.85357C7.05268 7.7598 7 7.63262 7 7.50001V4.50001C7 4.22387 7.22386 4.00001 7.5 4.00001Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/crop.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.5 8.00684e-07C3.77614 7.88614e-07 4 0.223859 4 0.500001L4 3.00006L11.5 3.00006C11.7761 3.00006 12 3.22392 12 3.50006L12 11.0001L14.5 11C14.7761 11 15 11.2238 15 11.5C15 11.7761 14.7762 12 14.5 12L12 12.0001L12 14.5C12 14.7761 11.7761 15 11.5 15C11.2239 15 11 14.7761 11 14.5L11 12.0001L3.5 12.0001C3.22386 12.0001 3 11.7762 3 11.5001L3 4.00005L0.499989 4C0.223847 4 -6.10541e-06 3.77613 -5.02576e-07 3.49999C5.13006e-06 3.22385 0.223867 3 0.50001 3L3 3.00005L3 0.500001C3 0.223859 3.22386 8.12755e-07 3.5 8.00684e-07ZM4 4.00006L4 11.0001L11 11.0001L11 4.00006L4 4.00006Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/cross-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.8536 2.85355C13.0488 2.65829 13.0488 2.34171 12.8536 2.14645C12.6583 1.95118 12.3417 1.95118 12.1464 2.14645L7.5 6.79289L2.85355 2.14645C2.65829 1.95118 2.34171 1.95118 2.14645 2.14645C1.95118 2.34171 1.95118 2.65829 2.14645 2.85355L6.79289 7.5L2.14645 12.1464C1.95118 12.3417 1.95118 12.6583 2.14645 12.8536C2.34171 13.0488 2.65829 13.0488 2.85355 12.8536L7.5 8.20711L12.1464 12.8536C12.3417 13.0488 12.6583 13.0488 12.8536 12.8536C13.0488 12.6583 13.0488 12.3417 12.8536 12.1464L8.20711 7.5L12.8536 2.85355Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/cross-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11.7816 4.03157C12.0062 3.80702 12.0062 3.44295 11.7816 3.2184C11.5571 2.99385 11.193 2.99385 10.9685 3.2184L7.50005 6.68682L4.03164 3.2184C3.80708 2.99385 3.44301 2.99385 3.21846 3.2184C2.99391 3.44295 2.99391 3.80702 3.21846 4.03157L6.68688 7.49999L3.21846 10.9684C2.99391 11.193 2.99391 11.557 3.21846 11.7816C3.44301 12.0061 3.80708 12.0061 4.03164 11.7816L7.50005 8.31316L10.9685 11.7816C11.193 12.0061 11.5571 12.0061 11.7816 11.7816C12.0062 11.557 12.0062 11.193 11.7816 10.9684L8.31322 7.49999L11.7816 4.03157Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/cross-circled.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.877075 7.49988C0.877075 3.84219 3.84222 0.877045 7.49991 0.877045C11.1576 0.877045 14.1227 3.84219 14.1227 7.49988C14.1227 11.1575 11.1576 14.1227 7.49991 14.1227C3.84222 14.1227 0.877075 11.1575 0.877075 7.49988ZM7.49991 1.82704C4.36689 1.82704 1.82708 4.36686 1.82708 7.49988C1.82708 10.6329 4.36689 13.1727 7.49991 13.1727C10.6329 13.1727 13.1727 10.6329 13.1727 7.49988C13.1727 4.36686 10.6329 1.82704 7.49991 1.82704ZM9.85358 5.14644C10.0488 5.3417 10.0488 5.65829 9.85358 5.85355L8.20713 7.49999L9.85358 9.14644C10.0488 9.3417 10.0488 9.65829 9.85358 9.85355C9.65832 10.0488 9.34173 10.0488 9.14647 9.85355L7.50002 8.2071L5.85358 9.85355C5.65832 10.0488 5.34173 10.0488 5.14647 9.85355C4.95121 9.65829 4.95121 9.3417 5.14647 9.14644L6.79292 7.49999L5.14647 5.85355C4.95121 5.65829 4.95121 5.3417 5.14647 5.14644C5.34173 4.95118 5.65832 4.95118 5.85358 5.14644L7.50002 6.79289L9.14647 5.14644C9.34173 4.95118 9.65832 4.95118 9.85358 5.14644Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/crosshair-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.877075 7.50207C0.877075 3.84319 3.84319 0.877075 7.50208 0.877075C11.1609 0.877075 14.1271 3.84319 14.1271 7.50207C14.1271 11.1609 11.1609 14.1271 7.50208 14.1271C3.84319 14.1271 0.877075 11.1609 0.877075 7.50207ZM1.84898 7.00003C2.0886 4.26639 4.26639 2.0886 7.00003 1.84898V4.50003C7.00003 4.77617 7.22388 5.00003 7.50003 5.00003C7.77617 5.00003 8.00003 4.77617 8.00003 4.50003V1.84862C10.7356 2.08643 12.9154 4.26502 13.1552 7.00003H10.5C10.2239 7.00003 10 7.22388 10 7.50003C10 7.77617 10.2239 8.00003 10.5 8.00003H13.1555C12.9176 10.7369 10.7369 12.9176 8.00003 13.1555V10.5C8.00003 10.2239 7.77617 10 7.50003 10C7.22388 10 7.00003 10.2239 7.00003 10.5V13.1552C4.26502 12.9154 2.08643 10.7356 1.84862 8.00003H4.50003C4.77617 8.00003 5.00003 7.77617 5.00003 7.50003C5.00003 7.22388 4.77617 7.00003 4.50003 7.00003H1.84898Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/crosshair-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 0C7.77614 0 8 0.223858 8 0.5V1.80687C10.6922 2.0935 12.8167 4.28012 13.0068 7H14.5C14.7761 7 15 7.22386 15 7.5C15 7.77614 14.7761 8 14.5 8H12.9888C12.7094 10.6244 10.6244 12.7094 8 12.9888V14.5C8 14.7761 7.77614 15 7.5 15C7.22386 15 7 14.7761 7 14.5V13.0068C4.28012 12.8167 2.0935 10.6922 1.80687 8H0.5C0.223858 8 0 7.77614 0 7.5C0 7.22386 0.223858 7 0.5 7H1.78886C1.98376 4.21166 4.21166 1.98376 7 1.78886V0.5C7 0.223858 7.22386 0 7.5 0ZM8 12.0322V9.5C8 9.22386 7.77614 9 7.5 9C7.22386 9 7 9.22386 7 9.5V12.054C4.80517 11.8689 3.04222 10.1668 2.76344 8H5.5C5.77614 8 6 7.77614 6 7.5C6 7.22386 5.77614 7 5.5 7H2.7417C2.93252 4.73662 4.73662 2.93252 7 2.7417V5.5C7 5.77614 7.22386 6 7.5 6C7.77614 6 8 5.77614 8 5.5V2.76344C10.1668 3.04222 11.8689 4.80517 12.054 7H9.5C9.22386 7 9 7.22386 9 7.5C9 7.77614 9.22386 8 9.5 8H12.0322C11.7621 10.0991 10.0991 11.7621 8 12.0322Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/crumpled-paper.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.60913 0.0634287C4.39082 0.0088505 4.16575 0.12393 4.08218 0.332867L3.1538 2.6538L0.832866 3.58218C0.702884 3.63417 0.604504 3.7437 0.566705 3.87849C0.528906 4.01329 0.555994 4.158 0.639992 4.26999L2.01148 6.09864L1.06343 9.89085C1.00944 10.1068 1.12145 10.3298 1.32691 10.4154L4.20115 11.613L5.62557 13.7496C5.73412 13.9124 5.93545 13.9864 6.12362 13.9327L9.62362 12.9327C9.62988 12.9309 9.63611 12.929 9.64229 12.9269L12.6423 11.9269C12.7923 11.8769 12.905 11.7519 12.9393 11.5976L13.9393 7.09761C13.9776 6.92506 13.9114 6.74605 13.77 6.63999L11.95 5.27499V2.99999C11.95 2.82955 11.8537 2.67373 11.7012 2.5975L8.70124 1.0975C8.67187 1.08282 8.64098 1.07139 8.60913 1.06343L4.60913 0.0634287ZM11.4323 6.01173L12.7748 7.01858L10.2119 9.15429C10.1476 9.20786 10.0995 9.2783 10.0731 9.35769L9.25382 11.8155L7.73849 10.8684C7.52774 10.7367 7.25011 10.8007 7.11839 11.0115C6.98667 11.2222 7.05074 11.4999 7.26149 11.6316L8.40341 12.3453L6.19221 12.9771L4.87441 11.0004C4.82513 10.9265 4.75508 10.8688 4.67307 10.8346L2.03046 9.73352L2.85134 6.44999H4.99999C5.24852 6.44999 5.44999 6.24852 5.44999 5.99999C5.44999 5.75146 5.24852 5.54999 4.99999 5.54999H2.72499L1.7123 4.19974L3.51407 3.47903L6.35769 4.4269C6.53655 4.48652 6.73361 4.42832 6.85138 4.28111L8.62413 2.06518L11.05 3.27811V5.19533L8.83287 6.08218C8.70996 6.13134 8.61494 6.23212 8.57308 6.35769L8.07308 7.85769C7.99449 8.09346 8.12191 8.34831 8.35769 8.4269C8.59346 8.50549 8.84831 8.37807 8.9269 8.14229L9.3609 6.84029L11.4323 6.01173ZM7.71052 1.76648L6.34462 3.47386L4.09505 2.724L4.77192 1.03183L7.71052 1.76648ZM10.2115 11.7885L12.116 11.1537L12.7745 8.19034L10.8864 9.76374L10.2115 11.7885Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/cube.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.28856 0.796908C7.42258 0.734364 7.57742 0.734364 7.71144 0.796908L13.7114 3.59691C13.8875 3.67906 14 3.85574 14 4.05V10.95C14 11.1443 13.8875 11.3209 13.7114 11.4031L7.71144 14.2031C7.57742 14.2656 7.42258 14.2656 7.28856 14.2031L1.28856 11.4031C1.11252 11.3209 1 11.1443 1 10.95V4.05C1 3.85574 1.11252 3.67906 1.28856 3.59691L7.28856 0.796908ZM2 4.80578L7 6.93078V12.9649L2 10.6316V4.80578ZM8 12.9649L13 10.6316V4.80578L8 6.93078V12.9649ZM7.5 6.05672L12.2719 4.02866L7.5 1.80176L2.72809 4.02866L7.5 6.05672Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/cursor-arrow.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.29227 0.048984C3.47033 -0.032338 3.67946 -0.00228214 3.8274 0.125891L12.8587 7.95026C13.0134 8.08432 13.0708 8.29916 13.0035 8.49251C12.9362 8.68586 12.7578 8.81866 12.5533 8.82768L9.21887 8.97474L11.1504 13.2187C11.2648 13.47 11.1538 13.7664 10.9026 13.8808L8.75024 14.8613C8.499 14.9758 8.20255 14.8649 8.08802 14.6137L6.15339 10.3703L3.86279 12.7855C3.72196 12.934 3.50487 12.9817 3.31479 12.9059C3.1247 12.8301 3 12.6461 3 12.4414V0.503792C3 0.308048 3.11422 0.130306 3.29227 0.048984ZM4 1.59852V11.1877L5.93799 9.14425C6.05238 9.02363 6.21924 8.96776 6.38319 8.99516C6.54715 9.02256 6.68677 9.12965 6.75573 9.2809L8.79056 13.7441L10.0332 13.178L8.00195 8.71497C7.93313 8.56376 7.94391 8.38824 8.03072 8.24659C8.11753 8.10494 8.26903 8.01566 8.435 8.00834L11.2549 7.88397L4 1.59852Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/cursor-text.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.5 1C4.22386 1 4 1.22386 4 1.5C4 1.77614 4.22386 2 4.5 2C5.42215 2 6.0399 2.23054 6.42075 2.56379C6.79286 2.88939 7 3.36626 7 4V7H5.75C5.47386 7 5.25 7.22386 5.25 7.5C5.25 7.77614 5.47386 8 5.75 8H7V11C7 11.6337 6.79286 12.1106 6.42075 12.4362C6.0399 12.7695 5.42215 13 4.5 13C4.22386 13 4 13.2239 4 13.5C4 13.7761 4.22386 14 4.5 14C5.57785 14 6.4601 13.7305 7.07925 13.1888C7.24168 13.0467 7.38169 12.8896 7.5 12.7198C7.61832 12.8896 7.75832 13.0467 7.92075 13.1888C8.5399 13.7305 9.42215 14 10.5 14C10.7761 14 11 13.7761 11 13.5C11 13.2239 10.7761 13 10.5 13C9.57785 13 8.9601 12.7695 8.57925 12.4362C8.20714 12.1106 8 11.6337 8 11V8H9.25C9.52614 8 9.75 7.77614 9.75 7.5C9.75 7.22386 9.52614 7 9.25 7H8V4C8 3.36626 8.20714 2.88939 8.57925 2.56379C8.9601 2.23054 9.57785 2 10.5 2C10.7761 2 11 1.77614 11 1.5C11 1.22386 10.7761 1 10.5 1C9.42215 1 8.5399 1.26946 7.92075 1.81121C7.75832 1.95333 7.61832 2.11043 7.5 2.28023C7.38168 2.11043 7.24168 1.95333 7.07925 1.81121C6.4601 1.26946 5.57785 1 4.5 1Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/dash.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5 7.5C5 7.22386 5.22386 7 5.5 7H9.5C9.77614 7 10 7.22386 10 7.5C10 7.77614 9.77614 8 9.5 8H5.5C5.22386 8 5 7.77614 5 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/dashboard.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.8 1L2.74967 0.99997C2.52122 0.999752 2.32429 0.999564 2.14983 1.04145C1.60136 1.17312 1.17312 1.60136 1.04145 2.14983C0.999564 2.32429 0.999752 2.52122 0.99997 2.74967L1 2.8V5.2L0.99997 5.25033C0.999752 5.47878 0.999564 5.67572 1.04145 5.85017C1.17312 6.39864 1.60136 6.82688 2.14983 6.95856C2.32429 7.00044 2.52122 7.00025 2.74967 7.00003L2.8 7H5.2L5.25033 7.00003C5.47878 7.00025 5.67572 7.00044 5.85017 6.95856C6.39864 6.82688 6.82688 6.39864 6.95856 5.85017C7.00044 5.67572 7.00025 5.47878 7.00003 5.25033L7 5.2V2.8L7.00003 2.74967C7.00025 2.52122 7.00044 2.32429 6.95856 2.14983C6.82688 1.60136 6.39864 1.17312 5.85017 1.04145C5.67572 0.999564 5.47878 0.999752 5.25033 0.99997L5.2 1H2.8ZM2.38328 2.01382C2.42632 2.00348 2.49222 2 2.8 2H5.2C5.50779 2 5.57369 2.00348 5.61672 2.01382C5.79955 2.05771 5.94229 2.20045 5.98619 2.38328C5.99652 2.42632 6 2.49222 6 2.8V5.2C6 5.50779 5.99652 5.57369 5.98619 5.61672C5.94229 5.79955 5.79955 5.94229 5.61672 5.98619C5.57369 5.99652 5.50779 6 5.2 6H2.8C2.49222 6 2.42632 5.99652 2.38328 5.98619C2.20045 5.94229 2.05771 5.79955 2.01382 5.61672C2.00348 5.57369 2 5.50779 2 5.2V2.8C2 2.49222 2.00348 2.42632 2.01382 2.38328C2.05771 2.20045 2.20045 2.05771 2.38328 2.01382ZM9.8 1L9.74967 0.99997C9.52122 0.999752 9.32429 0.999564 9.14983 1.04145C8.60136 1.17312 8.17312 1.60136 8.04145 2.14983C7.99956 2.32429 7.99975 2.52122 7.99997 2.74967L8 2.8V5.2L7.99997 5.25033C7.99975 5.47878 7.99956 5.67572 8.04145 5.85017C8.17312 6.39864 8.60136 6.82688 9.14983 6.95856C9.32429 7.00044 9.52122 7.00025 9.74967 7.00003L9.8 7H12.2L12.2503 7.00003C12.4788 7.00025 12.6757 7.00044 12.8502 6.95856C13.3986 6.82688 13.8269 6.39864 13.9586 5.85017C14.0004 5.67572 14.0003 5.47878 14 5.25033L14 5.2V2.8L14 2.74967C14.0003 2.52122 14.0004 2.32429 13.9586 2.14983C13.8269 1.60136 13.3986 1.17312 12.8502 1.04145C12.6757 0.999564 12.4788 0.999752 12.2503 0.99997L12.2 1H9.8ZM9.38328 2.01382C9.42632 2.00348 9.49222 2 9.8 2H12.2C12.5078 2 12.5737 2.00348 12.6167 2.01382C12.7995 2.05771 12.9423 2.20045 12.9862 2.38328C12.9965 2.42632 13 2.49222 13 2.8V5.2C13 5.50779 12.9965 5.57369 12.9862 5.61672C12.9423 5.79955 12.7995 5.94229 12.6167 5.98619C12.5737 5.99652 12.5078 6 12.2 6H9.8C9.49222 6 9.42632 5.99652 9.38328 5.98619C9.20045 5.94229 9.05771 5.79955 9.01382 5.61672C9.00348 5.57369 9 5.50779 9 5.2V2.8C9 2.49222 9.00348 2.42632 9.01382 2.38328C9.05771 2.20045 9.20045 2.05771 9.38328 2.01382ZM2.74967 7.99997L2.8 8H5.2L5.25033 7.99997C5.47878 7.99975 5.67572 7.99956 5.85017 8.04145C6.39864 8.17312 6.82688 8.60136 6.95856 9.14983C7.00044 9.32429 7.00025 9.52122 7.00003 9.74967L7 9.8V12.2L7.00003 12.2503C7.00025 12.4788 7.00044 12.6757 6.95856 12.8502C6.82688 13.3986 6.39864 13.8269 5.85017 13.9586C5.67572 14.0004 5.47878 14.0003 5.25033 14L5.2 14H2.8L2.74967 14C2.52122 14.0003 2.32429 14.0004 2.14983 13.9586C1.60136 13.8269 1.17312 13.3986 1.04145 12.8502C0.999564 12.6757 0.999752 12.4788 0.99997 12.2503L1 12.2V9.8L0.99997 9.74967C0.999752 9.52122 0.999564 9.32429 1.04145 9.14983C1.17312 8.60136 1.60136 8.17312 2.14983 8.04145C2.32429 7.99956 2.52122 7.99975 2.74967 7.99997ZM2.8 9C2.49222 9 2.42632 9.00348 2.38328 9.01382C2.20045 9.05771 2.05771 9.20045 2.01382 9.38328C2.00348 9.42632 2 9.49222 2 9.8V12.2C2 12.5078 2.00348 12.5737 2.01382 12.6167C2.05771 12.7995 2.20045 12.9423 2.38328 12.9862C2.42632 12.9965 2.49222 13 2.8 13H5.2C5.50779 13 5.57369 12.9965 5.61672 12.9862C5.79955 12.9423 5.94229 12.7995 5.98619 12.6167C5.99652 12.5737 6 12.5078 6 12.2V9.8C6 9.49222 5.99652 9.42632 5.98619 9.38328C5.94229 9.20045 5.79955 9.05771 5.61672 9.01382C5.57369 9.00348 5.50779 9 5.2 9H2.8ZM9.8 8L9.74967 7.99997C9.52122 7.99975 9.32429 7.99956 9.14983 8.04145C8.60136 8.17312 8.17312 8.60136 8.04145 9.14983C7.99956 9.32429 7.99975 9.52122 7.99997 9.74967L8 9.8V12.2L7.99997 12.2503C7.99975 12.4788 7.99956 12.6757 8.04145 12.8502C8.17312 13.3986 8.60136 13.8269 9.14983 13.9586C9.32429 14.0004 9.52122 14.0003 9.74967 14L9.8 14H12.2L12.2503 14C12.4788 14.0003 12.6757 14.0004 12.8502 13.9586C13.3986 13.8269 13.8269 13.3986 13.9586 12.8502C14.0004 12.6757 14.0003 12.4788 14 12.2503L14 12.2V9.8L14 9.74967C14.0003 9.52122 14.0004 9.32429 13.9586 9.14983C13.8269 8.60136 13.3986 8.17312 12.8502 8.04145C12.6757 7.99956 12.4788 7.99975 12.2503 7.99997L12.2 8H9.8ZM9.38328 9.01382C9.42632 9.00348 9.49222 9 9.8 9H12.2C12.5078 9 12.5737 9.00348 12.6167 9.01382C12.7995 9.05771 12.9423 9.20045 12.9862 9.38328C12.9965 9.42632 13 9.49222 13 9.8V12.2C13 12.5078 12.9965 12.5737 12.9862 12.6167C12.9423 12.7995 12.7995 12.9423 12.6167 12.9862C12.5737 12.9965 12.5078 13 12.2 13H9.8C9.49222 13 9.42632 12.9965 9.38328 12.9862C9.20045 12.9423 9.05771 12.7995 9.01382 12.6167C9.00348 12.5737 9 12.5078 9 12.2V9.8C9 9.49222 9.00348 9.42632 9.01382 9.38328C9.05771 9.20045 9.20045 9.05771 9.38328 9.01382Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/desktop-mute.svg+4−0
@@ -0,0 +1,4 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2<path fill-rule="evenodd" clip-rule="evenodd" d="M9.73284 2H1.25C0.559643 2 0 2.55964 0 3.25V10.75C0 11.249 0.292407 11.6797 0.715228 11.8802C0.729901 11.8616 0.74533 11.8435 0.761518 11.8257L1.51545 11H1.25C1.11193 11 1 10.8881 1 10.75V3.25C1 3.11193 1.11193 3 1.25 3H8.8198L9.73284 2ZM13.5232 3L14.316 2.13518C14.7219 2.34168 15 2.76336 15 3.25V10.75C15 11.4404 14.4404 12 13.75 12H9.92659L10.1701 13.2986C10.2336 13.6371 9.97389 13.95 9.62951 13.95H5.37049C5.02612 13.95 4.76645 13.6371 4.82991 13.2986L5.02202 12.2741L6.18991 11H13.75C13.8881 11 14 10.8881 14 10.75V3.25C14 3.11193 13.8881 3 13.75 3H13.5232ZM5.98909 12H9.01091L9.20778 13.05H5.79222L5.98909 12Z" fill="black"/>
3<path d="M13 1L2 13" stroke="black" stroke-linecap="round"/>
4</svg>
assets/icons/radix/desktop.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1 3.25C1 3.11193 1.11193 3 1.25 3H13.75C13.8881 3 14 3.11193 14 3.25V10.75C14 10.8881 13.8881 11 13.75 11H1.25C1.11193 11 1 10.8881 1 10.75V3.25ZM1.25 2C0.559643 2 0 2.55964 0 3.25V10.75C0 11.4404 0.559644 12 1.25 12H5.07341L4.82991 13.2986C4.76645 13.6371 5.02612 13.95 5.37049 13.95H9.62951C9.97389 13.95 10.2336 13.6371 10.1701 13.2986L9.92659 12H13.75C14.4404 12 15 11.4404 15 10.75V3.25C15 2.55964 14.4404 2 13.75 2H1.25ZM9.01091 12H5.98909L5.79222 13.05H9.20778L9.01091 12Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/dimensions.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.00014 2.73895C3.00014 2.94698 2.76087 3.06401 2.59666 2.93628L1.00386 1.69744C0.875177 1.59735 0.875177 1.40286 1.00386 1.30277L2.59666 0.063928C2.76087 -0.0637944 3.00014 0.0532293 3.00014 0.261266V1.00012H9.00009V0.261296C9.00009 0.0532591 9.23936 -0.0637646 9.40358 0.0639578L10.9964 1.3028C11.1251 1.40289 11.1251 1.59738 10.9964 1.69747L9.40358 2.93631C9.23936 3.06404 9.00009 2.94701 9.00009 2.73898V2.00012H3.00014V2.73895ZM9.50002 4.99998H2.50002C2.22388 4.99998 2.00002 5.22384 2.00002 5.49998V12.5C2.00002 12.7761 2.22388 13 2.50002 13H9.50002C9.77616 13 10 12.7761 10 12.5V5.49998C10 5.22384 9.77616 4.99998 9.50002 4.99998ZM2.50002 3.99998C1.67159 3.99998 1.00002 4.67156 1.00002 5.49998V12.5C1.00002 13.3284 1.67159 14 2.50002 14H9.50002C10.3284 14 11 13.3284 11 12.5V5.49998C11 4.67156 10.3284 3.99998 9.50002 3.99998H2.50002ZM14.7389 6.00001H14V12H14.7389C14.9469 12 15.064 12.2393 14.9362 12.4035L13.6974 13.9963C13.5973 14.125 13.4028 14.125 13.3027 13.9963L12.0639 12.4035C11.9362 12.2393 12.0532 12 12.2612 12H13V6.00001H12.2612C12.0532 6.00001 11.9361 5.76074 12.0639 5.59653L13.3027 4.00373C13.4028 3.87505 13.5973 3.87505 13.6974 4.00374L14.9362 5.59653C15.0639 5.76074 14.9469 6.00001 14.7389 6.00001Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/disc.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49991 0.877075C3.84222 0.877075 0.877075 3.84222 0.877075 7.49991C0.877075 11.1576 3.84222 14.1227 7.49991 14.1227C11.1576 14.1227 14.1227 11.1576 14.1227 7.49991C14.1227 3.84222 11.1576 0.877075 7.49991 0.877075ZM1.82708 7.49991C1.82708 4.36689 4.36689 1.82707 7.49991 1.82707C10.6329 1.82707 13.1727 4.36689 13.1727 7.49991C13.1727 10.6329 10.6329 13.1727 7.49991 13.1727C4.36689 13.1727 1.82708 10.6329 1.82708 7.49991ZM8.37287 7.50006C8.37287 7.98196 7.98221 8.37263 7.5003 8.37263C7.01839 8.37263 6.62773 7.98196 6.62773 7.50006C6.62773 7.01815 7.01839 6.62748 7.5003 6.62748C7.98221 6.62748 8.37287 7.01815 8.37287 7.50006ZM9.32287 7.50006C9.32287 8.50664 8.50688 9.32263 7.5003 9.32263C6.49372 9.32263 5.67773 8.50664 5.67773 7.50006C5.67773 6.49348 6.49372 5.67748 7.5003 5.67748C8.50688 5.67748 9.32287 6.49348 9.32287 7.50006Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/discord-logo.svg+13−0
@@ -0,0 +1,13 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <g clip-path="url(#clip0_16200_18)">
3 <path
4 fill-rule="evenodd"
5 clip-rule="evenodd"
6 d="M5.07761 1.80608C5.03403 1.79923 4.98973 1.79818 4.94586 1.80296C4.10147 1.89492 2.81887 2.34979 2.06162 2.7605C2.00944 2.7888 1.96272 2.82617 1.92364 2.87085C1.60757 3.23223 1.32199 3.82069 1.09852 4.37438C0.868566 4.94411 0.678122 5.54455 0.569535 5.97869C0.216388 7.39061 0.0225233 9.08576 -0.00250283 10.6922C-0.00380683 10.7759 0.0159279 10.8586 0.0548912 10.9327C0.358561 11.5102 1.00888 12.0436 1.65781 12.4324C2.31435 12.8257 3.08127 13.1377 3.70193 13.1977C3.85765 13.2127 4.01144 13.154 4.11752 13.039C4.2733 12.8701 4.53643 12.4779 4.73419 12.1753C4.8395 12.0141 4.93692 11.8616 5.00792 11.7495C5.01277 11.7419 5.01749 11.7344 5.02209 11.7271C5.69448 11.8888 6.51526 12.0001 7.50002 12.0001C8.48373 12.0001 9.30381 11.889 9.97579 11.7276C9.98029 11.7347 9.98491 11.742 9.98964 11.7495C10.0606 11.8616 10.1581 12.0141 10.2634 12.1753C10.4611 12.4779 10.7243 12.8701 10.88 13.039C10.9861 13.154 11.1399 13.2127 11.2956 13.1977C11.9163 13.1377 12.6832 12.8257 13.3398 12.4324C13.9887 12.0436 14.639 11.5102 14.9427 10.9327C14.9816 10.8586 15.0014 10.7759 15.0001 10.6922C14.975 9.08576 14.7812 7.39061 14.428 5.97869C14.3194 5.54455 14.129 4.94411 13.899 4.37438C13.6756 3.82069 13.39 3.23223 13.0739 2.87085C13.0348 2.82617 12.9881 2.7888 12.9359 2.7605C12.1787 2.34979 10.8961 1.89492 10.0517 1.80296C10.0078 1.79818 9.96353 1.79923 9.91994 1.80608C9.70897 1.83923 9.5282 1.94775 9.39603 2.04759C9.25626 2.15318 9.12674 2.28293 9.01518 2.41385C8.85191 2.60546 8.69357 2.83966 8.59255 3.06167C8.25187 3.02276 7.88714 3 7.5 3C7.11199 3 6.74647 3.02286 6.40513 3.06193C6.30411 2.83985 6.14571 2.60553 5.98238 2.41385C5.87082 2.28293 5.7413 2.15318 5.60153 2.04759C5.46936 1.94775 5.28859 1.83923 5.07761 1.80608ZM10.9661 11.4207C11.0082 11.4862 11.0536 11.5564 11.1005 11.6283C11.2306 11.8274 11.3589 12.0178 11.4593 12.1584C11.8511 12.0682 12.3479 11.8609 12.8258 11.5746C13.3655 11.2512 13.791 10.881 13.9976 10.5682C13.9647 9.06491 13.779 7.50506 13.4579 6.22133C13.3609 5.83337 13.1849 5.27687 12.9717 4.74866C12.7717 4.25316 12.5596 3.83538 12.3749 3.59492C11.728 3.26047 10.7131 2.90749 10.0495 2.81068C10.0364 2.81863 10.0195 2.82985 9.9988 2.84551C9.93215 2.89586 9.85474 2.97041 9.77633 3.06243C9.72436 3.12342 9.67815 3.18461 9.63842 3.2425C10.006 3.32847 10.3305 3.42907 10.6084 3.5301C10.9749 3.66339 11.2607 3.7976 11.4578 3.90046C11.5565 3.95191 11.633 3.99558 11.6866 4.02748C11.7133 4.04343 11.7344 4.05645 11.7495 4.06603L11.7679 4.07776L11.7737 4.08158L11.7758 4.08296L11.7767 4.08351L11.777 4.08376C11.7772 4.08387 11.7773 4.08397 11.5147 4.47796L11.7774 4.08398C12.0071 4.23715 12.0692 4.54759 11.916 4.77735C11.7631 5.00667 11.4536 5.06896 11.224 4.9169L11.2236 4.91668L11.2232 4.9164L11.223 4.91624L11.2229 4.91622C11.2228 4.91612 11.2226 4.91602 11.5 4.5L11.2226 4.91602L11.2155 4.91151C11.2075 4.90644 11.1939 4.89797 11.1748 4.88658C11.1365 4.86379 11.0764 4.82934 10.9953 4.78704C10.8331 4.7024 10.5876 4.58661 10.2666 4.4699C9.62475 4.23649 8.68273 4 7.5 4C6.31727 4 5.37525 4.23649 4.73337 4.4699C4.4124 4.58661 4.16694 4.7024 4.00472 4.78704C3.92365 4.82934 3.8635 4.86379 3.82524 4.88658C3.80612 4.89797 3.79248 4.90644 3.78445 4.91151L3.77664 4.9165L3.77679 4.9164C3.77688 4.91634 3.77697 4.91628 3.77706 4.91622L3.77679 4.9164L3.77679 4.9164C3.54708 5.0691 3.23703 5.00693 3.08398 4.77735C2.9308 4.54759 2.99288 4.23715 3.22265 4.08398L3.5 4.5C3.22265 4.08398 3.22281 4.08387 3.22298 4.08376L3.22334 4.08351L3.22418 4.08296L3.22627 4.08158L3.23212 4.07776L3.25046 4.06603C3.26562 4.05645 3.28666 4.04343 3.31343 4.02748C3.36697 3.99558 3.44354 3.95191 3.54215 3.90046C3.73931 3.7976 4.0251 3.66339 4.39162 3.5301C4.66894 3.42926 4.99274 3.32886 5.35947 3.24299C5.31967 3.18496 5.27335 3.12359 5.22123 3.06243C5.14282 2.97041 5.06541 2.89586 4.99875 2.84551C4.97802 2.82985 4.96112 2.81863 4.94803 2.81068C4.28449 2.90749 3.26952 3.26047 2.62267 3.59492C2.43795 3.83538 2.22582 4.25316 2.02583 4.74866C1.81264 5.27687 1.63669 5.83337 1.53965 6.22133C1.21857 7.50506 1.03284 9.06491 0.99999 10.5682C1.20654 10.881 1.63205 11.2512 2.17176 11.5746C2.64965 11.8609 3.14642 12.0682 3.53828 12.1584C3.63866 12.0178 3.76696 11.8274 3.89705 11.6283C3.94418 11.5561 3.98976 11.4857 4.03201 11.4199C3.93683 11.3829 3.84649 11.3454 3.76089 11.3077C3.36048 11.1312 3.06623 10.9522 2.86724 10.8123C2.7678 10.7425 2.69228 10.6825 2.63928 10.6376C2.61278 10.6152 2.59191 10.5965 2.5765 10.5823C2.5688 10.5752 2.56246 10.5692 2.55746 10.5644L2.55097 10.5581L2.54847 10.5557L2.54741 10.5546L2.54692 10.5541C2.54669 10.5539 2.54647 10.5537 2.90002 10.2001L2.54647 10.5537C2.35121 10.3584 2.35121 10.0418 2.54647 9.84657C2.74071 9.65233 3.05498 9.65131 3.25048 9.8435L3.25435 9.84712C3.2596 9.85196 3.26989 9.86124 3.28538 9.87436C3.31636 9.90059 3.36819 9.94215 3.44218 9.99415C3.59007 10.0981 3.82706 10.244 4.16415 10.3926C4.83659 10.6889 5.91776 11.0001 7.50002 11.0001C9.08229 11.0001 10.1635 10.6889 10.8359 10.3926C11.173 10.244 11.41 10.0981 11.5579 9.99415C11.6319 9.94215 11.6837 9.90058 11.7147 9.87436C11.7302 9.86124 11.7405 9.85196 11.7457 9.84712L11.7496 9.84351C11.9451 9.65131 12.2593 9.65233 12.4536 9.84657C12.6488 10.0418 12.6488 10.3584 12.4536 10.5537L12.105 10.2051C12.4536 10.5537 12.4534 10.5539 12.4531 10.5541L12.4526 10.5546L12.4516 10.5557L12.4491 10.5581L12.4426 10.5644C12.4376 10.5692 12.4313 10.5752 12.4235 10.5823C12.4081 10.5965 12.3873 10.6152 12.3608 10.6376C12.3078 10.6825 12.2323 10.7425 12.1328 10.8123C11.9338 10.9522 11.6396 11.1312 11.2392 11.3077C11.153 11.3457 11.062 11.3835 10.9661 11.4207ZM4.08049 7.01221C4.32412 6.74984 4.65476 6.60162 5.00007 6.59998C5.34538 6.60162 5.67603 6.74984 5.91966 7.01221C6.16329 7.27459 6.30007 7.62974 6.30007 7.99998C6.30007 8.37021 6.16329 8.72536 5.91966 8.98774C5.67603 9.25011 5.34538 9.39833 5.00007 9.39998C4.65476 9.39833 4.32412 9.25011 4.08049 8.98774C3.83685 8.72536 3.70007 8.37021 3.70007 7.99998C3.70007 7.62974 3.83685 7.27459 4.08049 7.01221ZM9.99885 6.59998C9.65354 6.60162 9.3229 6.74984 9.07926 7.01221C8.83563 7.27459 8.69885 7.62974 8.69885 7.99998C8.69885 8.37021 8.83563 8.72536 9.07926 8.98774C9.3229 9.25011 9.65354 9.39833 9.99885 9.39998C10.3442 9.39833 10.6748 9.25011 10.9184 8.98774C11.1621 8.72536 11.2989 8.37021 11.2989 7.99998C11.2989 7.62974 11.1621 7.27459 10.9184 7.01221C10.6748 6.74984 10.3442 6.60162 9.99885 6.59998Z"
7 fill="currentColor"
8 />
9 </g>
10 <defs>
11 <clipPath id="clip0_16200_18"><path fill="currentColor" d="M0 0H15V15H0z" /></clipPath>
12 </defs>
13</svg>
assets/icons/radix/divider-horizontal.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 7.5C2 7.22386 2.22386 7 2.5 7H12.5C12.7761 7 13 7.22386 13 7.5C13 7.77614 12.7761 8 12.5 8H2.5C2.22386 8 2 7.77614 2 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/divider-vertical.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 2C7.77614 2 8 2.22386 8 2.5L8 12.5C8 12.7761 7.77614 13 7.5 13C7.22386 13 7 12.7761 7 12.5L7 2.5C7 2.22386 7.22386 2 7.5 2Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/dot-filled.svg+6−0
@@ -0,0 +1,6 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 d="M9.875 7.5C9.875 8.81168 8.81168 9.875 7.5 9.875C6.18832 9.875 5.125 8.81168 5.125 7.5C5.125 6.18832 6.18832 5.125 7.5 5.125C8.81168 5.125 9.875 6.18832 9.875 7.5Z"
4 fill="currentColor"
5 />
6</svg>
assets/icons/radix/dot-solid.svg+6−0
@@ -0,0 +1,6 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 d="M9.875 7.5C9.875 8.81168 8.81168 9.875 7.5 9.875C6.18832 9.875 5.125 8.81168 5.125 7.5C5.125 6.18832 6.18832 5.125 7.5 5.125C8.81168 5.125 9.875 6.18832 9.875 7.5Z"
4 fill="currentColor"
5 />
6</svg>
assets/icons/radix/dot.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 9.125C8.39746 9.125 9.125 8.39746 9.125 7.5C9.125 6.60254 8.39746 5.875 7.5 5.875C6.60254 5.875 5.875 6.60254 5.875 7.5C5.875 8.39746 6.60254 9.125 7.5 9.125ZM7.5 10.125C8.94975 10.125 10.125 8.94975 10.125 7.5C10.125 6.05025 8.94975 4.875 7.5 4.875C6.05025 4.875 4.875 6.05025 4.875 7.5C4.875 8.94975 6.05025 10.125 7.5 10.125Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/dots-horizontal.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.625 7.5C3.625 8.12132 3.12132 8.625 2.5 8.625C1.87868 8.625 1.375 8.12132 1.375 7.5C1.375 6.87868 1.87868 6.375 2.5 6.375C3.12132 6.375 3.625 6.87868 3.625 7.5ZM8.625 7.5C8.625 8.12132 8.12132 8.625 7.5 8.625C6.87868 8.625 6.375 8.12132 6.375 7.5C6.375 6.87868 6.87868 6.375 7.5 6.375C8.12132 6.375 8.625 6.87868 8.625 7.5ZM12.5 8.625C13.1213 8.625 13.625 8.12132 13.625 7.5C13.625 6.87868 13.1213 6.375 12.5 6.375C11.8787 6.375 11.375 6.87868 11.375 7.5C11.375 8.12132 11.8787 8.625 12.5 8.625Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/dots-vertical.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.625 2.5C8.625 3.12132 8.12132 3.625 7.5 3.625C6.87868 3.625 6.375 3.12132 6.375 2.5C6.375 1.87868 6.87868 1.375 7.5 1.375C8.12132 1.375 8.625 1.87868 8.625 2.5ZM8.625 7.5C8.625 8.12132 8.12132 8.625 7.5 8.625C6.87868 8.625 6.375 8.12132 6.375 7.5C6.375 6.87868 6.87868 6.375 7.5 6.375C8.12132 6.375 8.625 6.87868 8.625 7.5ZM7.5 13.625C8.12132 13.625 8.625 13.1213 8.625 12.5C8.625 11.8787 8.12132 11.375 7.5 11.375C6.87868 11.375 6.375 11.8787 6.375 12.5C6.375 13.1213 6.87868 13.625 7.5 13.625Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/double-arrow-down.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.85355 2.14645C3.65829 1.95118 3.34171 1.95118 3.14645 2.14645C2.95118 2.34171 2.95118 2.65829 3.14645 2.85355L7.14645 6.85355C7.34171 7.04882 7.65829 7.04882 7.85355 6.85355L11.8536 2.85355C12.0488 2.65829 12.0488 2.34171 11.8536 2.14645C11.6583 1.95118 11.3417 1.95118 11.1464 2.14645L7.5 5.79289L3.85355 2.14645ZM3.85355 8.14645C3.65829 7.95118 3.34171 7.95118 3.14645 8.14645C2.95118 8.34171 2.95118 8.65829 3.14645 8.85355L7.14645 12.8536C7.34171 13.0488 7.65829 13.0488 7.85355 12.8536L11.8536 8.85355C12.0488 8.65829 12.0488 8.34171 11.8536 8.14645C11.6583 7.95118 11.3417 7.95118 11.1464 8.14645L7.5 11.7929L3.85355 8.14645Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/double-arrow-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.85355 3.85355C7.04882 3.65829 7.04882 3.34171 6.85355 3.14645C6.65829 2.95118 6.34171 2.95118 6.14645 3.14645L2.14645 7.14645C1.95118 7.34171 1.95118 7.65829 2.14645 7.85355L6.14645 11.8536C6.34171 12.0488 6.65829 12.0488 6.85355 11.8536C7.04882 11.6583 7.04882 11.3417 6.85355 11.1464L3.20711 7.5L6.85355 3.85355ZM12.8536 3.85355C13.0488 3.65829 13.0488 3.34171 12.8536 3.14645C12.6583 2.95118 12.3417 2.95118 12.1464 3.14645L8.14645 7.14645C7.95118 7.34171 7.95118 7.65829 8.14645 7.85355L12.1464 11.8536C12.3417 12.0488 12.6583 12.0488 12.8536 11.8536C13.0488 11.6583 13.0488 11.3417 12.8536 11.1464L9.20711 7.5L12.8536 3.85355Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/double-arrow-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.14645 11.1464C1.95118 11.3417 1.95118 11.6583 2.14645 11.8536C2.34171 12.0488 2.65829 12.0488 2.85355 11.8536L6.85355 7.85355C7.04882 7.65829 7.04882 7.34171 6.85355 7.14645L2.85355 3.14645C2.65829 2.95118 2.34171 2.95118 2.14645 3.14645C1.95118 3.34171 1.95118 3.65829 2.14645 3.85355L5.79289 7.5L2.14645 11.1464ZM8.14645 11.1464C7.95118 11.3417 7.95118 11.6583 8.14645 11.8536C8.34171 12.0488 8.65829 12.0488 8.85355 11.8536L12.8536 7.85355C13.0488 7.65829 13.0488 7.34171 12.8536 7.14645L8.85355 3.14645C8.65829 2.95118 8.34171 2.95118 8.14645 3.14645C7.95118 3.34171 7.95118 3.65829 8.14645 3.85355L11.7929 7.5L8.14645 11.1464Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/double-arrow-up.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11.1464 6.85355C11.3417 7.04882 11.6583 7.04882 11.8536 6.85355C12.0488 6.65829 12.0488 6.34171 11.8536 6.14645L7.85355 2.14645C7.65829 1.95118 7.34171 1.95118 7.14645 2.14645L3.14645 6.14645C2.95118 6.34171 2.95118 6.65829 3.14645 6.85355C3.34171 7.04882 3.65829 7.04882 3.85355 6.85355L7.5 3.20711L11.1464 6.85355ZM11.1464 12.8536C11.3417 13.0488 11.6583 13.0488 11.8536 12.8536C12.0488 12.6583 12.0488 12.3417 11.8536 12.1464L7.85355 8.14645C7.65829 7.95118 7.34171 7.95118 7.14645 8.14645L3.14645 12.1464C2.95118 12.3417 2.95118 12.6583 3.14645 12.8536C3.34171 13.0488 3.65829 13.0488 3.85355 12.8536L7.5 9.20711L11.1464 12.8536Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/download.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.50005 1.04999C7.74858 1.04999 7.95005 1.25146 7.95005 1.49999V8.41359L10.1819 6.18179C10.3576 6.00605 10.6425 6.00605 10.8182 6.18179C10.994 6.35753 10.994 6.64245 10.8182 6.81819L7.81825 9.81819C7.64251 9.99392 7.35759 9.99392 7.18185 9.81819L4.18185 6.81819C4.00611 6.64245 4.00611 6.35753 4.18185 6.18179C4.35759 6.00605 4.64251 6.00605 4.81825 6.18179L7.05005 8.41359V1.49999C7.05005 1.25146 7.25152 1.04999 7.50005 1.04999ZM2.5 10C2.77614 10 3 10.2239 3 10.5V12C3 12.5539 3.44565 13 3.99635 13H11.0012C11.5529 13 12 12.5528 12 12V10.5C12 10.2239 12.2239 10 12.5 10C12.7761 10 13 10.2239 13 10.5V12C13 13.1041 12.1062 14 11.0012 14H3.99635C2.89019 14 2 13.103 2 12V10.5C2 10.2239 2.22386 10 2.5 10Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/drag-handle-dots-1.svg+26−0
@@ -0,0 +1,26 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <circle cx="4.5" cy="2.5" r=".6" fill="currentColor" />
3 <circle cx="4.5" cy="4.5" r=".6" fill="currentColor" />
4 <circle cx="4.5" cy="6.499" r=".6" fill="currentColor" />
5 <circle cx="4.5" cy="8.499" r=".6" fill="currentColor" />
6 <circle cx="4.5" cy="10.498" r=".6" fill="currentColor" />
7 <circle cx="4.5" cy="12.498" r=".6" fill="currentColor" />
8 <circle cx="6.5" cy="2.5" r=".6" fill="currentColor" />
9 <circle cx="6.5" cy="4.5" r=".6" fill="currentColor" />
10 <circle cx="6.5" cy="6.499" r=".6" fill="currentColor" />
11 <circle cx="6.5" cy="8.499" r=".6" fill="currentColor" />
12 <circle cx="6.5" cy="10.498" r=".6" fill="currentColor" />
13 <circle cx="6.5" cy="12.498" r=".6" fill="currentColor" />
14 <circle cx="8.499" cy="2.5" r=".6" fill="currentColor" />
15 <circle cx="8.499" cy="4.5" r=".6" fill="currentColor" />
16 <circle cx="8.499" cy="6.499" r=".6" fill="currentColor" />
17 <circle cx="8.499" cy="8.499" r=".6" fill="currentColor" />
18 <circle cx="8.499" cy="10.498" r=".6" fill="currentColor" />
19 <circle cx="8.499" cy="12.498" r=".6" fill="currentColor" />
20 <circle cx="10.499" cy="2.5" r=".6" fill="currentColor" />
21 <circle cx="10.499" cy="4.5" r=".6" fill="currentColor" />
22 <circle cx="10.499" cy="6.499" r=".6" fill="currentColor" />
23 <circle cx="10.499" cy="8.499" r=".6" fill="currentColor" />
24 <circle cx="10.499" cy="10.498" r=".6" fill="currentColor" />
25 <circle cx="10.499" cy="12.498" r=".6" fill="currentColor" />
26</svg>
assets/icons/radix/drag-handle-dots-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.5 4.625C6.12132 4.625 6.625 4.12132 6.625 3.5C6.625 2.87868 6.12132 2.375 5.5 2.375C4.87868 2.375 4.375 2.87868 4.375 3.5C4.375 4.12132 4.87868 4.625 5.5 4.625ZM9.5 4.625C10.1213 4.625 10.625 4.12132 10.625 3.5C10.625 2.87868 10.1213 2.375 9.5 2.375C8.87868 2.375 8.375 2.87868 8.375 3.5C8.375 4.12132 8.87868 4.625 9.5 4.625ZM10.625 7.5C10.625 8.12132 10.1213 8.625 9.5 8.625C8.87868 8.625 8.375 8.12132 8.375 7.5C8.375 6.87868 8.87868 6.375 9.5 6.375C10.1213 6.375 10.625 6.87868 10.625 7.5ZM5.5 8.625C6.12132 8.625 6.625 8.12132 6.625 7.5C6.625 6.87868 6.12132 6.375 5.5 6.375C4.87868 6.375 4.375 6.87868 4.375 7.5C4.375 8.12132 4.87868 8.625 5.5 8.625ZM10.625 11.5C10.625 12.1213 10.1213 12.625 9.5 12.625C8.87868 12.625 8.375 12.1213 8.375 11.5C8.375 10.8787 8.87868 10.375 9.5 10.375C10.1213 10.375 10.625 10.8787 10.625 11.5ZM5.5 12.625C6.12132 12.625 6.625 12.1213 6.625 11.5C6.625 10.8787 6.12132 10.375 5.5 10.375C4.87868 10.375 4.375 10.8787 4.375 11.5C4.375 12.1213 4.87868 12.625 5.5 12.625Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/drag-handle-horizontal.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.49998 4.09998C2.27906 4.09998 2.09998 4.27906 2.09998 4.49998C2.09998 4.72089 2.27906 4.89998 2.49998 4.89998H12.5C12.7209 4.89998 12.9 4.72089 12.9 4.49998C12.9 4.27906 12.7209 4.09998 12.5 4.09998H2.49998ZM2.49998 6.09998C2.27906 6.09998 2.09998 6.27906 2.09998 6.49998C2.09998 6.72089 2.27906 6.89998 2.49998 6.89998H12.5C12.7209 6.89998 12.9 6.72089 12.9 6.49998C12.9 6.27906 12.7209 6.09998 12.5 6.09998H2.49998ZM2.09998 8.49998C2.09998 8.27906 2.27906 8.09998 2.49998 8.09998H12.5C12.7209 8.09998 12.9 8.27906 12.9 8.49998C12.9 8.72089 12.7209 8.89998 12.5 8.89998H2.49998C2.27906 8.89998 2.09998 8.72089 2.09998 8.49998ZM2.49998 10.1C2.27906 10.1 2.09998 10.2791 2.09998 10.5C2.09998 10.7209 2.27906 10.9 2.49998 10.9H12.5C12.7209 10.9 12.9 10.7209 12.9 10.5C12.9 10.2791 12.7209 10.1 12.5 10.1H2.49998Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/drag-handle-vertical.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.09998 12.5C4.09998 12.7209 4.27906 12.9 4.49998 12.9C4.72089 12.9 4.89998 12.7209 4.89998 12.5L4.89998 2.50002C4.89998 2.27911 4.72089 2.10003 4.49998 2.10003C4.27906 2.10003 4.09998 2.27911 4.09998 2.50002L4.09998 12.5ZM6.09998 12.5C6.09998 12.7209 6.27906 12.9 6.49998 12.9C6.72089 12.9 6.89998 12.7209 6.89998 12.5L6.89998 2.50002C6.89998 2.27911 6.72089 2.10003 6.49998 2.10003C6.27906 2.10003 6.09998 2.27911 6.09998 2.50002L6.09998 12.5ZM8.49998 12.9C8.27906 12.9 8.09998 12.7209 8.09998 12.5L8.09998 2.50002C8.09998 2.27911 8.27906 2.10002 8.49998 2.10002C8.72089 2.10002 8.89998 2.27911 8.89998 2.50002L8.89998 12.5C8.89998 12.7209 8.72089 12.9 8.49998 12.9ZM10.1 12.5C10.1 12.7209 10.2791 12.9 10.5 12.9C10.7209 12.9 10.9 12.7209 10.9 12.5L10.9 2.50002C10.9 2.27911 10.7209 2.10002 10.5 2.10002C10.2791 2.10002 10.1 2.27911 10.1 2.50002L10.1 12.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/drawing-pin-filled.svg+14−0
@@ -0,0 +1,14 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9.62129 1.13607C9.81656 0.940808 10.1331 0.940809 10.3284 1.13607L11.3891 2.19673L12.8033 3.61094L13.8639 4.6716C14.0592 4.86687 14.0592 5.18345 13.8639 5.37871C13.6687 5.57397 13.3521 5.57397 13.1568 5.37871L12.5038 4.7257L8.86727 9.57443L9.97485 10.682C10.1701 10.8773 10.1701 11.1939 9.97485 11.3891C9.77959 11.5844 9.463 11.5844 9.26774 11.3891L7.85353 9.97491L6.79287 8.91425L3.5225 12.1846C3.32724 12.3799 3.01065 12.3799 2.81539 12.1846C2.62013 11.9894 2.62013 11.6728 2.81539 11.4775L6.08576 8.20714L5.0251 7.14648L3.61089 5.73226C3.41563 5.537 3.41562 5.22042 3.61089 5.02516C3.80615 4.8299 4.12273 4.8299 4.31799 5.02516L5.42557 6.13274L10.2743 2.49619L9.62129 1.84318C9.42603 1.64792 9.42603 1.33133 9.62129 1.13607Z"
6 fill="currentColor"
7 />
8 <path
9 fill-rule="evenodd"
10 clip-rule="evenodd"
11 d="M9.62129 1.13607C9.81656 0.940808 10.1331 0.940809 10.3284 1.13607L11.3891 2.19673L12.8033 3.61094L13.8639 4.6716C14.0592 4.86687 14.0592 5.18345 13.8639 5.37871C13.6687 5.57397 13.3521 5.57397 13.1568 5.37871L12.5038 4.7257L8.86727 9.57443L9.97485 10.682C10.1701 10.8773 10.1701 11.1939 9.97485 11.3891C9.77959 11.5844 9.463 11.5844 9.26774 11.3891L7.85353 9.97491L6.79287 8.91425L3.5225 12.1846C3.32724 12.3799 3.01065 12.3799 2.81539 12.1846C2.62013 11.9894 2.62013 11.6728 2.81539 11.4775L6.08576 8.20714L5.0251 7.14648L3.61089 5.73226C3.41563 5.537 3.41562 5.22042 3.61089 5.02516C3.80615 4.8299 4.12273 4.8299 4.31799 5.02516L5.42557 6.13274L10.2743 2.49619L9.62129 1.84318C9.42603 1.64792 9.42603 1.33133 9.62129 1.13607Z"
12 fill="currentColor"
13 />
14</svg>
assets/icons/radix/drawing-pin-solid.svg+14−0
@@ -0,0 +1,14 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9.62129 1.13607C9.81656 0.940808 10.1331 0.940809 10.3284 1.13607L11.3891 2.19673L12.8033 3.61094L13.8639 4.6716C14.0592 4.86687 14.0592 5.18345 13.8639 5.37871C13.6687 5.57397 13.3521 5.57397 13.1568 5.37871L12.5038 4.7257L8.86727 9.57443L9.97485 10.682C10.1701 10.8773 10.1701 11.1939 9.97485 11.3891C9.77959 11.5844 9.463 11.5844 9.26774 11.3891L7.85353 9.97491L6.79287 8.91425L3.5225 12.1846C3.32724 12.3799 3.01065 12.3799 2.81539 12.1846C2.62013 11.9894 2.62013 11.6728 2.81539 11.4775L6.08576 8.20714L5.0251 7.14648L3.61089 5.73226C3.41563 5.537 3.41562 5.22042 3.61089 5.02516C3.80615 4.8299 4.12273 4.8299 4.31799 5.02516L5.42557 6.13274L10.2743 2.49619L9.62129 1.84318C9.42603 1.64792 9.42603 1.33133 9.62129 1.13607Z"
6 fill="currentColor"
7 />
8 <path
9 fill-rule="evenodd"
10 clip-rule="evenodd"
11 d="M9.62129 1.13607C9.81656 0.940808 10.1331 0.940809 10.3284 1.13607L11.3891 2.19673L12.8033 3.61094L13.8639 4.6716C14.0592 4.86687 14.0592 5.18345 13.8639 5.37871C13.6687 5.57397 13.3521 5.57397 13.1568 5.37871L12.5038 4.7257L8.86727 9.57443L9.97485 10.682C10.1701 10.8773 10.1701 11.1939 9.97485 11.3891C9.77959 11.5844 9.463 11.5844 9.26774 11.3891L7.85353 9.97491L6.79287 8.91425L3.5225 12.1846C3.32724 12.3799 3.01065 12.3799 2.81539 12.1846C2.62013 11.9894 2.62013 11.6728 2.81539 11.4775L6.08576 8.20714L5.0251 7.14648L3.61089 5.73226C3.41563 5.537 3.41562 5.22042 3.61089 5.02516C3.80615 4.8299 4.12273 4.8299 4.31799 5.02516L5.42557 6.13274L10.2743 2.49619L9.62129 1.84318C9.42603 1.64792 9.42603 1.33133 9.62129 1.13607Z"
12 fill="currentColor"
13 />
14</svg>
assets/icons/radix/drawing-pin.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M10.3285 1.13607C10.1332 0.940809 9.81662 0.940808 9.62136 1.13607C9.42609 1.33133 9.42609 1.64792 9.62136 1.84318L10.2744 2.49619L5.42563 6.13274L4.31805 5.02516C4.12279 4.8299 3.80621 4.8299 3.61095 5.02516C3.41569 5.22042 3.41569 5.537 3.61095 5.73226L5.02516 7.14648L6.08582 8.20714L2.81545 11.4775C2.62019 11.6728 2.62019 11.9894 2.81545 12.1846C3.01072 12.3799 3.3273 12.3799 3.52256 12.1846L6.79293 8.91425L7.85359 9.97491L9.2678 11.3891C9.46306 11.5844 9.77965 11.5844 9.97491 11.3891C10.1702 11.1939 10.1702 10.8773 9.97491 10.682L8.86733 9.57443L12.5039 4.7257L13.1569 5.37871C13.3522 5.57397 13.6687 5.57397 13.864 5.37871C14.0593 5.18345 14.0593 4.86687 13.864 4.6716L12.8033 3.61094L11.3891 2.19673L10.3285 1.13607ZM6.13992 6.84702L10.9887 3.21047L11.7896 4.01142L8.15305 8.86015L6.13992 6.84702Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/dropdown-menu.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49999 3.09998C7.27907 3.09998 7.09999 3.27906 7.09999 3.49998C7.09999 3.72089 7.27907 3.89998 7.49999 3.89998H14.5C14.7209 3.89998 14.9 3.72089 14.9 3.49998C14.9 3.27906 14.7209 3.09998 14.5 3.09998H7.49999ZM7.49998 5.1C7.27907 5.1 7.09998 5.27908 7.09998 5.5C7.09998 5.72091 7.27907 5.9 7.49998 5.9H14.5C14.7209 5.9 14.9 5.72091 14.9 5.5C14.9 5.27908 14.7209 5.1 14.5 5.1H7.49998ZM7.1 7.5C7.1 7.27908 7.27909 7.1 7.5 7.1H14.5C14.7209 7.1 14.9 7.27908 14.9 7.5C14.9 7.72091 14.7209 7.9 14.5 7.9H7.5C7.27909 7.9 7.1 7.72091 7.1 7.5ZM7.49998 9.1C7.27907 9.1 7.09998 9.27908 7.09998 9.5C7.09998 9.72091 7.27907 9.9 7.49998 9.9H14.5C14.7209 9.9 14.9 9.72091 14.9 9.5C14.9 9.27908 14.7209 9.1 14.5 9.1H7.49998ZM7.09998 11.5C7.09998 11.2791 7.27907 11.1 7.49998 11.1H14.5C14.7209 11.1 14.9 11.2791 14.9 11.5C14.9 11.7209 14.7209 11.9 14.5 11.9H7.49998C7.27907 11.9 7.09998 11.7209 7.09998 11.5ZM2.5 9.25003L5 6.00003H0L2.5 9.25003Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/enter-full-screen.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 2.5C2 2.22386 2.22386 2 2.5 2H5.5C5.77614 2 6 2.22386 6 2.5C6 2.77614 5.77614 3 5.5 3H3V5.5C3 5.77614 2.77614 6 2.5 6C2.22386 6 2 5.77614 2 5.5V2.5ZM9 2.5C9 2.22386 9.22386 2 9.5 2H12.5C12.7761 2 13 2.22386 13 2.5V5.5C13 5.77614 12.7761 6 12.5 6C12.2239 6 12 5.77614 12 5.5V3H9.5C9.22386 3 9 2.77614 9 2.5ZM2.5 9C2.77614 9 3 9.22386 3 9.5V12H5.5C5.77614 12 6 12.2239 6 12.5C6 12.7761 5.77614 13 5.5 13H2.5C2.22386 13 2 12.7761 2 12.5V9.5C2 9.22386 2.22386 9 2.5 9ZM12.5 9C12.7761 9 13 9.22386 13 9.5V12.5C13 12.7761 12.7761 13 12.5 13H9.5C9.22386 13 9 12.7761 9 12.5C9 12.2239 9.22386 12 9.5 12H12V9.5C12 9.22386 12.2239 9 12.5 9Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/enter.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.5 1C4.22386 1 4 1.22386 4 1.5C4 1.77614 4.22386 2 4.5 2H12V13H4.5C4.22386 13 4 13.2239 4 13.5C4 13.7761 4.22386 14 4.5 14H12C12.5523 14 13 13.5523 13 13V2C13 1.44772 12.5523 1 12 1H4.5ZM6.60355 4.89645C6.40829 4.70118 6.09171 4.70118 5.89645 4.89645C5.70118 5.09171 5.70118 5.40829 5.89645 5.60355L7.29289 7H0.5C0.223858 7 0 7.22386 0 7.5C0 7.77614 0.223858 8 0.5 8H7.29289L5.89645 9.39645C5.70118 9.59171 5.70118 9.90829 5.89645 10.1036C6.09171 10.2988 6.40829 10.2988 6.60355 10.1036L8.85355 7.85355C9.04882 7.65829 9.04882 7.34171 8.85355 7.14645L6.60355 4.89645Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/envelope-closed.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1 2C0.447715 2 0 2.44772 0 3V12C0 12.5523 0.447715 13 1 13H14C14.5523 13 15 12.5523 15 12V3C15 2.44772 14.5523 2 14 2H1ZM1 3L14 3V3.92494C13.9174 3.92486 13.8338 3.94751 13.7589 3.99505L7.5 7.96703L1.24112 3.99505C1.16621 3.94751 1.0826 3.92486 1 3.92494V3ZM1 4.90797V12H14V4.90797L7.74112 8.87995C7.59394 8.97335 7.40606 8.97335 7.25888 8.87995L1 4.90797Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/envelope-open.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.94721 0.164594C7.66569 0.0238299 7.33431 0.0238302 7.05279 0.164594L0.552786 3.41459C0.214002 3.58399 0 3.93025 0 4.30902V12C0 12.5523 0.447715 13 1 13H14C14.5523 13 15 12.5523 15 12V4.30902C15 3.93025 14.786 3.58399 14.4472 3.41459L7.94721 0.164594ZM13.5689 4.09349L7.5 1.05902L1.43105 4.09349L7.5 7.29136L13.5689 4.09349ZM1 4.88366V12H14V4.88366L7.70977 8.19813C7.57848 8.26731 7.42152 8.26731 7.29023 8.19813L1 4.88366Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/eraser.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.36052 0.72921C8.55578 0.533948 8.87236 0.533948 9.06763 0.72921L14.2708 5.93235C14.466 6.12761 14.466 6.4442 14.2708 6.63946L8.95513 11.9551L7.3466 13.5636C6.76081 14.1494 5.81106 14.1494 5.22528 13.5636L1.43635 9.7747C0.850563 9.18891 0.850563 8.23917 1.43635 7.65338L3.04488 6.04485L8.36052 0.72921ZM8.71407 1.78987L4.10554 6.3984L8.60157 10.8944L13.2101 6.28591L8.71407 1.78987ZM7.89447 11.6015L3.39843 7.10551L2.14346 8.36049C1.94819 8.55575 1.94819 8.87233 2.14346 9.06759L5.93238 12.8565C6.12765 13.0518 6.44423 13.0518 6.63949 12.8565L7.89447 11.6015Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/exclamation-triangle.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.4449 0.608765C8.0183 -0.107015 6.9817 -0.107015 6.55509 0.608766L0.161178 11.3368C-0.275824 12.07 0.252503 13 1.10608 13H13.8939C14.7475 13 15.2758 12.07 14.8388 11.3368L8.4449 0.608765ZM7.4141 1.12073C7.45288 1.05566 7.54712 1.05566 7.5859 1.12073L13.9798 11.8488C14.0196 11.9154 13.9715 12 13.8939 12H1.10608C1.02849 12 0.980454 11.9154 1.02018 11.8488L7.4141 1.12073ZM6.8269 4.48611C6.81221 4.10423 7.11783 3.78663 7.5 3.78663C7.88217 3.78663 8.18778 4.10423 8.1731 4.48612L8.01921 8.48701C8.00848 8.766 7.7792 8.98664 7.5 8.98664C7.2208 8.98664 6.99151 8.766 6.98078 8.48701L6.8269 4.48611ZM8.24989 10.476C8.24989 10.8902 7.9141 11.226 7.49989 11.226C7.08567 11.226 6.74989 10.8902 6.74989 10.476C6.74989 10.0618 7.08567 9.72599 7.49989 9.72599C7.9141 9.72599 8.24989 10.0618 8.24989 10.476Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/exit-full-screen.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.5 2C5.77614 2 6 2.22386 6 2.5V5.5C6 5.77614 5.77614 6 5.5 6H2.5C2.22386 6 2 5.77614 2 5.5C2 5.22386 2.22386 5 2.5 5H5V2.5C5 2.22386 5.22386 2 5.5 2ZM9.5 2C9.77614 2 10 2.22386 10 2.5V5H12.5C12.7761 5 13 5.22386 13 5.5C13 5.77614 12.7761 6 12.5 6H9.5C9.22386 6 9 5.77614 9 5.5V2.5C9 2.22386 9.22386 2 9.5 2ZM2 9.5C2 9.22386 2.22386 9 2.5 9H5.5C5.77614 9 6 9.22386 6 9.5V12.5C6 12.7761 5.77614 13 5.5 13C5.22386 13 5 12.7761 5 12.5V10H2.5C2.22386 10 2 9.77614 2 9.5ZM9 9.5C9 9.22386 9.22386 9 9.5 9H12.5C12.7761 9 13 9.22386 13 9.5C13 9.77614 12.7761 10 12.5 10H10V12.5C10 12.7761 9.77614 13 9.5 13C9.22386 13 9 12.7761 9 12.5V9.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/exit.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3 1C2.44771 1 2 1.44772 2 2V13C2 13.5523 2.44772 14 3 14H10.5C10.7761 14 11 13.7761 11 13.5C11 13.2239 10.7761 13 10.5 13H3V2L10.5 2C10.7761 2 11 1.77614 11 1.5C11 1.22386 10.7761 1 10.5 1H3ZM12.6036 4.89645C12.4083 4.70118 12.0917 4.70118 11.8964 4.89645C11.7012 5.09171 11.7012 5.40829 11.8964 5.60355L13.2929 7H6.5C6.22386 7 6 7.22386 6 7.5C6 7.77614 6.22386 8 6.5 8H13.2929L11.8964 9.39645C11.7012 9.59171 11.7012 9.90829 11.8964 10.1036C12.0917 10.2988 12.4083 10.2988 12.6036 10.1036L14.8536 7.85355C15.0488 7.65829 15.0488 7.34171 14.8536 7.14645L12.6036 4.89645Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/external-link.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3 2C2.44772 2 2 2.44772 2 3V12C2 12.5523 2.44772 13 3 13H12C12.5523 13 13 12.5523 13 12V8.5C13 8.22386 12.7761 8 12.5 8C12.2239 8 12 8.22386 12 8.5V12H3V3L6.5 3C6.77614 3 7 2.77614 7 2.5C7 2.22386 6.77614 2 6.5 2H3ZM12.8536 2.14645C12.9015 2.19439 12.9377 2.24964 12.9621 2.30861C12.9861 2.36669 12.9996 2.4303 13 2.497L13 2.5V2.50049V5.5C13 5.77614 12.7761 6 12.5 6C12.2239 6 12 5.77614 12 5.5V3.70711L6.85355 8.85355C6.65829 9.04882 6.34171 9.04882 6.14645 8.85355C5.95118 8.65829 5.95118 8.34171 6.14645 8.14645L11.2929 3H9.5C9.22386 3 9 2.77614 9 2.5C9 2.22386 9.22386 2 9.5 2H12.4999H12.5C12.5678 2 12.6324 2.01349 12.6914 2.03794C12.7504 2.06234 12.8056 2.09851 12.8536 2.14645Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/eye-closed.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M14.7649 6.07596C14.9991 6.22231 15.0703 6.53079 14.9239 6.76495C14.4849 7.46743 13.9632 8.10645 13.3702 8.66305L14.5712 9.86406C14.7664 10.0593 14.7664 10.3759 14.5712 10.5712C14.3759 10.7664 14.0593 10.7664 13.8641 10.5712L12.6011 9.30817C11.805 9.90283 10.9089 10.3621 9.93375 10.651L10.383 12.3277C10.4544 12.5944 10.2961 12.8685 10.0294 12.94C9.76267 13.0115 9.4885 12.8532 9.41704 12.5865L8.95917 10.8775C8.48743 10.958 8.00036 10.9999 7.50001 10.9999C6.99965 10.9999 6.51257 10.958 6.04082 10.8775L5.58299 12.5864C5.51153 12.8532 5.23737 13.0115 4.97064 12.94C4.7039 12.8686 4.5456 12.5944 4.61706 12.3277L5.06625 10.651C4.09111 10.3621 3.19503 9.90282 2.3989 9.30815L1.1359 10.5712C0.940638 10.7664 0.624058 10.7664 0.428798 10.5712C0.233537 10.3759 0.233537 10.0593 0.428798 9.86405L1.62982 8.66303C1.03682 8.10643 0.515113 7.46742 0.0760677 6.76495C-0.0702867 6.53079 0.000898544 6.22231 0.235065 6.07596C0.469231 5.9296 0.777703 6.00079 0.924058 6.23496C1.40354 7.00213 1.989 7.68057 2.66233 8.2427C2.67315 8.25096 2.6837 8.25972 2.69397 8.26898C4.00897 9.35527 5.65537 9.99991 7.50001 9.99991C10.3078 9.99991 12.6564 8.5063 14.076 6.23495C14.2223 6.00079 14.5308 5.9296 14.7649 6.07596Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/eye-none.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.3536 2.35355C13.5488 2.15829 13.5488 1.84171 13.3536 1.64645C13.1583 1.45118 12.8417 1.45118 12.6464 1.64645L10.6828 3.61012C9.70652 3.21671 8.63759 3 7.5 3C4.30786 3 1.65639 4.70638 0.0760002 7.23501C-0.0253338 7.39715 -0.0253334 7.60288 0.0760014 7.76501C0.902945 9.08812 2.02314 10.1861 3.36061 10.9323L1.64645 12.6464C1.45118 12.8417 1.45118 13.1583 1.64645 13.3536C1.84171 13.5488 2.15829 13.5488 2.35355 13.3536L4.31723 11.3899C5.29348 11.7833 6.36241 12 7.5 12C10.6921 12 13.3436 10.2936 14.924 7.76501C15.0253 7.60288 15.0253 7.39715 14.924 7.23501C14.0971 5.9119 12.9769 4.81391 11.6394 4.06771L13.3536 2.35355ZM9.90428 4.38861C9.15332 4.1361 8.34759 4 7.5 4C4.80285 4 2.52952 5.37816 1.09622 7.50001C1.87284 8.6497 2.89609 9.58106 4.09974 10.1931L9.90428 4.38861ZM5.09572 10.6114L10.9003 4.80685C12.1039 5.41894 13.1272 6.35031 13.9038 7.50001C12.4705 9.62183 10.1971 11 7.5 11C6.65241 11 5.84668 10.8639 5.09572 10.6114Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/eye-open.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 11C4.80285 11 2.52952 9.62184 1.09622 7.50001C2.52952 5.37816 4.80285 4 7.5 4C10.1971 4 12.4705 5.37816 13.9038 7.50001C12.4705 9.62183 10.1971 11 7.5 11ZM7.5 3C4.30786 3 1.65639 4.70638 0.0760002 7.23501C-0.0253338 7.39715 -0.0253334 7.60288 0.0760014 7.76501C1.65639 10.2936 4.30786 12 7.5 12C10.6921 12 13.3436 10.2936 14.924 7.76501C15.0253 7.60288 15.0253 7.39715 14.924 7.23501C13.3436 4.70638 10.6921 3 7.5 3ZM7.5 9.5C8.60457 9.5 9.5 8.60457 9.5 7.5C9.5 6.39543 8.60457 5.5 7.5 5.5C6.39543 5.5 5.5 6.39543 5.5 7.5C5.5 8.60457 6.39543 9.5 7.5 9.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/face.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49991 0.876892C3.84222 0.876892 0.877075 3.84204 0.877075 7.49972C0.877075 11.1574 3.84222 14.1226 7.49991 14.1226C11.1576 14.1226 14.1227 11.1574 14.1227 7.49972C14.1227 3.84204 11.1576 0.876892 7.49991 0.876892ZM1.82708 7.49972C1.82708 4.36671 4.36689 1.82689 7.49991 1.82689C10.6329 1.82689 13.1727 4.36671 13.1727 7.49972C13.1727 10.6327 10.6329 13.1726 7.49991 13.1726C4.36689 13.1726 1.82708 10.6327 1.82708 7.49972ZM5.03747 9.21395C4.87949 8.98746 4.56782 8.93193 4.34133 9.08991C4.11484 9.24789 4.05931 9.55956 4.21729 9.78605C4.93926 10.8211 6.14033 11.5 7.50004 11.5C8.85974 11.5 10.0608 10.8211 10.7828 9.78605C10.9408 9.55956 10.8852 9.24789 10.6587 9.08991C10.4323 8.93193 10.1206 8.98746 9.9626 9.21395C9.41963 9.99238 8.51907 10.5 7.50004 10.5C6.481 10.5 5.58044 9.99238 5.03747 9.21395ZM5.37503 6.84998C5.85828 6.84998 6.25003 6.45815 6.25003 5.97498C6.25003 5.4918 5.85828 5.09998 5.37503 5.09998C4.89179 5.09998 4.50003 5.4918 4.50003 5.97498C4.50003 6.45815 4.89179 6.84998 5.37503 6.84998ZM10.5 5.97498C10.5 6.45815 10.1083 6.84998 9.62503 6.84998C9.14179 6.84998 8.75003 6.45815 8.75003 5.97498C8.75003 5.4918 9.14179 5.09998 9.62503 5.09998C10.1083 5.09998 10.5 5.4918 10.5 5.97498Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/figma-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.00005 2.04999H5.52505C4.71043 2.04999 4.05005 2.71037 4.05005 3.52499C4.05005 4.33961 4.71043 4.99999 5.52505 4.99999H7.00005V2.04999ZM7.00005 1.04999H8.00005H9.47505C10.842 1.04999 11.95 2.15808 11.95 3.52499C11.95 4.33163 11.5642 5.04815 10.9669 5.49999C11.5642 5.95184 11.95 6.66836 11.95 7.475C11.95 8.8419 10.842 9.95 9.47505 9.95C8.92236 9.95 8.41198 9.76884 8.00005 9.46266V9.95L8.00005 11.425C8.00005 12.7919 6.89195 13.9 5.52505 13.9C4.15814 13.9 3.05005 12.7919 3.05005 11.425C3.05005 10.6183 3.43593 9.90184 4.03317 9.44999C3.43593 8.99814 3.05005 8.28163 3.05005 7.475C3.05005 6.66836 3.43594 5.95184 4.03319 5.5C3.43594 5.04815 3.05005 4.33163 3.05005 3.52499C3.05005 2.15808 4.15814 1.04999 5.52505 1.04999H7.00005ZM8.00005 2.04999V4.99999H9.47505C10.2897 4.99999 10.95 4.33961 10.95 3.52499C10.95 2.71037 10.2897 2.04999 9.47505 2.04999H8.00005ZM5.52505 8.94998H7.00005L7.00005 7.4788L7.00005 7.475L7.00005 7.4712V6H5.52505C4.71043 6 4.05005 6.66038 4.05005 7.475C4.05005 8.28767 4.70727 8.94684 5.5192 8.94999L5.52505 8.94998ZM4.05005 11.425C4.05005 10.6123 4.70727 9.95315 5.5192 9.94999L5.52505 9.95H7.00005L7.00005 11.425C7.00005 12.2396 6.33967 12.9 5.52505 12.9C4.71043 12.9 4.05005 12.2396 4.05005 11.425ZM8.00005 7.47206C8.00164 6.65879 8.66141 6 9.47505 6C10.2897 6 10.95 6.66038 10.95 7.475C10.95 8.28962 10.2897 8.95 9.47505 8.95C8.66141 8.95 8.00164 8.29121 8.00005 7.47794V7.47206Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/file-minus.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3 2.5C3 2.22386 3.22386 2 3.5 2H9.29289L12 4.70711V12.5C12 12.7761 11.7761 13 11.5 13H3.5C3.22386 13 3 12.7761 3 12.5V2.5ZM3.5 1C2.67157 1 2 1.67157 2 2.5V12.5C2 13.3284 2.67157 14 3.5 14H11.5C12.3284 14 13 13.3284 13 12.5V4.60355C13 4.40464 12.921 4.21388 12.7803 4.07322L9.85355 1.14645C9.75979 1.05268 9.63261 1 9.5 1H3.5ZM5.25 7C4.97386 7 4.75 7.22386 4.75 7.5C4.75 7.77614 4.97386 8 5.25 8H9.75C10.0261 8 10.25 7.77614 10.25 7.5C10.25 7.22386 10.0261 7 9.75 7H5.25Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/file-plus.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.5 2C3.22386 2 3 2.22386 3 2.5V12.5C3 12.7761 3.22386 13 3.5 13H11.5C11.7761 13 12 12.7761 12 12.5V4.70711L9.29289 2H3.5ZM2 2.5C2 1.67157 2.67157 1 3.5 1H9.5C9.63261 1 9.75979 1.05268 9.85355 1.14645L12.7803 4.07322C12.921 4.21388 13 4.40464 13 4.60355V12.5C13 13.3284 12.3284 14 11.5 14H3.5C2.67157 14 2 13.3284 2 12.5V2.5ZM4.75 7.5C4.75 7.22386 4.97386 7 5.25 7H7V5.25C7 4.97386 7.22386 4.75 7.5 4.75C7.77614 4.75 8 4.97386 8 5.25V7H9.75C10.0261 7 10.25 7.22386 10.25 7.5C10.25 7.77614 10.0261 8 9.75 8H8V9.75C8 10.0261 7.77614 10.25 7.5 10.25C7.22386 10.25 7 10.0261 7 9.75V8H5.25C4.97386 8 4.75 7.77614 4.75 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/file-text.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3 2.5C3 2.22386 3.22386 2 3.5 2H9.08579C9.21839 2 9.34557 2.05268 9.43934 2.14645L11.8536 4.56066C11.9473 4.65443 12 4.78161 12 4.91421V12.5C12 12.7761 11.7761 13 11.5 13H3.5C3.22386 13 3 12.7761 3 12.5V2.5ZM3.5 1C2.67157 1 2 1.67157 2 2.5V12.5C2 13.3284 2.67157 14 3.5 14H11.5C12.3284 14 13 13.3284 13 12.5V4.91421C13 4.51639 12.842 4.13486 12.5607 3.85355L10.1464 1.43934C9.86514 1.15804 9.48361 1 9.08579 1H3.5ZM4.5 4C4.22386 4 4 4.22386 4 4.5C4 4.77614 4.22386 5 4.5 5H7.5C7.77614 5 8 4.77614 8 4.5C8 4.22386 7.77614 4 7.5 4H4.5ZM4.5 7C4.22386 7 4 7.22386 4 7.5C4 7.77614 4.22386 8 4.5 8H10.5C10.7761 8 11 7.77614 11 7.5C11 7.22386 10.7761 7 10.5 7H4.5ZM4.5 10C4.22386 10 4 10.2239 4 10.5C4 10.7761 4.22386 11 4.5 11H10.5C10.7761 11 11 10.7761 11 10.5C11 10.2239 10.7761 10 10.5 10H4.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/file.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.5 2C3.22386 2 3 2.22386 3 2.5V12.5C3 12.7761 3.22386 13 3.5 13H11.5C11.7761 13 12 12.7761 12 12.5V6H8.5C8.22386 6 8 5.77614 8 5.5V2H3.5ZM9 2.70711L11.2929 5H9V2.70711ZM2 2.5C2 1.67157 2.67157 1 3.5 1H8.5C8.63261 1 8.75979 1.05268 8.85355 1.14645L12.8536 5.14645C12.9473 5.24021 13 5.36739 13 5.5V12.5C13 13.3284 12.3284 14 11.5 14H3.5C2.67157 14 2 13.3284 2 12.5V2.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/font-bold.svg+6−0
@@ -0,0 +1,6 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 d="M5.10505 12C4.70805 12 4.4236 11.912 4.25171 11.736C4.0839 11.5559 4 11.2715 4 10.8827V4.11733C4 3.72033 4.08595 3.43588 4.25784 3.26398C4.43383 3.08799 4.71623 3 5.10505 3C6.42741 3 8.25591 3 9.02852 3C10.1373 3 11.0539 3.98153 11.0539 5.1846C11.0539 6.08501 10.6037 6.81855 9.70327 7.23602C10.8657 7.44851 11.5176 8.62787 11.5176 9.48128C11.5176 10.5125 10.9902 12 9.27734 12C8.77742 12 6.42626 12 5.10505 12ZM8.37891 8.00341H5.8V10.631H8.37891C8.9 10.631 9.6296 10.1211 9.6296 9.29877C9.6296 8.47643 8.9 8.00341 8.37891 8.00341ZM5.8 4.36903V6.69577H8.17969C8.53906 6.69577 9.27734 6.35939 9.27734 5.50002C9.27734 4.64064 8.48047 4.36903 8.17969 4.36903H5.8Z"
4 fill="currentColor"
5 />
6</svg>
assets/icons/radix/font-family.svg+6−0
@@ -0,0 +1,6 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 d="M2.5 4.5C2.5 3.09886 3.59886 2 5 2H12.499C12.7752 2 13 2.22386 13 2.5C13 2.77614 12.7761 3 12.5 3H8.69244L8.40509 3.85458C8.18869 4.49752 7.89401 5.37197 7.58091 6.29794C7.50259 6.52956 7.42308 6.76453 7.34332 7H8.5C8.77614 7 9 7.22386 9 7.5C9 7.77614 8.77614 8 8.5 8H7.00407C6.56724 9.28543 6.16435 10.4613 5.95799 11.0386C5.63627 11.9386 5.20712 12.4857 4.66741 12.7778C4.16335 13.0507 3.64154 13.0503 3.28378 13.05L3.25 13.05C2.94624 13.05 2.7 12.8037 2.7 12.5C2.7 12.1962 2.94624 11.95 3.25 11.95C3.64182 11.95 3.9035 11.9405 4.14374 11.8105C4.36443 11.691 4.65532 11.4148 4.92217 10.6683C5.10695 10.1514 5.45375 9.14134 5.8422 8H4.5C4.22386 8 4 7.77614 4 7.5C4 7.22386 4.22386 7 4.5 7H6.18187C6.30127 6.64785 6.42132 6.29323 6.53887 5.94559C6.85175 5.02025 7.14627 4.14631 7.36256 3.50368L7.53192 3H5C4.15114 3 3.5 3.65114 3.5 4.5C3.5 4.77614 3.27614 5 3 5C2.72386 5 2.5 4.77614 2.5 4.5Z"
4 fill="currentColor"
5 />
6</svg>
assets/icons/radix/font-italic.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.67494 3.50017C5.67494 3.25164 5.87641 3.05017 6.12494 3.05017H10.6249C10.8735 3.05017 11.0749 3.25164 11.0749 3.50017C11.0749 3.7487 10.8735 3.95017 10.6249 3.95017H9.00587L7.2309 11.05H8.87493C9.12345 11.05 9.32493 11.2515 9.32493 11.5C9.32493 11.7486 9.12345 11.95 8.87493 11.95H4.37493C4.1264 11.95 3.92493 11.7486 3.92493 11.5C3.92493 11.2515 4.1264 11.05 4.37493 11.05H5.99397L7.76894 3.95017H6.12494C5.87641 3.95017 5.67494 3.7487 5.67494 3.50017Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/font-roman.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.79993 3.50017C4.79993 3.25164 5.0014 3.05017 5.24993 3.05017H9.74993C9.99845 3.05017 10.1999 3.25164 10.1999 3.50017C10.1999 3.7487 9.99845 3.95017 9.74993 3.95017H8.09993V11.05H9.74994C9.99847 11.05 10.1999 11.2515 10.1999 11.5C10.1999 11.7486 9.99847 11.95 9.74994 11.95H5.24994C5.00141 11.95 4.79994 11.7486 4.79994 11.5C4.79994 11.2515 5.00141 11.05 5.24994 11.05H6.89993V3.95017H5.24993C5.0014 3.95017 4.79993 3.7487 4.79993 3.50017Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/font-size.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.78233 2.21707C2.70732 2.14206 2.60557 2.09991 2.49949 2.09991C2.3934 2.09991 2.29166 2.14206 2.21664 2.21707L0.216645 4.21707C0.0604351 4.37328 0.0604351 4.62655 0.216645 4.78276C0.372855 4.93897 0.626121 4.93897 0.78233 4.78276L2.09949 3.4656L2.09949 11.5342L0.78233 10.2171C0.62612 10.0609 0.372854 10.0609 0.216645 10.2171C0.0604349 10.3733 0.0604349 10.6265 0.216645 10.7828L2.21664 12.7828C2.29166 12.8578 2.3934 12.8999 2.49949 12.8999C2.60557 12.8999 2.70731 12.8578 2.78233 12.7828L4.78233 10.7828C4.93854 10.6265 4.93854 10.3733 4.78233 10.2171C4.62612 10.0609 4.37285 10.0609 4.21664 10.2171L2.89949 11.5342L2.89949 3.4656L4.21664 4.78276C4.37285 4.93897 4.62612 4.93897 4.78233 4.78276C4.93854 4.62655 4.93854 4.37328 4.78233 4.21707L2.78233 2.21707ZM10.5 2.74997C10.7107 2.74997 10.8988 2.88211 10.9703 3.08036L13.9703 11.3999C14.064 11.6597 13.9293 11.9462 13.6696 12.0399C13.4098 12.1336 13.1233 11.9989 13.0296 11.7392L12.0477 9.016H8.95228L7.97033 11.7392C7.87666 11.9989 7.59013 12.1336 7.33036 12.0399C7.07059 11.9462 6.93595 11.6597 7.02962 11.3999L10.0296 3.08036C10.1011 2.88211 10.2892 2.74997 10.5 2.74997ZM10.5 4.72396L11.7412 8.166H9.25879L10.5 4.72396Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/font-style.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.03791 9.98075C0.934777 9.6583 1.11603 9.37719 1.40005 9.24871C1.68408 9.12022 2.09463 9.13412 2.27071 9.45426C2.85393 10.5147 3.64599 10.7282 4.48665 10.7282C5.52721 10.7282 6.29659 10.2615 6.29659 9.45426C6.29659 8.8047 5.9119 8.46416 4.87134 8.14253L4.15872 7.92181C2.64518 7.44883 1.88842 6.69206 1.88842 5.45601C1.88842 3.79743 3.27583 2.6875 5.24342 2.6875C6.91733 2.6875 7.97409 3.33536 8.43833 4.31065C8.57087 4.58909 8.57614 4.91294 8.22794 5.19114C7.87974 5.46934 7.52351 5.34799 7.23327 5.03839C6.47215 4.22653 5.99545 4.04968 5.25604 4.04968C4.1398 4.04968 3.547 4.63618 3.547 5.27943C3.547 5.86592 3.96322 6.23169 4.94702 6.5344L5.67856 6.76143C7.22994 7.23441 7.97409 7.95964 7.97409 9.17047C7.97409 10.7723 6.69389 12.0903 4.46143 12.0903C2.86612 12.0903 1.40005 11.1131 1.03791 9.98075ZM11.8491 8.77985C10.661 8.39543 10.1649 7.86114 10.1649 6.98805C10.1649 5.86736 11.1636 5.04639 12.6128 5.04639C13.8546 5.04639 14.6629 5.63345 14.9778 6.6346C15.0443 6.84599 14.9593 6.98006 14.7475 7.0491C14.5394 7.11697 14.3176 7.09974 14.238 6.89611C13.9356 6.12273 13.352 5.76311 12.5998 5.76311C11.6467 5.76311 11.0135 6.25178 11.0135 6.91638C11.0135 7.45066 11.3464 7.75038 12.2473 8.04358L12.8348 8.23254C14.062 8.62999 14.5516 9.13821 14.5516 10.0178C14.5516 11.1972 13.481 12.0442 11.9927 12.0442C10.6439 12.0442 9.65644 11.2809 9.41979 10.3361C9.36535 10.1188 9.41192 10.0287 9.70039 9.96184C9.98886 9.89499 10.0714 9.89918 10.1715 10.1369C10.4555 10.8114 11.1531 11.3275 12.0318 11.3275C12.9914 11.3275 13.6834 10.7802 13.6834 10.0634C13.6834 9.53567 13.3961 9.28807 12.4366 8.97532L11.8491 8.77985Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/frame.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11 1.5C11 1.22386 10.7761 1 10.5 1C10.2239 1 10 1.22386 10 1.5V4H5V1.5C5 1.22386 4.77614 1 4.5 1C4.22386 1 4 1.22386 4 1.5V4H1.5C1.22386 4 1 4.22386 1 4.5C1 4.77614 1.22386 5 1.5 5H4V10H1.5C1.22386 10 1 10.2239 1 10.5C1 10.7761 1.22386 11 1.5 11H4V13.5C4 13.7761 4.22386 14 4.5 14C4.77614 14 5 13.7761 5 13.5V11H10V13.5C10 13.7761 10.2239 14 10.5 14C10.7761 14 11 13.7761 11 13.5V11H13.5C13.7761 11 14 10.7761 14 10.5C14 10.2239 13.7761 10 13.5 10H11V5H13.5C13.7761 5 14 4.77614 14 4.5C14 4.22386 13.7761 4 13.5 4H11V1.5ZM10 10V5H5V10H10Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/framer-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.3825 1.29567C3.46241 1.11432 3.64188 0.997284 3.84005 0.997284H11.5C11.7761 0.997284 12 1.22114 12 1.49728V5.5C12 5.77614 11.7761 6 11.5 6H8.63521L11.5288 9.16247C11.6626 9.3087 11.6974 9.52015 11.6175 9.70154C11.5376 9.88293 11.3582 10 11.16 10H8V13.5C8 13.7022 7.87818 13.8845 7.69134 13.9619C7.5045 14.0393 7.28945 13.9966 7.14645 13.8536L3.14645 9.85355C3.05268 9.75979 3 9.63261 3 9.5V5.5C3 5.22386 3.22386 5 3.5 5H6.36531L3.47105 1.83468C3.33732 1.68844 3.30259 1.47701 3.3825 1.29567ZM7.72032 5L4.97474 1.99728H11V5H7.72032ZM7.27978 6H4V9H7.5H10.0247L7.27978 6ZM4.70711 10L7 12.2929V10H4.70711Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/gear.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.07095 0.650238C6.67391 0.650238 6.32977 0.925096 6.24198 1.31231L6.0039 2.36247C5.6249 2.47269 5.26335 2.62363 4.92436 2.81013L4.01335 2.23585C3.67748 2.02413 3.23978 2.07312 2.95903 2.35386L2.35294 2.95996C2.0722 3.2407 2.0232 3.6784 2.23493 4.01427L2.80942 4.92561C2.62307 5.2645 2.47227 5.62594 2.36216 6.00481L1.31209 6.24287C0.924883 6.33065 0.650024 6.6748 0.650024 7.07183V7.92897C0.650024 8.32601 0.924883 8.67015 1.31209 8.75794L2.36228 8.99603C2.47246 9.375 2.62335 9.73652 2.80979 10.0755L2.2354 10.9867C2.02367 11.3225 2.07267 11.7602 2.35341 12.041L2.95951 12.6471C3.24025 12.9278 3.67795 12.9768 4.01382 12.7651L4.92506 12.1907C5.26384 12.377 5.62516 12.5278 6.0039 12.6379L6.24198 13.6881C6.32977 14.0753 6.67391 14.3502 7.07095 14.3502H7.92809C8.32512 14.3502 8.66927 14.0753 8.75705 13.6881L8.99505 12.6383C9.37411 12.5282 9.73573 12.3773 10.0748 12.1909L10.986 12.7653C11.3218 12.977 11.7595 12.928 12.0403 12.6473L12.6464 12.0412C12.9271 11.7604 12.9761 11.3227 12.7644 10.9869L12.1902 10.076C12.3768 9.73688 12.5278 9.37515 12.638 8.99596L13.6879 8.75794C14.0751 8.67015 14.35 8.32601 14.35 7.92897V7.07183C14.35 6.6748 14.0751 6.33065 13.6879 6.24287L12.6381 6.00488C12.528 5.62578 12.3771 5.26414 12.1906 4.92507L12.7648 4.01407C12.9766 3.6782 12.9276 3.2405 12.6468 2.95975L12.0407 2.35366C11.76 2.07292 11.3223 2.02392 10.9864 2.23565L10.0755 2.80989C9.73622 2.62328 9.37437 2.47229 8.99505 2.36209L8.75705 1.31231C8.66927 0.925096 8.32512 0.650238 7.92809 0.650238H7.07095ZM4.92053 3.81251C5.44724 3.44339 6.05665 3.18424 6.71543 3.06839L7.07095 1.50024H7.92809L8.28355 3.06816C8.94267 3.18387 9.5524 3.44302 10.0794 3.81224L11.4397 2.9547L12.0458 3.56079L11.1882 4.92117C11.5573 5.44798 11.8164 6.0575 11.9321 6.71638L13.5 7.07183V7.92897L11.932 8.28444C11.8162 8.94342 11.557 9.55301 11.1878 10.0798L12.0453 11.4402L11.4392 12.0462L10.0787 11.1886C9.55192 11.5576 8.94241 11.8166 8.28355 11.9323L7.92809 13.5002H7.07095L6.71543 11.932C6.0569 11.8162 5.44772 11.5572 4.92116 11.1883L3.56055 12.046L2.95445 11.4399L3.81213 10.0794C3.4431 9.55266 3.18403 8.94326 3.06825 8.2845L1.50002 7.92897V7.07183L3.06818 6.71632C3.18388 6.05765 3.44283 5.44833 3.81171 4.92165L2.95398 3.561L3.56008 2.95491L4.92053 3.81251ZM9.02496 7.50008C9.02496 8.34226 8.34223 9.02499 7.50005 9.02499C6.65786 9.02499 5.97513 8.34226 5.97513 7.50008C5.97513 6.65789 6.65786 5.97516 7.50005 5.97516C8.34223 5.97516 9.02496 6.65789 9.02496 7.50008ZM9.92496 7.50008C9.92496 8.83932 8.83929 9.92499 7.50005 9.92499C6.1608 9.92499 5.07513 8.83932 5.07513 7.50008C5.07513 6.16084 6.1608 5.07516 7.50005 5.07516C8.83929 5.07516 9.92496 6.16084 9.92496 7.50008Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/github-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49933 0.25C3.49635 0.25 0.25 3.49593 0.25 7.50024C0.25 10.703 2.32715 13.4206 5.2081 14.3797C5.57084 14.446 5.70302 14.2222 5.70302 14.0299C5.70302 13.8576 5.69679 13.4019 5.69323 12.797C3.67661 13.235 3.25112 11.825 3.25112 11.825C2.92132 10.9874 2.44599 10.7644 2.44599 10.7644C1.78773 10.3149 2.49584 10.3238 2.49584 10.3238C3.22353 10.375 3.60629 11.0711 3.60629 11.0711C4.25298 12.1788 5.30335 11.8588 5.71638 11.6732C5.78225 11.205 5.96962 10.8854 6.17658 10.7043C4.56675 10.5209 2.87415 9.89918 2.87415 7.12104C2.87415 6.32925 3.15677 5.68257 3.62053 5.17563C3.54576 4.99226 3.29697 4.25521 3.69174 3.25691C3.69174 3.25691 4.30015 3.06196 5.68522 3.99973C6.26337 3.83906 6.8838 3.75895 7.50022 3.75583C8.1162 3.75895 8.73619 3.83906 9.31523 3.99973C10.6994 3.06196 11.3069 3.25691 11.3069 3.25691C11.7026 4.25521 11.4538 4.99226 11.3795 5.17563C11.8441 5.68257 12.1245 6.32925 12.1245 7.12104C12.1245 9.9063 10.4292 10.5192 8.81452 10.6985C9.07444 10.9224 9.30633 11.3648 9.30633 12.0413C9.30633 13.0102 9.29742 13.7922 9.29742 14.0299C9.29742 14.2239 9.42828 14.4496 9.79591 14.3788C12.6746 13.4179 14.75 10.7025 14.75 7.50024C14.75 3.49593 11.5036 0.25 7.49933 0.25Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/globe.svg+26−0
@@ -0,0 +1,26 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49996 1.80002C4.35194 1.80002 1.79996 4.352 1.79996 7.50002C1.79996 10.648 4.35194 13.2 7.49996 13.2C10.648 13.2 13.2 10.648 13.2 7.50002C13.2 4.352 10.648 1.80002 7.49996 1.80002ZM0.899963 7.50002C0.899963 3.85494 3.85488 0.900024 7.49996 0.900024C11.145 0.900024 14.1 3.85494 14.1 7.50002C14.1 11.1451 11.145 14.1 7.49996 14.1C3.85488 14.1 0.899963 11.1451 0.899963 7.50002Z"
6 fill="currentColor"
7 />
8 <path
9 fill-rule="evenodd"
10 clip-rule="evenodd"
11 d="M13.4999 7.89998H1.49994V7.09998H13.4999V7.89998Z"
12 fill="currentColor"
13 />
14 <path
15 fill-rule="evenodd"
16 clip-rule="evenodd"
17 d="M7.09991 13.5V1.5H7.89991V13.5H7.09991zM10.375 7.49998C10.375 5.32724 9.59364 3.17778 8.06183 1.75656L8.53793 1.24341C10.2396 2.82218 11.075 5.17273 11.075 7.49998 11.075 9.82724 10.2396 12.1778 8.53793 13.7566L8.06183 13.2434C9.59364 11.8222 10.375 9.67273 10.375 7.49998zM3.99969 7.5C3.99969 5.17611 4.80786 2.82678 6.45768 1.24719L6.94177 1.75281C5.4582 3.17323 4.69969 5.32389 4.69969 7.5 4.6997 9.67611 5.45822 11.8268 6.94179 13.2472L6.45769 13.7528C4.80788 12.1732 3.9997 9.8239 3.99969 7.5z"
18 fill="currentColor"
19 />
20 <path
21 fill-rule="evenodd"
22 clip-rule="evenodd"
23 d="M7.49996 3.95801C9.66928 3.95801 11.8753 4.35915 13.3706 5.19448 13.5394 5.28875 13.5998 5.50197 13.5055 5.67073 13.4113 5.83948 13.198 5.89987 13.0293 5.8056 11.6794 5.05155 9.60799 4.65801 7.49996 4.65801 5.39192 4.65801 3.32052 5.05155 1.97064 5.8056 1.80188 5.89987 1.58866 5.83948 1.49439 5.67073 1.40013 5.50197 1.46051 5.28875 1.62927 5.19448 3.12466 4.35915 5.33063 3.95801 7.49996 3.95801zM7.49996 10.85C9.66928 10.85 11.8753 10.4488 13.3706 9.6135 13.5394 9.51924 13.5998 9.30601 13.5055 9.13726 13.4113 8.9685 13.198 8.90812 13.0293 9.00238 11.6794 9.75643 9.60799 10.15 7.49996 10.15 5.39192 10.15 3.32052 9.75643 1.97064 9.00239 1.80188 8.90812 1.58866 8.9685 1.49439 9.13726 1.40013 9.30601 1.46051 9.51924 1.62927 9.6135 3.12466 10.4488 5.33063 10.85 7.49996 10.85z"
24 fill="currentColor"
25 />
26</svg>
assets/icons/radix/grid.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.5 2H8V7H13V2.5C13 2.22386 12.7761 2 12.5 2ZM13 8H8V13H12.5C12.7761 13 13 12.7761 13 12.5V8ZM7 7V2H2.5C2.22386 2 2 2.22386 2 2.5V7H7ZM2 8V12.5C2 12.7761 2.22386 13 2.5 13H7V8H2ZM2.5 1C1.67157 1 1 1.67157 1 2.5V12.5C1 13.3284 1.67157 14 2.5 14H12.5C13.3284 14 14 13.3284 14 12.5V2.5C14 1.67157 13.3284 1 12.5 1H2.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/group.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.44995 0.949951C1.31734 0.949951 1.19016 1.00263 1.0964 1.0964C1.00263 1.19017 0.949951 1.31735 0.949951 1.44995L0.949966 3.44995C0.949969 3.7261 1.17383 3.94995 1.44997 3.94995C1.72611 3.94995 1.94997 3.72609 1.94997 3.44995L1.94995 1.94995H3.44997C3.72611 1.94995 3.94997 1.72609 3.94997 1.44995C3.94997 1.17381 3.72611 0.949951 3.44997 0.949951H1.44995ZM5.94995 0.949951C5.67381 0.949951 5.44995 1.17381 5.44995 1.44995C5.44995 1.72609 5.67381 1.94995 5.94995 1.94995H8.94995C9.22609 1.94995 9.44995 1.72609 9.44995 1.44995C9.44995 1.17381 9.22609 0.949951 8.94995 0.949951H5.94995ZM5.44995 13.45C5.44995 13.1738 5.67381 12.95 5.94995 12.95H8.94995C9.22609 12.95 9.44995 13.1738 9.44995 13.45C9.44995 13.7261 9.22609 13.95 8.94995 13.95H5.94995C5.67381 13.95 5.44995 13.7261 5.44995 13.45ZM1.94995 5.94995C1.94995 5.67381 1.72609 5.44995 1.44995 5.44995C1.17381 5.44995 0.949951 5.67381 0.949951 5.94995V8.94995C0.949951 9.22609 1.17381 9.44995 1.44995 9.44995C1.72609 9.44995 1.94995 9.22609 1.94995 8.94995V5.94995ZM13.45 5.44995C13.7261 5.44995 13.95 5.67381 13.95 5.94995V8.94995C13.95 9.22609 13.7261 9.44995 13.45 9.44995C13.1738 9.44995 12.95 9.22609 12.95 8.94995V5.94995C12.95 5.67381 13.1738 5.44995 13.45 5.44995ZM11.45 0.949951C11.1738 0.949951 10.95 1.17381 10.95 1.44995C10.95 1.72609 11.1738 1.94995 11.45 1.94995H12.9499V3.44995C12.9499 3.72609 13.1738 3.94995 13.4499 3.94995C13.7261 3.94995 13.9499 3.72609 13.9499 3.44995V1.44995C13.9499 1.17381 13.7252 0.949951 13.449 0.949951H11.45ZM1.44995 10.95C1.72609 10.95 1.94995 11.1738 1.94995 11.45V12.95H3.44997C3.72611 12.95 3.94997 13.1738 3.94997 13.45C3.94997 13.7261 3.72611 13.95 3.44997 13.95H1.44995C1.17381 13.95 0.949951 13.7261 0.949951 13.45V11.45C0.949951 11.1738 1.17381 10.95 1.44995 10.95ZM13.95 11.45C13.95 11.1738 13.7261 10.95 13.45 10.95C13.1738 10.9499 12.95 11.1738 12.95 11.4499L12.9491 12.95H11.45C11.1738 12.95 10.95 13.1738 10.95 13.45C10.95 13.7261 11.1738 13.95 11.45 13.95H13.4499C13.7261 13.95 13.9499 13.7261 13.9499 13.45L13.95 11.45Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/half-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49991 0.876892C3.84222 0.876892 0.877075 3.84204 0.877075 7.49972C0.877075 11.1574 3.84222 14.1226 7.49991 14.1226C11.1576 14.1226 14.1227 11.1574 14.1227 7.49972C14.1227 3.84204 11.1576 0.876892 7.49991 0.876892ZM7.00003 1.84861C4.10114 2.1017 1.82707 4.53515 1.82707 7.49972C1.82707 10.4643 4.10114 12.8977 7.00003 13.1508V1.84861ZM8.00003 13.1508C10.8988 12.8976 13.1727 10.4642 13.1727 7.49972C13.1727 4.53524 10.8988 2.10185 8.00003 1.84864V13.1508Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/half-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49991 0.876892C3.84222 0.876892 0.877075 3.84204 0.877075 7.49972C0.877075 11.1574 3.84222 14.1226 7.49991 14.1226C11.1576 14.1226 14.1227 11.1574 14.1227 7.49972C14.1227 3.84204 11.1576 0.876892 7.49991 0.876892ZM7.49988 1.82689C4.36688 1.8269 1.82707 4.36672 1.82707 7.49972C1.82707 10.6327 4.36688 13.1725 7.49988 13.1726V1.82689Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/hamburger-menu.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.5 3C1.22386 3 1 3.22386 1 3.5C1 3.77614 1.22386 4 1.5 4H13.5C13.7761 4 14 3.77614 14 3.5C14 3.22386 13.7761 3 13.5 3H1.5ZM1 7.5C1 7.22386 1.22386 7 1.5 7H13.5C13.7761 7 14 7.22386 14 7.5C14 7.77614 13.7761 8 13.5 8H1.5C1.22386 8 1 7.77614 1 7.5ZM1 11.5C1 11.2239 1.22386 11 1.5 11H13.5C13.7761 11 14 11.2239 14 11.5C14 11.7761 13.7761 12 13.5 12H1.5C1.22386 12 1 11.7761 1 11.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/hand.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.8113 1.64706C6.62188 2.87918 6.68268 3.88523 6.76848 5.30499C6.78415 5.56426 6.80065 5.83732 6.81661 6.12808C6.83111 6.39208 6.63758 6.62172 6.37495 6.65217C6.11232 6.68262 5.87138 6.50334 5.82509 6.24304L5.74754 5.80698C5.64402 5.16529 5.48355 4.25481 5.17807 3.44741C4.86241 2.61312 4.4486 2.04121 3.93436 1.86044C3.64994 1.76104 3.41901 1.84279 3.25868 2.01052C3.08746 2.18962 2.9976 2.47065 3.0627 2.75399C3.2146 3.34424 3.44627 3.9167 3.69836 4.51802C3.72082 4.57158 3.74346 4.62543 3.76621 4.67954C3.9954 5.22457 4.23619 5.7972 4.41644 6.39081L4.41691 6.39238C4.562 6.87586 4.65646 7.2595 4.73086 7.56165C4.76034 7.68138 4.78667 7.78831 4.81175 7.88359C4.86768 8.09606 4.77836 8.32014 4.59161 8.43588C4.40486 8.55161 4.16445 8.53188 3.99907 8.38725C3.73749 8.15848 3.515 7.92784 3.31817 7.71802C3.27627 7.67335 3.23602 7.63018 3.19705 7.58838C3.04777 7.42826 2.91712 7.28812 2.78334 7.16029C2.45989 6.85122 2.18398 6.68004 1.80585 6.64369L1.80324 6.64343C1.56117 6.61888 1.41402 6.66441 1.31756 6.72627C1.21899 6.78947 1.11988 6.90414 1.03784 7.1123C0.976576 7.28492 1.01515 7.62987 1.1929 7.96911L1.19728 7.97747C1.40086 8.38452 1.74475 8.81587 2.18141 9.29299C2.39739 9.52898 2.62872 9.76849 2.86934 10.0174L2.87966 10.0281C3.11546 10.2721 3.35962 10.5247 3.59713 10.7827C4.4288 11.6863 5.27706 12.7538 5.4627 14H11.5087C11.5636 12.4353 11.8756 11.268 12.2875 10.1346C12.4454 9.70041 12.6121 9.28412 12.7826 8.85829C13.1097 8.04139 13.4509 7.18937 13.7705 6.10824C14.0989 4.99737 14.0097 4.37033 13.8613 4.03984C13.717 3.71858 13.4914 3.61786 13.3816 3.59606C13.1381 3.54774 13.0384 3.60947 12.9698 3.67901C12.867 3.78316 12.7698 3.98273 12.6921 4.30269C12.6166 4.61345 12.5752 4.96517 12.533 5.32501L12.5298 5.35285C12.4924 5.67242 12.4505 6.03016 12.3665 6.30098C12.3383 6.40699 12.2819 6.50407 12.1979 6.57539C12.1382 6.6261 12.0104 6.70818 11.8309 6.69312C11.5424 6.66891 11.3712 6.42143 11.365 6.14783C11.356 5.75454 11.3883 5.35864 11.4074 4.96608C11.4428 4.23646 11.477 3.5337 11.4245 2.8342L11.4242 2.82934C11.3916 2.32997 11.0493 2.00228 10.7007 1.9228C10.5305 1.88401 10.369 1.90601 10.2347 1.9835C10.103 2.05946 9.95535 2.21318 9.8574 2.51394L9.85631 2.51726C9.81525 2.6404 9.77298 2.87753 9.73606 3.2124C9.70044 3.53542 9.67337 3.91279 9.65156 4.29418C9.6329 4.62033 9.61785 4.9584 9.60434 5.26194C9.58728 5.64529 9.57267 5.97357 9.55633 6.1532C9.54983 6.22459 9.52939 6.29493 9.49501 6.35785C9.47356 6.39711 9.36115 6.60947 9.07106 6.61843C8.77917 6.62744 8.63975 6.40057 8.61698 6.35919C8.55634 6.24899 8.55066 6.11807 8.54754 5.99283C8.54474 5.88064 8.54294 5.71798 8.54174 5.54767C8.53935 5.20582 8.53935 4.81919 8.53935 4.70952C8.53935 3.6657 8.53838 2.65372 8.44714 1.64372C8.39183 1.24127 8.06278 1.00455 7.6436 1.00005C7.22399 0.995552 6.87918 1.22704 6.8113 1.64706ZM9.41219 1.3617C9.21469 0.448484 8.39913 0.00810324 7.65433 0.00011154C6.86452 -0.00836308 5.98761 0.465881 5.82365 1.49037L5.82318 1.49334C5.78239 1.7584 5.75229 2.01481 5.7309 2.26652C5.39423 1.67364 4.92622 1.14894 4.2655 0.916859C3.58661 0.679312 2.9492 0.887087 2.53582 1.31952C2.13415 1.73971 1.94438 2.36742 2.09031 2.98746L2.09269 2.99713C2.26478 3.66808 2.52396 4.30316 2.77613 4.90465C2.79814 4.95717 2.8201 5.00941 2.84194 5.06139C3.02139 5.48842 3.19378 5.89866 3.33871 6.31256C2.96404 5.98142 2.51925 5.70796 1.90276 5.6484C1.48865 5.60663 1.10391 5.67536 0.777805 5.88444C0.454239 6.0919 0.240671 6.40405 0.104187 6.75406L0.100868 6.76281C-0.10184 7.31286 0.0663312 7.97157 0.304895 8.42897C0.573704 8.96474 0.996104 9.47904 1.44372 9.96813C1.67046 10.2159 1.91136 10.4652 2.15033 10.7124L2.15682 10.7191C2.39524 10.9658 2.63217 11.2109 2.86134 11.4599C3.80937 12.49 4.50002 13.4632 4.50002 14.5C4.50002 14.7761 4.72388 15 5.00002 15H12C12.2762 15 12.5 14.7761 12.5 14.5C12.5 12.8212 12.8021 11.6462 13.2274 10.4762C13.3653 10.0968 13.5216 9.70579 13.6868 9.29247C14.0238 8.44922 14.398 7.51298 14.7295 6.39175C15.0956 5.15324 15.0559 4.25904 14.7735 3.63017C14.487 2.99208 13.9798 2.6953 13.5763 2.6152C13.1276 2.52614 12.7367 2.60475 12.4268 2.83081C12.4253 2.80773 12.4236 2.78468 12.4219 2.76167C12.3587 1.8105 11.6907 1.12285 10.923 0.947821C10.5346 0.859287 10.1111 0.900393 9.73509 1.11724C9.61852 1.18446 9.51055 1.26623 9.41219 1.3617Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/heading.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.75432 2.0502C8.50579 2.0502 8.30432 2.25167 8.30432 2.5002C8.30432 2.74873 8.50579 2.9502 8.75432 2.9502H9.94997V7.05004H5.04997V2.9502H6.25432C6.50285 2.9502 6.70432 2.74873 6.70432 2.5002C6.70432 2.25167 6.50285 2.0502 6.25432 2.0502H2.75432C2.50579 2.0502 2.30432 2.25167 2.30432 2.5002C2.30432 2.74873 2.50579 2.9502 2.75432 2.9502H3.94997V12.0502H2.75432C2.50579 12.0502 2.30432 12.2517 2.30432 12.5002C2.30432 12.7487 2.50579 12.9502 2.75432 12.9502H6.25432C6.50285 12.9502 6.70432 12.7487 6.70432 12.5002C6.70432 12.2517 6.50285 12.0502 6.25432 12.0502H5.04997V7.95004H9.94997V12.0502H8.75432C8.50579 12.0502 8.30432 12.2517 8.30432 12.5002C8.30432 12.7487 8.50579 12.9502 8.75432 12.9502H12.2543C12.5028 12.9502 12.7043 12.7487 12.7043 12.5002C12.7043 12.2517 12.5028 12.0502 12.2543 12.0502H11.05V2.9502H12.2543C12.5028 2.9502 12.7043 2.74873 12.7043 2.5002C12.7043 2.25167 12.5028 2.0502 12.2543 2.0502H8.75432Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/heart-filled.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.35248 4.90532C1.35248 2.94498 2.936 1.35248 4.89346 1.35248C6.25769 1.35248 6.86058 1.92336 7.50002 2.93545C8.13946 1.92336 8.74235 1.35248 10.1066 1.35248C12.064 1.35248 13.6476 2.94498 13.6476 4.90532C13.6476 6.74041 12.6013 8.50508 11.4008 9.96927C10.2636 11.3562 8.92194 12.5508 8.00601 13.3664C7.94645 13.4194 7.88869 13.4709 7.83291 13.5206C7.64324 13.6899 7.3568 13.6899 7.16713 13.5206C7.11135 13.4709 7.05359 13.4194 6.99403 13.3664C6.0781 12.5508 4.73641 11.3562 3.59926 9.96927C2.39872 8.50508 1.35248 6.74041 1.35248 4.90532Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/heart.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.89346 2.35248C3.49195 2.35248 2.35248 3.49359 2.35248 4.90532C2.35248 6.38164 3.20954 7.9168 4.37255 9.33522C5.39396 10.581 6.59464 11.6702 7.50002 12.4778C8.4054 11.6702 9.60608 10.581 10.6275 9.33522C11.7905 7.9168 12.6476 6.38164 12.6476 4.90532C12.6476 3.49359 11.5081 2.35248 10.1066 2.35248C9.27059 2.35248 8.81894 2.64323 8.5397 2.95843C8.27877 3.25295 8.14623 3.58566 8.02501 3.88993C8.00391 3.9429 7.98315 3.99501 7.96211 4.04591C7.88482 4.23294 7.7024 4.35494 7.50002 4.35494C7.29765 4.35494 7.11523 4.23295 7.03793 4.04592C7.01689 3.99501 6.99612 3.94289 6.97502 3.8899C6.8538 3.58564 6.72126 3.25294 6.46034 2.95843C6.18109 2.64323 5.72945 2.35248 4.89346 2.35248ZM1.35248 4.90532C1.35248 2.94498 2.936 1.35248 4.89346 1.35248C6.0084 1.35248 6.73504 1.76049 7.20884 2.2953C7.32062 2.42147 7.41686 2.55382 7.50002 2.68545C7.58318 2.55382 7.67941 2.42147 7.79119 2.2953C8.265 1.76049 8.99164 1.35248 10.1066 1.35248C12.064 1.35248 13.6476 2.94498 13.6476 4.90532C13.6476 6.74041 12.6013 8.50508 11.4008 9.96927C10.2636 11.3562 8.92194 12.5508 8.00601 13.3664C7.94645 13.4194 7.88869 13.4709 7.83291 13.5206C7.64324 13.6899 7.3568 13.6899 7.16713 13.5206C7.11135 13.4709 7.05359 13.4194 6.99403 13.3664C6.0781 12.5508 4.73641 11.3562 3.59926 9.96927C2.39872 8.50508 1.35248 6.74041 1.35248 4.90532Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/height.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.1813 1.68179C7.35704 1.50605 7.64196 1.50605 7.8177 1.68179L10.3177 4.18179C10.4934 4.35753 10.4934 4.64245 10.3177 4.81819C10.142 4.99392 9.85704 4.99392 9.6813 4.81819L7.9495 3.08638L7.9495 11.9136L9.6813 10.1818C9.85704 10.0061 10.142 10.0061 10.3177 10.1818C10.4934 10.3575 10.4934 10.6424 10.3177 10.8182L7.8177 13.3182C7.73331 13.4026 7.61885 13.45 7.4995 13.45C7.38015 13.45 7.26569 13.4026 7.1813 13.3182L4.6813 10.8182C4.50557 10.6424 4.50557 10.3575 4.6813 10.1818C4.85704 10.0061 5.14196 10.0061 5.3177 10.1818L7.0495 11.9136L7.0495 3.08638L5.3177 4.81819C5.14196 4.99392 4.85704 4.99392 4.6813 4.81819C4.50557 4.64245 4.50557 4.35753 4.6813 4.18179L7.1813 1.68179Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/hobby-knife.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.3536 13.3536C12.1583 13.5488 11.8417 13.5488 11.6465 13.3536L6.39645 8.10355C6.36478 8.07188 6.33824 8.03702 6.31685 8H5.00002C4.78719 8 4.59769 7.86528 4.52777 7.66426L2.12777 0.764277C2.05268 0.548387 2.13355 0.309061 2.3242 0.182972C2.51486 0.0568819 2.76674 0.0761337 2.93602 0.229734L8.336 5.12972C8.44044 5.22449 8.50001 5.35897 8.50001 5.5V5.81684C8.53702 5.83824 8.57189 5.86478 8.60356 5.89645L13.8536 11.1464C14.0488 11.3417 14.0488 11.6583 13.8536 11.8536L12.3536 13.3536ZM8.25 6.95711L7.45711 7.75L12 12.2929L12.7929 11.5L8.25 6.95711ZM3.71669 2.28845L5.35549 7H6.2929L7.50001 5.79289V5.72146L3.71669 2.28845Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/home.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.07926 0.222253C7.31275 -0.007434 7.6873 -0.007434 7.92079 0.222253L14.6708 6.86227C14.907 7.09465 14.9101 7.47453 14.6778 7.71076C14.4454 7.947 14.0655 7.95012 13.8293 7.71773L13 6.90201V12.5C13 12.7761 12.7762 13 12.5 13H2.50002C2.22388 13 2.00002 12.7761 2.00002 12.5V6.90201L1.17079 7.71773C0.934558 7.95012 0.554672 7.947 0.32229 7.71076C0.0899079 7.47453 0.0930283 7.09465 0.32926 6.86227L7.07926 0.222253ZM7.50002 1.49163L12 5.91831V12H10V8.49999C10 8.22385 9.77617 7.99999 9.50002 7.99999H6.50002C6.22388 7.99999 6.00002 8.22385 6.00002 8.49999V12H3.00002V5.91831L7.50002 1.49163ZM7.00002 12H9.00002V8.99999H7.00002V12Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/iconjar-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 0.0032959C6.80473 0.0032959 6.24953 0.281106 6.25 0.749995C6.25 0.997258 6.42446 1.12014 6.57687 1.22749C6.69507 1.31074 6.8 1.38465 6.8 1.5C6.8 1.7071 6.06224 1.74264 5.19789 1.78427C3.97553 1.84314 2.5 1.91421 2.5 2.5C2.5 2.77614 2.72386 3 3 3H12C12.2761 3 12.5 2.77614 12.5 2.5C12.5 1.91421 11.0245 1.84314 9.80211 1.78427C8.93776 1.74264 8.2 1.7071 8.2 1.5C8.2 1.38465 8.30493 1.31074 8.42313 1.22749C8.57554 1.12014 8.75 0.997258 8.75 0.749995C8.75047 0.281106 8.19527 0.0032959 7.5 0.0032959ZM2.89451 6.12266C2.25806 6.52471 1.90417 7.31118 2.02473 8.0556L2.83588 12.4772C3.00993 13.3562 3.7629 14 4.66061 14H10.3373C11.2354 14 11.9884 13.3562 12.1625 12.4772L12.9736 8.05607C13.089 7.32358 12.8284 6.53276 12.1331 6.09373C11.7283 5.83013 11.6412 5.33231 12.1331 5.12796C12.8284 4.86435 12.6948 4 12 4H10.3001H6.80005H2.99996C2.30469 4 2.19878 4.89328 2.89451 5.15689C3.38642 5.33231 3.29939 5.83013 2.89451 6.12266ZM8.20006 6.25C8.20006 5.81769 8.08572 5.37615 7.90635 5L4.11093 5C4.20626 5.21312 4.2419 5.43889 4.22904 5.65521C4.19522 6.22412 3.84587 6.66899 3.48016 6.93322L3.45492 6.95146L3.42858 6.9681C3.13407 7.15414 2.95801 7.53989 3.01058 7.88749L3.81797 12.2886C3.90513 12.7154 4.26148 13 4.66061 13H10.3373C10.737 13 11.0932 12.7153 11.1804 12.2886L11.9874 7.8898C12.048 7.48247 11.8954 7.12631 11.5992 6.93927L11.5875 6.93184L11.5875 6.93176C11.1947 6.67602 10.8331 6.22785 10.7986 5.64798C10.7846 5.412 10.8264 5.19397 10.9112 5H9.05517C9.01987 5.14611 9.00006 5.31201 9.00006 5.5C9.00006 5.9745 9.21679 6.37127 9.44367 6.78662C9.69284 7.24278 9.95425 7.72136 9.95425 8.34993C9.95425 9.2698 9.49868 9.84205 8.62189 9.84205C8.13206 9.84205 7.57818 9.46097 7.57818 8.75781C7.57818 8.35279 7.71558 8.01646 7.86121 7.65998C8.0254 7.25806 8.20006 6.83051 8.20006 6.25Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/id-card.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M14 11.0001V4.00006L1 4.00006L1 11.0001H14ZM15 4.00006V11.0001C15 11.5523 14.5523 12.0001 14 12.0001H1C0.447715 12.0001 0 11.5523 0 11.0001V4.00006C0 3.44778 0.447715 3.00006 1 3.00006H14C14.5523 3.00006 15 3.44778 15 4.00006ZM2 5.25C2 5.11193 2.11193 5 2.25 5H5.75C5.88807 5 6 5.11193 6 5.25V9.75C6 9.88807 5.88807 10 5.75 10H2.25C2.11193 10 2 9.88807 2 9.75V5.25ZM7.5 7C7.22386 7 7 7.22386 7 7.5C7 7.77614 7.22386 8 7.5 8H10.5C10.7761 8 11 7.77614 11 7.5C11 7.22386 10.7761 7 10.5 7H7.5ZM7 9.5C7 9.22386 7.22386 9 7.5 9H12.5C12.7761 9 13 9.22386 13 9.5C13 9.77614 12.7761 10 12.5 10H7.5C7.22386 10 7 9.77614 7 9.5ZM7.5 5C7.22386 5 7 5.22386 7 5.5C7 5.77614 7.22386 6 7.5 6H11.5C11.7761 6 12 5.77614 12 5.5C12 5.22386 11.7761 5 11.5 5H7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/image.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.5 1H12.5C13.3284 1 14 1.67157 14 2.5V12.5C14 13.3284 13.3284 14 12.5 14H2.5C1.67157 14 1 13.3284 1 12.5V2.5C1 1.67157 1.67157 1 2.5 1ZM2.5 2C2.22386 2 2 2.22386 2 2.5V8.3636L3.6818 6.6818C3.76809 6.59551 3.88572 6.54797 4.00774 6.55007C4.12975 6.55216 4.24568 6.60372 4.32895 6.69293L7.87355 10.4901L10.6818 7.6818C10.8575 7.50607 11.1425 7.50607 11.3182 7.6818L13 9.3636V2.5C13 2.22386 12.7761 2 12.5 2H2.5ZM2 12.5V9.6364L3.98887 7.64753L7.5311 11.4421L8.94113 13H2.5C2.22386 13 2 12.7761 2 12.5ZM12.5 13H10.155L8.48336 11.153L11 8.6364L13 10.6364V12.5C13 12.7761 12.7761 13 12.5 13ZM6.64922 5.5C6.64922 5.03013 7.03013 4.64922 7.5 4.64922C7.96987 4.64922 8.35078 5.03013 8.35078 5.5C8.35078 5.96987 7.96987 6.35078 7.5 6.35078C7.03013 6.35078 6.64922 5.96987 6.64922 5.5ZM7.5 3.74922C6.53307 3.74922 5.74922 4.53307 5.74922 5.5C5.74922 6.46693 6.53307 7.25078 7.5 7.25078C8.46693 7.25078 9.25078 6.46693 9.25078 5.5C9.25078 4.53307 8.46693 3.74922 7.5 3.74922Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/info-circled.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49991 0.876892C3.84222 0.876892 0.877075 3.84204 0.877075 7.49972C0.877075 11.1574 3.84222 14.1226 7.49991 14.1226C11.1576 14.1226 14.1227 11.1574 14.1227 7.49972C14.1227 3.84204 11.1576 0.876892 7.49991 0.876892ZM1.82707 7.49972C1.82707 4.36671 4.36689 1.82689 7.49991 1.82689C10.6329 1.82689 13.1727 4.36671 13.1727 7.49972C13.1727 10.6327 10.6329 13.1726 7.49991 13.1726C4.36689 13.1726 1.82707 10.6327 1.82707 7.49972ZM8.24992 4.49999C8.24992 4.9142 7.91413 5.24999 7.49992 5.24999C7.08571 5.24999 6.74992 4.9142 6.74992 4.49999C6.74992 4.08577 7.08571 3.74999 7.49992 3.74999C7.91413 3.74999 8.24992 4.08577 8.24992 4.49999ZM6.00003 5.99999H6.50003H7.50003C7.77618 5.99999 8.00003 6.22384 8.00003 6.49999V9.99999H8.50003H9.00003V11H8.50003H7.50003H6.50003H6.00003V9.99999H6.50003H7.00003V6.99999H6.50003H6.00003V5.99999Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/inner-shadow.svg+78−0
@@ -0,0 +1,78 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.877075 7.49988C0.877075 3.84219 3.84222 0.877045 7.49991 0.877045C11.1576 0.877045 14.1227 3.84219 14.1227 7.49988C14.1227 11.1575 11.1576 14.1227 7.49991 14.1227C3.84222 14.1227 0.877075 11.1575 0.877075 7.49988ZM7.49991 1.82704C4.36689 1.82704 1.82708 4.36686 1.82708 7.49988C1.82708 10.6329 4.36689 13.1727 7.49991 13.1727C10.6329 13.1727 13.1727 10.6329 13.1727 7.49988C13.1727 4.36686 10.6329 1.82704 7.49991 1.82704Z"
6 fill="currentColor"
7 />
8 <path
9 opacity=".05"
10 fill-rule="evenodd"
11 clip-rule="evenodd"
12 d="M12.1619 3.85182C8.35817 4.88918 4.88936 8.358 3.85199 12.1617L3.3696 12.0301C4.45356 8.05564 8.05581 4.45339 12.0303 3.36943L12.1619 3.85182Z"
13 fill="currentColor"
14 />
15 <path
16 opacity=".1"
17 fill-rule="evenodd"
18 clip-rule="evenodd"
19 d="M11.8807 3.42707C8.03441 4.50542 4.50561 8.03422 3.42726 11.8805L2.94582 11.7456C4.07129 7.73121 7.7314 4.0711 11.7458 2.94563L11.8807 3.42707Z"
20 fill="currentColor"
21 />
22 <path
23 opacity=".15"
24 fill-rule="evenodd"
25 clip-rule="evenodd"
26 d="M11.5201 3.02556C7.69092 4.16199 4.16779 7.68323 3.02805 11.512L2.54883 11.3694C3.73676 7.37869 7.38659 3.73076 11.3778 2.54623L11.5201 3.02556Z"
27 fill="currentColor"
28 />
29 <path
30 opacity=".2"
31 fill-rule="evenodd"
32 clip-rule="evenodd"
33 d="M11.0468 2.66169C7.31117 3.87664 3.87918 7.3079 2.66298 11.0434L2.18754 10.8886C3.45324 7.00109 7.00445 3.45062 10.8921 2.18621L11.0468 2.66169Z"
34 fill="currentColor"
35 />
36 <path
37 opacity=".25"
38 fill-rule="evenodd"
39 clip-rule="evenodd"
40 d="M10.5201 2.32365C6.92091 3.61447 3.62391 6.90876 2.32845 10.5073L1.858 10.338C3.20398 6.59909 6.61155 3.19424 10.3513 1.85301L10.5201 2.32365Z"
41 fill="currentColor"
42 />
43 <path
44 opacity=".3"
45 fill-rule="evenodd"
46 clip-rule="evenodd"
47 d="M9.90222 2.03122C6.50003 3.39465 3.39968 6.49367 2.03399 9.89551L1.56998 9.70924C2.98651 6.18076 6.18728 2.98133 9.71622 1.5671L9.90222 2.03122Z"
48 fill="currentColor"
49 />
50 <path
51 opacity=".35"
52 fill-rule="evenodd"
53 clip-rule="evenodd"
54 d="M9.20727 1.78873C6.06136 3.20349 3.21103 6.05203 1.79331 9.19738L1.33747 8.99192C2.80536 5.73528 5.74485 2.7976 9.0022 1.33272L9.20727 1.78873Z"
55 fill="currentColor"
56 />
57 <path
58 opacity=".4"
59 fill-rule="evenodd"
60 clip-rule="evenodd"
61 d="M8.40713 1.62085C5.59323 3.05117 3.05794 5.58509 1.62544 8.39847L1.17987 8.1716C2.66036 5.26397 5.27232 2.6534 8.18057 1.17513L8.40713 1.62085Z"
62 fill="currentColor"
63 />
64 <path
65 opacity=".45"
66 fill-rule="evenodd"
67 clip-rule="evenodd"
68 d="M7.46207 1.56747C5.08689 2.94695 2.95362 5.07912 1.57249 7.45379L1.14028 7.20241C2.56503 4.75273 4.7607 2.55818 7.21096 1.1351L7.46207 1.56747Z"
69 fill="currentColor"
70 />
71 <path
72 opacity=".5"
73 fill-rule="evenodd"
74 clip-rule="evenodd"
75 d="M6.30407 1.70487C4.51964 2.91063 2.90983 4.52061 1.7043 6.30513L1.28998 6.02524C2.5313 4.18773 4.18673 2.53214 6.02413 1.29059L6.30407 1.70487Z"
76 fill="currentColor"
77 />
78</svg>
assets/icons/radix/input.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.5 1C6.22386 1 6 1.22386 6 1.5C6 1.77614 6.22386 2 6.5 2C7.12671 2 7.45718 2.20028 7.65563 2.47812C7.8781 2.78957 8 3.28837 8 4V11C8 11.7116 7.8781 12.2104 7.65563 12.5219C7.45718 12.7997 7.12671 13 6.5 13C6.22386 13 6 13.2239 6 13.5C6 13.7761 6.22386 14 6.5 14C7.37329 14 8.04282 13.7003 8.46937 13.1031C8.47976 13.0886 8.48997 13.0739 8.5 13.0591C8.51003 13.0739 8.52024 13.0886 8.53063 13.1031C8.95718 13.7003 9.62671 14 10.5 14C10.7761 14 11 13.7761 11 13.5C11 13.2239 10.7761 13 10.5 13C9.87329 13 9.54282 12.7997 9.34437 12.5219C9.1219 12.2104 9 11.7116 9 11V4C9 3.28837 9.1219 2.78957 9.34437 2.47812C9.54282 2.20028 9.87329 2 10.5 2C10.7761 2 11 1.77614 11 1.5C11 1.22386 10.7761 1 10.5 1C9.62671 1 8.95718 1.29972 8.53063 1.89688C8.52024 1.91143 8.51003 1.92611 8.5 1.9409C8.48997 1.92611 8.47976 1.91143 8.46937 1.89688C8.04282 1.29972 7.37329 1 6.5 1ZM14 5H11V4H14C14.5523 4 15 4.44772 15 5V10C15 10.5523 14.5523 11 14 11H11V10H14V5ZM6 4V5H1L1 10H6V11H1C0.447715 11 0 10.5523 0 10V5C0 4.44772 0.447715 4 1 4H6Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/instagram-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 d="M4.84293 1.5386C5.5247 1.50748 5.7372 1.5 7.50006 1.5C9.26294 1.5 9.47534 1.50748 10.1571 1.53872L10.1572 1.53873C10.8016 1.56802 11.2198 1.66861 11.5768 1.80722L11.5768 1.80724L11.5817 1.80908C11.9473 1.94671 12.2786 2.16246 12.5523 2.44128L12.5523 2.44134L12.5588 2.44777C12.8376 2.72149 13.0533 3.05273 13.1909 3.41838L13.1909 3.41839L13.1928 3.42341C13.3315 3.78023 13.4321 4.19841 13.4615 4.84288C13.4926 5.52465 13.5001 5.73717 13.5001 7.50001C13.5001 9.26285 13.4926 9.47528 13.4615 10.1572C13.4321 10.8016 13.3315 11.2198 13.1928 11.5766L13.1925 11.5774C13.0506 11.9442 12.8337 12.2774 12.5556 12.5555C12.2775 12.8336 11.9443 13.0505 11.5775 13.1924L11.5767 13.1927C11.2199 13.3314 10.8017 13.432 10.1572 13.4614C9.47548 13.4925 9.26296 13.5 7.50012 13.5C5.73728 13.5 5.52485 13.4925 4.84298 13.4614C4.19854 13.432 3.78036 13.3314 3.42351 13.1927L3.42352 13.1927L3.41848 13.1908C3.05283 13.0532 2.7216 12.8375 2.44787 12.5587L2.44793 12.5587L2.44142 12.5523C2.16265 12.2785 1.94695 11.9473 1.80935 11.5816L1.80937 11.5816L1.80742 11.5766C1.66874 11.2198 1.56814 10.8016 1.53872 10.1571L1.53872 10.1571C1.50748 9.47534 1.5 9.26289 1.5 7.50001C1.5 5.73714 1.50748 5.52469 1.53872 4.84297L1.53873 4.84279C1.56802 4.19838 1.66861 3.78018 1.80722 3.42325L1.80724 3.42326L1.80907 3.4184C1.94672 3.05274 2.16248 2.7215 2.44131 2.44779L2.44137 2.44785L2.44782 2.44129C2.72154 2.16252 3.05278 1.94682 3.41843 1.80922L3.41844 1.80924L3.42346 1.80729C3.78028 1.66861 4.19845 1.56801 4.84293 1.5386ZM4.84293 1.5386L4.82014 1.03912M4.84293 1.5386L4.82014 1.03912M4.82014 1.03912C4.12826 1.0707 3.65578 1.18056 3.24233 1.34125L1.03924 10.1799C1.07083 10.8718 1.18069 11.3443 1.34138 11.7577C1.5046 12.1915 1.76045 12.5843 2.09111 12.909C2.41578 13.2397 2.80867 13.4955 3.24238 13.6587C3.65586 13.8194 4.12834 13.9293 4.82019 13.9609C5.51348 13.9925 5.73483 14 7.50012 14C9.2654 14 9.48685 13.9925 10.18 13.9609C10.8719 13.9293 11.3444 13.8194 11.7578 13.6587C12.1896 13.4917 12.5818 13.2364 12.9091 12.909C13.2365 12.5817 13.4918 12.1895 13.6588 11.7577C13.8195 11.3443 13.9294 10.8718 13.961 10.1799C13.9926 9.48665 14.0001 9.26529 14.0001 7.50001C14.0001 5.73473 13.9926 5.51328 13.961 4.82008C13.9294 4.12821 13.8195 3.65573 13.6588 3.24228C13.4956 2.80857 13.2398 2.41567 12.9091 2.091C12.5844 1.76028 12.1915 1.50437 11.7578 1.34113C11.3443 1.18056 10.8718 1.0707 10.1799 1.03924C9.48675 1.00748 9.26537 1 7.50006 1C5.73476 1 5.51333 1.00748 4.82014 1.03912Z"
4 stroke="currentColor"
5 />
6 <circle cx="7.5" cy="7.5" r="2.75" stroke="currentColor" />
7 <circle cx="10.97" cy="4.03" r=".75" fill="currentColor" />
8</svg>
assets/icons/radix/justify-center.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.94998 5.99994L11 5.99994L11 8.99994L7.94998 8.99994L7.94998 5.99994ZM7.94998 4.99994L7.94998 1.49913C7.94998 1.25061 7.74851 1.04913 7.49998 1.04913C7.25145 1.04913 7.04998 1.2506 7.04998 1.49913L7.04998 4.99994L3.75 4.99994C3.33579 4.99994 3 5.33572 3 5.74994L3 9.24994C3 9.66415 3.33579 9.99994 3.75 9.99994L7.04998 9.99994L7.04998 13.4991C7.04998 13.7477 7.25145 13.9491 7.49998 13.9491C7.7485 13.9491 7.94998 13.7477 7.94998 13.4991L7.94998 9.99994L11.25 9.99994C11.6642 9.99994 12 9.66415 12 9.24994L12 5.74994C12 5.33573 11.6642 4.99994 11.25 4.99994L7.94998 4.99994ZM7.04998 8.99994L4 8.99994L4 5.99994L7.04998 5.99994L7.04998 8.99994Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/justify-end.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.95 1.49953C13.95 1.251 13.7485 1.04953 13.5 1.04953C13.2514 1.04953 13.05 1.251 13.05 1.49953L13.05 13.4995C13.05 13.7481 13.2514 13.9495 13.5 13.9495C13.7485 13.9495 13.95 13.7481 13.95 13.4995L13.95 1.49953ZM3.99997 5.99997L11 5.99997L11 8.99997L3.99997 8.99997L3.99997 5.99997ZM11.25 4.99997C11.6642 4.99997 12 5.33576 12 5.74997L12 9.24997C12 9.66418 11.6642 9.99997 11.25 9.99997L3.74997 9.99997C3.33576 9.99997 2.99997 9.66418 2.99997 9.24997L2.99997 5.74997C2.99998 5.33576 3.33576 4.99997 3.74998 4.99997L11.25 4.99997Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/justify-start.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.05005 13.5005C1.05005 13.749 1.25152 13.9505 1.50005 13.9505C1.74858 13.9505 1.95005 13.749 1.95005 13.5005L1.95005 1.50047C1.95005 1.25194 1.74858 1.05047 1.50005 1.05047C1.25152 1.05047 1.05005 1.25194 1.05005 1.50047L1.05005 13.5005ZM11 9.00003L4.00002 9.00003L4.00002 6.00003L11 6.00003L11 9.00003ZM3.75002 10C3.33581 10 3.00002 9.66424 3.00002 9.25003L3.00002 5.75003C3.00002 5.33582 3.33581 5.00003 3.75002 5.00003L11.25 5.00003C11.6642 5.00003 12 5.33582 12 5.75003L12 9.25003C12 9.66424 11.6642 10 11.25 10L3.75002 10Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/justify-stretch.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.5 1.04956C13.7485 1.04956 13.95 1.25103 13.95 1.49956L13.95 13.4996C13.95 13.7481 13.7485 13.9496 13.5 13.9496C13.2514 13.9496 13.05 13.7481 13.05 13.4996L13.05 1.49956C13.05 1.25103 13.2514 1.04956 13.5 1.04956ZM1.49995 1.04966C1.74848 1.04966 1.94995 1.25113 1.94995 1.49966L1.94995 13.4997C1.94995 13.7482 1.74848 13.9497 1.49995 13.9497C1.25142 13.9497 1.04995 13.7482 1.04995 13.4997L1.04995 1.49966C1.04995 1.25113 1.25142 1.04966 1.49995 1.04966ZM3.99997 6L11 6L11 9L3.99997 9L3.99997 6ZM11.25 5C11.6642 5 12 5.33579 12 5.75L12 9.25C12 9.66421 11.6642 10 11.25 10L3.74997 10C3.33576 10 2.99997 9.66421 2.99997 9.25L2.99997 5.75C2.99998 5.33579 3.33576 5 3.74998 5L11.25 5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/keyboard.svg+7−0
@@ -0,0 +1,7 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <rect x=".5" y="3.5" width="14" height="8" rx="1" stroke="currentColor" />
3 <path
4 fill="currentColor"
5 d="M2 5H3V6H2zM4 5H5V6H4zM6 5H7V6H6zM8 5H9V6H8zM10 5H11V6H10zM12 5H13V6H12zM11 7H12V8H11zM12 9H13V10H12zM9 7H10V8H9zM7 7H8V8H7zM5 7H6V8H5zM3 7H4V8H3zM2 9H3V10H2zM4 9H11V10H4z"
6 />
7</svg>
assets/icons/radix/lap-timer.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.49998 0.5C5.49998 0.223858 5.72383 0 5.99998 0H7.49998H8.99998C9.27612 0 9.49998 0.223858 9.49998 0.5C9.49998 0.776142 9.27612 1 8.99998 1H7.99998V2.11922C9.09832 2.20409 10.119 2.56622 10.992 3.13572C11.0116 3.10851 11.0336 3.08252 11.058 3.05806L12.058 2.05806C12.3021 1.81398 12.6978 1.81398 12.9419 2.05806C13.186 2.30214 13.186 2.69786 12.9419 2.94194L11.967 3.91682C13.1595 5.07925 13.9 6.70314 13.9 8.49998C13.9 12.0346 11.0346 14.9 7.49998 14.9C3.96535 14.9 1.09998 12.0346 1.09998 8.49998C1.09998 5.13361 3.69904 2.3743 6.99998 2.11922V1H5.99998C5.72383 1 5.49998 0.776142 5.49998 0.5ZM2.09998 8.49998C2.09998 5.51764 4.51764 3.09998 7.49998 3.09998C10.4823 3.09998 12.9 5.51764 12.9 8.49998C12.9 11.4823 10.4823 13.9 7.49998 13.9C4.51764 13.9 2.09998 11.4823 2.09998 8.49998ZM7.49998 8.49998V4.09998C5.06992 4.09998 3.09998 6.06992 3.09998 8.49998C3.09998 10.93 5.06992 12.9 7.49998 12.9C8.715 12.9 9.815 12.4075 10.6112 11.6112L7.49998 8.49998Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/laptop.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 4.25C2 4.11193 2.11193 4 2.25 4H12.75C12.8881 4 13 4.11193 13 4.25V11.5H2V4.25ZM2.25 3C1.55964 3 1 3.55964 1 4.25V12H0V12.5C0 12.7761 0.223858 13 0.5 13H14.5C14.7761 13 15 12.7761 15 12.5V12H14V4.25C14 3.55964 13.4404 3 12.75 3H2.25Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/layers.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.75432 0.819537C7.59742 0.726821 7.4025 0.726821 7.24559 0.819537L1.74559 4.06954C1.59336 4.15949 1.49996 4.32317 1.49996 4.5C1.49996 4.67683 1.59336 4.84051 1.74559 4.93046L7.24559 8.18046C7.4025 8.27318 7.59742 8.27318 7.75432 8.18046L13.2543 4.93046C13.4066 4.84051 13.5 4.67683 13.5 4.5C13.5 4.32317 13.4066 4.15949 13.2543 4.06954L7.75432 0.819537ZM7.49996 7.16923L2.9828 4.5L7.49996 1.83077L12.0171 4.5L7.49996 7.16923ZM1.5695 7.49564C1.70998 7.2579 2.01659 7.17906 2.25432 7.31954L7.49996 10.4192L12.7456 7.31954C12.9833 7.17906 13.2899 7.2579 13.4304 7.49564C13.5709 7.73337 13.4921 8.03998 13.2543 8.18046L7.75432 11.4305C7.59742 11.5232 7.4025 11.5232 7.24559 11.4305L1.74559 8.18046C1.50786 8.03998 1.42901 7.73337 1.5695 7.49564ZM1.56949 10.4956C1.70998 10.2579 2.01658 10.1791 2.25432 10.3195L7.49996 13.4192L12.7456 10.3195C12.9833 10.1791 13.2899 10.2579 13.4304 10.4956C13.5709 10.7334 13.4921 11.04 13.2543 11.1805L7.75432 14.4305C7.59742 14.5232 7.4025 14.5232 7.24559 14.4305L1.74559 11.1805C1.50785 11.04 1.42901 10.7334 1.56949 10.4956Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/layout.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9 2H6V13H9V2ZM10 2V13H12.5C12.7761 13 13 12.7761 13 12.5V2.5C13 2.22386 12.7761 2 12.5 2H10ZM2.5 2H5V13H2.5C2.22386 13 2 12.7761 2 12.5V2.5C2 2.22386 2.22386 2 2.5 2ZM2.5 1C1.67157 1 1 1.67157 1 2.5V12.5C1 13.3284 1.67157 14 2.5 14H12.5C13.3284 14 14 13.3284 14 12.5V2.5C14 1.67157 13.3284 1 12.5 1H2.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/letter-case-capitalize.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.68979 2.75C3.89667 2.74979 4.08232 2.87701 4.15679 3.07003L7.36662 11.39C7.46602 11.6477 7.33774 11.9371 7.0801 12.0365C6.82247 12.1359 6.53304 12.0076 6.43365 11.75L5.3825 9.02537H2.01133L0.966992 11.749C0.868128 12.0068 0.578964 12.1357 0.321126 12.0369C0.0632878 11.938 -0.0655864 11.6488 0.0332774 11.391L3.22344 3.07099C3.29751 2.87782 3.4829 2.75021 3.68979 2.75ZM3.69174 4.64284L5.05458 8.17537H2.33724L3.69174 4.64284ZM10.8989 5.20703C9.25818 5.20703 8.00915 6.68569 8.00915 8.60972C8.00915 10.6337 9.35818 12.0124 10.8989 12.0124C11.7214 12.0124 12.5744 11.6692 13.1543 11.0219V11.53C13.1543 11.7785 13.3557 11.98 13.6043 11.98C13.8528 11.98 14.0543 11.7785 14.0543 11.53V5.72C14.0543 5.47147 13.8528 5.27 13.6043 5.27C13.3557 5.27 13.1543 5.47147 13.1543 5.72V6.22317C12.6054 5.60095 11.7924 5.20703 10.8989 5.20703ZM13.1543 9.79823V7.30195C12.7639 6.58101 11.9414 6.05757 11.0868 6.05757C10.1088 6.05757 9.03503 6.96581 9.03503 8.60955C9.03503 10.1533 10.0088 11.1615 11.0868 11.1615C11.9701 11.1615 12.7719 10.4952 13.1543 9.79823Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/letter-case-lowercase.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.69899 5.20703C2.05823 5.20703 0.809204 6.68569 0.809204 8.60972C0.809204 10.6337 2.15823 12.0124 3.69899 12.0124C4.52126 12.0124 5.37402 11.6693 5.9539 11.0223V11.53C5.9539 11.7785 6.15537 11.98 6.4039 11.98C6.65243 11.98 6.8539 11.7785 6.8539 11.53V5.72001C6.8539 5.47149 6.65243 5.27001 6.4039 5.27001C6.15537 5.27001 5.9539 5.47149 5.9539 5.72001V6.22269C5.40506 5.60075 4.59218 5.20703 3.69899 5.20703ZM5.9539 9.799V7.30117C5.56339 6.58064 4.74118 6.05757 3.8868 6.05757C2.9089 6.05757 1.83508 6.96581 1.83508 8.60955C1.83508 10.1533 2.80889 11.1615 3.8868 11.1615C4.76984 11.1615 5.57141 10.4957 5.9539 9.799ZM10.799 5.20703C9.15823 5.20703 7.9092 6.68569 7.9092 8.60972C7.9092 10.6337 9.25823 12.0124 10.799 12.0124C11.6215 12.0124 12.4744 11.6692 13.0543 11.0218V11.53C13.0543 11.7785 13.2558 11.98 13.5043 11.98C13.7529 11.98 13.9543 11.7785 13.9543 11.53V5.72C13.9543 5.47147 13.7529 5.27 13.5043 5.27C13.2558 5.27 13.0543 5.47147 13.0543 5.72V6.22318C12.5055 5.60095 11.6924 5.20703 10.799 5.20703ZM13.0543 9.79822V7.30196C12.664 6.58102 11.8415 6.05757 10.9868 6.05757C10.0089 6.05757 8.93508 6.96581 8.93508 8.60955C8.93508 10.1533 9.90889 11.1615 10.9868 11.1615C11.8702 11.1615 12.672 10.4952 13.0543 9.79822Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/letter-case-toggle.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11.2895 2.75C11.4964 2.74979 11.6821 2.87701 11.7565 3.07003L14.9664 11.39C15.0657 11.6477 14.9375 11.9371 14.6798 12.0365C14.4222 12.1359 14.1328 12.0076 14.0334 11.75L12.9822 9.02537H9.61106L8.56672 11.749C8.46786 12.0068 8.1787 12.1357 7.92086 12.0369C7.66302 11.938 7.53415 11.6488 7.63301 11.391L10.8232 3.07099C10.8972 2.87782 11.0826 2.75021 11.2895 2.75ZM11.2915 4.64284L12.6543 8.17537H9.93698L11.2915 4.64284ZM2.89895 5.20703C1.25818 5.20703 0.00915527 6.68569 0.00915527 8.60972C0.00915527 10.6337 1.35818 12.0124 2.89895 12.0124C3.72141 12.0124 4.57438 11.6692 5.15427 11.0219V11.53C5.15427 11.7785 5.35574 11.98 5.60427 11.98C5.8528 11.98 6.05427 11.7785 6.05427 11.53V5.72C6.05427 5.47147 5.8528 5.27 5.60427 5.27C5.35574 5.27 5.15427 5.47147 5.15427 5.72V6.22317C4.60543 5.60095 3.79236 5.20703 2.89895 5.20703ZM5.15427 9.79823V7.30195C4.76393 6.58101 3.94144 6.05757 3.08675 6.05757C2.10885 6.05757 1.03503 6.96581 1.03503 8.60955C1.03503 10.1533 2.00885 11.1615 3.08675 11.1615C3.97011 11.1615 4.77195 10.4952 5.15427 9.79823Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/letter-case-uppercase.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.6255 2.75C3.83478 2.75 4.02192 2.88034 4.09448 3.07664L7.16985 11.3962C7.2656 11.6552 7.13324 11.9428 6.87423 12.0386C6.61522 12.1343 6.32763 12.002 6.23188 11.7429L5.22387 9.01603H2.02712L1.01911 11.7429C0.923362 12.002 0.635774 12.1343 0.376762 12.0386C0.117749 11.9428 -0.0146052 11.6552 0.0811401 11.3962L3.15651 3.07664C3.22908 2.88034 3.41621 2.75 3.6255 2.75ZM3.6255 4.69207L4.90966 8.16603H2.34133L3.6255 4.69207ZM11.3719 2.75C11.5811 2.75 11.7683 2.88034 11.8408 3.07664L14.9162 11.3962C15.012 11.6552 14.8796 11.9428 14.6206 12.0386C14.3616 12.1343 14.074 12.002 13.9782 11.7429L12.9702 9.01603H9.77348L8.76547 11.7429C8.66972 12.002 8.38213 12.1343 8.12312 12.0386C7.86411 11.9428 7.73175 11.6552 7.8275 11.3962L10.9029 3.07664C10.9754 2.88034 11.1626 2.75 11.3719 2.75ZM11.3719 4.69207L12.656 8.16603H10.0877L11.3719 4.69207Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/letter-spacing.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.55293 0.999969C4.75295 0.999969 4.93372 1.11917 5.0125 1.30301L8.01106 8.29982C8.11984 8.55363 8.00226 8.84757 7.74844 8.95635C7.49463 9.06512 7.20069 8.94754 7.09191 8.69373L6.11613 6.41685H2.98973L2.01395 8.69373C1.90517 8.94754 1.61123 9.06512 1.35742 8.95635C1.1036 8.84757 0.986023 8.55363 1.0948 8.29982L4.09336 1.30301C4.17214 1.11917 4.35291 0.999969 4.55293 0.999969ZM4.55293 2.76929L5.75186 5.56685H3.354L4.55293 2.76929ZM11.0562 9.00214C11.2617 9.00214 11.4463 8.87633 11.5215 8.68502L14.2733 1.68299C14.3743 1.42598 14.2478 1.13575 13.9908 1.03475C13.7338 0.933747 13.4436 1.06021 13.3426 1.31722L11.0562 7.13514L8.76973 1.31722C8.66873 1.06021 8.3785 0.933747 8.1215 1.03475C7.86449 1.13575 7.73802 1.42598 7.83902 1.68299L10.5908 8.68502C10.666 8.87633 10.8506 9.00214 11.0562 9.00214ZM14.9537 12.4999C14.9537 12.606 14.9115 12.7077 14.8365 12.7828L12.8365 14.7828C12.6803 14.939 12.4271 14.939 12.2708 14.7828C12.1146 14.6265 12.1146 14.3733 12.2708 14.2171L13.588 12.8999H1.51937L2.83653 14.2171C2.99274 14.3733 2.99274 14.6265 2.83653 14.7828C2.68032 14.939 2.42705 14.939 2.27084 14.7828L0.270843 12.7828C0.195828 12.7077 0.153687 12.606 0.153687 12.4999C0.153687 12.3938 0.195828 12.2921 0.270843 12.2171L2.27084 10.2171C2.42705 10.0609 2.68032 10.0609 2.83653 10.2171C2.99274 10.3733 2.99274 10.6265 2.83653 10.7828L1.51937 12.0999L13.588 12.0999L12.2708 10.7828C12.1146 10.6265 12.1146 10.3733 12.2708 10.2171C12.4271 10.0609 12.6803 10.0609 12.8365 10.2171L14.8365 12.2171C14.9115 12.2921 14.9537 12.3938 14.9537 12.4999Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/lightning-bolt.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.69667 0.0403541C8.90859 0.131038 9.03106 0.354857 8.99316 0.582235L8.0902 6.00001H12.5C12.6893 6.00001 12.8625 6.10701 12.9472 6.27641C13.0319 6.4458 13.0136 6.6485 12.8999 6.80001L6.89997 14.8C6.76167 14.9844 6.51521 15.0503 6.30328 14.9597C6.09135 14.869 5.96888 14.6452 6.00678 14.4178L6.90974 9H2.49999C2.31061 9 2.13748 8.893 2.05278 8.72361C1.96809 8.55422 1.98636 8.35151 2.09999 8.2L8.09997 0.200038C8.23828 0.0156255 8.48474 -0.0503301 8.69667 0.0403541ZM3.49999 8.00001H7.49997C7.64695 8.00001 7.78648 8.06467 7.88148 8.17682C7.97648 8.28896 8.01733 8.43723 7.99317 8.5822L7.33027 12.5596L11.5 7.00001H7.49997C7.353 7.00001 7.21347 6.93534 7.11846 6.8232C7.02346 6.71105 6.98261 6.56279 7.00678 6.41781L7.66968 2.44042L3.49999 8.00001Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/line-height.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.78233 2.21713C3.70732 2.14212 3.60557 2.09998 3.49949 2.09998C3.3934 2.09998 3.29166 2.14212 3.21664 2.21713L1.21664 4.21713C1.06044 4.37334 1.06044 4.62661 1.21664 4.78282C1.37285 4.93903 1.62612 4.93903 1.78233 4.78282L3.09949 3.46566L3.09949 11.5343L1.78233 10.2171C1.62612 10.0609 1.37285 10.0609 1.21664 10.2171C1.06043 10.3733 1.06043 10.6266 1.21664 10.7828L3.21664 12.7828C3.29166 12.8578 3.3934 12.9 3.49949 12.9C3.60557 12.9 3.70731 12.8578 3.78233 12.7828L5.78233 10.7828C5.93854 10.6266 5.93854 10.3733 5.78233 10.2171C5.62612 10.0609 5.37285 10.0609 5.21664 10.2171L3.89949 11.5343L3.89949 3.46566L5.21664 4.78282C5.37285 4.93903 5.62612 4.93903 5.78233 4.78282C5.93854 4.62661 5.93854 4.37334 5.78233 4.21713L3.78233 2.21713ZM8.49998 3.99997C8.22383 3.99997 7.99998 4.22382 7.99998 4.49997C7.99998 4.77611 8.22383 4.99997 8.49998 4.99997H14.5C14.7761 4.99997 15 4.77611 15 4.49997C15 4.22382 14.7761 3.99997 14.5 3.99997H8.49998ZM7.99998 7.49997C7.99998 7.22382 8.22383 6.99997 8.49998 6.99997H14.5C14.7761 6.99997 15 7.22382 15 7.49997C15 7.77611 14.7761 7.99997 14.5 7.99997H8.49998C8.22383 7.99997 7.99998 7.77611 7.99998 7.49997ZM8.49998 9.99997C8.22383 9.99997 7.99998 10.2238 7.99998 10.5C7.99998 10.7761 8.22383 11 8.49998 11H14.5C14.7761 11 15 10.7761 15 10.5C15 10.2238 14.7761 9.99997 14.5 9.99997H8.49998Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/link-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.62471 4.00001L4.56402 4.00001C4.04134 3.99993 3.70687 3.99988 3.4182 4.055C2.2379 4.28039 1.29846 5.17053 1.05815 6.33035C0.999538 6.61321 0.999604 6.93998 0.999703 7.43689L0.999711 7.50001L0.999703 7.56313C0.999604 8.06004 0.999538 8.38681 1.05815 8.66967C1.29846 9.8295 2.2379 10.7196 3.4182 10.945C3.70688 11.0001 4.04135 11.0001 4.56403 11L4.62471 11H5.49971C5.77585 11 5.99971 10.7762 5.99971 10.5C5.99971 10.2239 5.77585 10 5.49971 10H4.62471C4.02084 10 3.78907 9.99777 3.60577 9.96277C2.80262 9.8094 2.19157 9.21108 2.03735 8.46678C2.00233 8.29778 1.99971 8.08251 1.99971 7.50001C1.99971 6.91752 2.00233 6.70225 2.03735 6.53324C2.19157 5.78895 2.80262 5.19062 3.60577 5.03725C3.78907 5.00225 4.02084 5.00001 4.62471 5.00001H5.49971C5.77585 5.00001 5.99971 4.77615 5.99971 4.50001C5.99971 4.22387 5.77585 4.00001 5.49971 4.00001H4.62471ZM10.3747 5.00001C10.9786 5.00001 11.2104 5.00225 11.3937 5.03725C12.1968 5.19062 12.8079 5.78895 12.9621 6.53324C12.9971 6.70225 12.9997 6.91752 12.9997 7.50001C12.9997 8.08251 12.9971 8.29778 12.9621 8.46678C12.8079 9.21108 12.1968 9.8094 11.3937 9.96277C11.2104 9.99777 10.9786 10 10.3747 10H9.49971C9.22357 10 8.99971 10.2239 8.99971 10.5C8.99971 10.7762 9.22357 11 9.49971 11H10.3747L10.4354 11C10.9581 11.0001 11.2925 11.0001 11.5812 10.945C12.7615 10.7196 13.701 9.8295 13.9413 8.66967C13.9999 8.38681 13.9998 8.06005 13.9997 7.56314L13.9997 7.50001L13.9997 7.43688C13.9998 6.93998 13.9999 6.61321 13.9413 6.33035C13.701 5.17053 12.7615 4.28039 11.5812 4.055C11.2925 3.99988 10.9581 3.99993 10.4354 4.00001L10.3747 4.00001H9.49971C9.22357 4.00001 8.99971 4.22387 8.99971 4.50001C8.99971 4.77615 9.22357 5.00001 9.49971 5.00001H10.3747ZM5.00038 7C4.72424 7 4.50038 7.22386 4.50038 7.5C4.50038 7.77614 4.72424 8 5.00038 8H10.0004C10.2765 8 10.5004 7.77614 10.5004 7.5C10.5004 7.22386 10.2765 7 10.0004 7H5.00038Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/link-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8.51194 3.00541C9.18829 2.54594 10.0435 2.53694 10.6788 2.95419C10.8231 3.04893 10.9771 3.1993 11.389 3.61119C11.8009 4.02307 11.9513 4.17714 12.046 4.32141C12.4633 4.95675 12.4543 5.81192 11.9948 6.48827C11.8899 6.64264 11.7276 6.80811 11.3006 7.23511L10.6819 7.85383C10.4867 8.04909 10.4867 8.36567 10.6819 8.56093C10.8772 8.7562 11.1938 8.7562 11.389 8.56093L12.0077 7.94221L12.0507 7.89929C12.4203 7.52976 12.6568 7.2933 12.822 7.0502C13.4972 6.05623 13.5321 4.76252 12.8819 3.77248C12.7233 3.53102 12.4922 3.30001 12.1408 2.94871L12.0961 2.90408L12.0515 2.85942C11.7002 2.508 11.4692 2.27689 11.2277 2.11832C10.2377 1.46813 8.94398 1.50299 7.95001 2.17822C7.70691 2.34336 7.47044 2.57991 7.1009 2.94955L7.058 2.99247L6.43928 3.61119C6.24401 3.80645 6.24401 4.12303 6.43928 4.31829C6.63454 4.51355 6.95112 4.51355 7.14638 4.31829L7.7651 3.69957C8.1921 3.27257 8.35757 3.11027 8.51194 3.00541ZM4.31796 7.14672C4.51322 6.95146 4.51322 6.63487 4.31796 6.43961C4.12269 6.24435 3.80611 6.24435 3.61085 6.43961L2.99213 7.05833L2.94922 7.10124C2.57957 7.47077 2.34303 7.70724 2.17788 7.95035C1.50265 8.94432 1.4678 10.238 2.11799 11.2281C2.27656 11.4695 2.50766 11.7005 2.8591 12.0518L2.90374 12.0965L2.94837 12.1411C3.29967 12.4925 3.53068 12.7237 3.77214 12.8822C4.76219 13.5324 6.05589 13.4976 7.04986 12.8223C7.29296 12.6572 7.52943 12.4206 7.89896 12.051L7.89897 12.051L7.94188 12.0081L8.5606 11.3894C8.75586 11.1941 8.75586 10.8775 8.5606 10.6823C8.36533 10.487 8.04875 10.487 7.85349 10.6823L7.23477 11.301C6.80777 11.728 6.6423 11.8903 6.48794 11.9951C5.81158 12.4546 4.95642 12.4636 4.32107 12.0464C4.17681 11.9516 4.02274 11.8012 3.61085 11.3894C3.19896 10.9775 3.0486 10.8234 2.95385 10.6791C2.53661 10.0438 2.54561 9.18863 3.00507 8.51227C3.10993 8.35791 3.27224 8.19244 3.69924 7.76544L4.31796 7.14672ZM9.62172 6.08558C9.81698 5.89032 9.81698 5.57373 9.62172 5.37847C9.42646 5.18321 9.10988 5.18321 8.91461 5.37847L5.37908 8.91401C5.18382 9.10927 5.18382 9.42585 5.37908 9.62111C5.57434 9.81637 5.89092 9.81637 6.08619 9.62111L9.62172 6.08558Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/link-break-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.3536 2.35355C13.5488 2.15829 13.5488 1.84171 13.3536 1.64645C13.1583 1.45118 12.8417 1.45118 12.6464 1.64645L1.64645 12.6464C1.45118 12.8417 1.45118 13.1583 1.64645 13.3536C1.84171 13.5488 2.15829 13.5488 2.35355 13.3536L13.3536 2.35355ZM2.03735 8.46678C2.17398 9.12619 2.66918 9.67103 3.33886 9.89338L2.57833 10.6539C1.80843 10.2534 1.23784 9.53693 1.05815 8.66967C0.999538 8.38681 0.999604 8.06004 0.999703 7.56313L0.999711 7.50001L0.999703 7.43689C0.999604 6.93998 0.999538 6.61321 1.05815 6.33035C1.29846 5.17053 2.2379 4.28039 3.4182 4.055C3.70687 3.99988 4.04134 3.99993 4.56402 4.00001L4.62471 4.00001H5.49971C5.77585 4.00001 5.99971 4.22387 5.99971 4.50001C5.99971 4.77615 5.77585 5.00001 5.49971 5.00001H4.62471C4.02084 5.00001 3.78907 5.00225 3.60577 5.03725C2.80262 5.19062 2.19157 5.78895 2.03735 6.53324C2.00233 6.70225 1.99971 6.91752 1.99971 7.50001C1.99971 8.08251 2.00233 8.29778 2.03735 8.46678ZM12.9621 6.53324C12.8255 5.87397 12.3304 5.32922 11.661 5.10679L12.4215 4.34631C13.1912 4.74686 13.7616 5.46323 13.9413 6.33035C13.9999 6.61321 13.9998 6.93998 13.9997 7.43688L13.9997 7.50001L13.9997 7.56314C13.9998 8.06005 13.9999 8.38681 13.9413 8.66967C13.701 9.8295 12.7615 10.7196 11.5812 10.945C11.2925 11.0001 10.9581 11.0001 10.4354 11L10.3747 11H9.49971C9.22357 11 8.99971 10.7762 8.99971 10.5C8.99971 10.2239 9.22357 10 9.49971 10H10.3747C10.9786 10 11.2104 9.99777 11.3937 9.96277C12.1968 9.8094 12.8079 9.21108 12.9621 8.46678C12.9971 8.29778 12.9997 8.08251 12.9997 7.50001C12.9997 6.91752 12.9971 6.70225 12.9621 6.53324Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/link-break-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.50021 0C4.77635 0 5.0002 0.223853 5.0002 0.49999V2.49995C5.0002 2.77609 4.77635 2.99994 4.50021 2.99994C4.22408 2.99994 4.00022 2.77609 4.00022 2.49995V0.49999C4.00022 0.223853 4.22408 0 4.50021 0ZM0.646451 0.64647C0.84171 0.451212 1.15829 0.451212 1.35354 0.64647L2.85351 2.14644C3.04877 2.3417 3.04877 2.65827 2.85351 2.85353C2.65826 3.04879 2.34168 3.04879 2.14642 2.85353L0.646452 1.35356C0.451193 1.1583 0.451193 0.841728 0.646451 0.64647ZM0.00030517 4.49991C0.00030517 4.22377 0.224158 3.99992 0.500295 3.99992H2.50025C2.77639 3.99992 3.00024 4.22377 3.00024 4.49991C3.00024 4.77605 2.77639 4.9999 2.50025 4.9999H0.500295C0.224158 4.9999 0.00030517 4.77605 0.00030517 4.49991ZM12.0001 10.4998C12.0001 10.2236 12.2239 9.9998 12.5001 9.9998H14.5C14.7761 9.9998 15 10.2236 15 10.4998C15 10.7759 14.7761 10.9998 14.5 10.9998H12.5001C12.2239 10.9998 12.0001 10.7759 12.0001 10.4998ZM10.5001 11.9998C10.7762 11.9998 11.0001 12.2236 11.0001 12.4997V14.4997C11.0001 14.7758 10.7762 14.9997 10.5001 14.9997C10.224 14.9997 10.0001 14.7758 10.0001 14.4997V12.4997C10.0001 12.2236 10.224 11.9998 10.5001 11.9998ZM12.1462 12.1462C12.3415 11.951 12.658 11.951 12.8533 12.1462L14.3533 13.6462C14.5485 13.8415 14.5485 14.158 14.3533 14.3533C14.158 14.5485 13.8414 14.5485 13.6462 14.3533L12.1462 12.8533C11.951 12.6581 11.951 12.3415 12.1462 12.1462ZM7.76478 3.69938C8.19177 3.27238 8.35724 3.11008 8.5116 3.00522C9.18794 2.54577 10.0431 2.53677 10.6784 2.95401C10.8227 3.04875 10.9767 3.19911 11.3886 3.61099C11.8005 4.02287 11.9509 4.17694 12.0456 4.3212C12.4628 4.95653 12.4539 5.81168 11.9944 6.48802C11.8895 6.64238 11.7272 6.80785 11.3002 7.23484L10.6815 7.85354C10.4863 8.0488 10.4863 8.36538 10.6815 8.56064C10.8768 8.75589 11.1934 8.75589 11.3886 8.56064L12.0073 7.94193L12.0502 7.89903C12.4199 7.5295 12.6564 7.29303 12.8216 7.04993C13.4968 6.05598 13.5316 4.7623 12.8815 3.77228C12.7229 3.53083 12.4918 3.29982 12.1404 2.94853L12.0957 2.9039L12.0511 2.85925C11.6998 2.50782 11.4688 2.27672 11.2273 2.11816C10.2373 1.46798 8.94364 1.50284 7.94968 2.17805C7.70659 2.34319 7.47012 2.57973 7.1006 2.94936L7.1006 2.94937L7.05769 2.99228L6.43898 3.61099C6.24372 3.80625 6.24372 4.12282 6.43898 4.31808C6.63424 4.51334 6.95081 4.51334 7.14607 4.31808L7.76478 3.69938ZM2.99191 7.05807L2.94899 7.10097C2.57935 7.4705 2.34282 7.70697 2.17767 7.95006C1.50246 8.94401 1.4676 10.2377 2.11778 11.2277C2.27634 11.4692 2.50744 11.7002 2.85886 12.0515L2.85888 12.0515L2.90352 12.0961L2.94815 12.1407L2.94815 12.1407L2.94817 12.1408C3.29945 12.4922 3.53045 12.7233 3.7719 12.8818C4.76193 13.532 6.0556 13.4972 7.04956 12.8219C7.29265 12.6568 7.52912 12.4203 7.89865 12.0506L7.94155 12.0077L8.56026 11.389C8.75552 11.1937 8.75552 10.8772 8.56026 10.6819C8.365 10.4867 8.04842 10.4867 7.85317 10.6819L7.23446 11.3006C6.80747 11.7276 6.642 11.8899 6.48764 11.9948C5.8113 12.4542 4.95615 12.4632 4.32082 12.046C4.17656 11.9512 4.02249 11.8009 3.61061 11.389C3.19873 10.9771 3.04837 10.8231 2.95363 10.6788C2.53639 10.0435 2.54539 9.18832 3.00484 8.51198C3.10971 8.35761 3.27201 8.19215 3.699 7.76516L4.3177 7.14645C4.51296 6.95119 4.51296 6.63462 4.3177 6.43936C4.12245 6.2441 3.80587 6.2441 3.61061 6.43936L2.99191 7.05807Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/link-none-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.56427 3.99988C4.58422 3.99989 4.60445 3.99989 4.62496 3.99989H5.49996C5.7761 3.99989 5.99996 4.22375 5.99996 4.49989C5.99996 4.77603 5.7761 4.99989 5.49996 4.99989H4.62496C4.02108 4.99989 3.78932 5.00213 3.60601 5.03713C2.80287 5.1905 2.19181 5.78883 2.03759 6.53312C2.00257 6.70212 1.99996 6.91739 1.99996 7.49989C1.99996 8.08239 2.00257 8.29766 2.03759 8.46666C2.19181 9.21095 2.80287 9.80928 3.60601 9.96265C3.78932 9.99765 4.02108 9.99989 4.62496 9.99989H5.49996C5.7761 9.99989 5.99996 10.2237 5.99996 10.4999C5.99996 10.776 5.7761 10.9999 5.49996 10.9999H4.62496C4.60445 10.9999 4.58422 10.9999 4.56427 10.9999C4.04159 11 3.70712 11 3.41845 10.9449C2.23814 10.7195 1.29871 9.82937 1.05839 8.66955C0.999782 8.38669 0.999848 8.05992 0.999947 7.56301C0.999951 7.54227 0.999955 7.52123 0.999955 7.49989C0.999955 7.47855 0.999951 7.45751 0.999947 7.43677C0.999848 6.93986 0.999782 6.61309 1.05839 6.33023C1.29871 5.17041 2.23814 4.28027 3.41845 4.05488C3.70712 3.99976 4.04159 3.99981 4.56427 3.99988ZM11.3939 5.03713C11.2106 5.00213 10.9788 4.99989 10.375 4.99989H9.49996C9.22381 4.99989 8.99996 4.77603 8.99996 4.49989C8.99996 4.22375 9.22381 3.99989 9.49996 3.99989H10.375C10.3955 3.99989 10.4157 3.99989 10.4356 3.99988C10.9583 3.99981 11.2928 3.99976 11.5815 4.05488C12.7618 4.28027 13.7012 5.17041 13.9415 6.33023C14.0001 6.61309 14.0001 6.93985 14 7.43676C14 7.4575 14 7.47854 14 7.49989C14 7.52124 14 7.54228 14 7.56302C14.0001 8.05992 14.0001 8.38669 13.9415 8.66955C13.7012 9.82937 12.7618 10.7195 11.5815 10.9449C11.2928 11 10.9583 11 10.4356 10.9999C10.4157 10.9999 10.3955 10.9999 10.375 10.9999H9.49996C9.22381 10.9999 8.99996 10.776 8.99996 10.4999C8.99996 10.2237 9.22381 9.99989 9.49996 9.99989H10.375C10.9788 9.99989 11.2106 9.99765 11.3939 9.96265C12.197 9.80928 12.8081 9.21095 12.9623 8.46666C12.9973 8.29766 13 8.08239 13 7.49989C13 6.91739 12.9973 6.70212 12.9623 6.53312C12.8081 5.78883 12.197 5.1905 11.3939 5.03713Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/link-none-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M10.6788 2.95419C10.0435 2.53694 9.18829 2.54594 8.51194 3.00541C8.35757 3.11027 8.1921 3.27257 7.7651 3.69957L7.14638 4.31829C6.95112 4.51355 6.63454 4.51355 6.43928 4.31829C6.24401 4.12303 6.24401 3.80645 6.43928 3.61119L7.058 2.99247C7.0725 2.97797 7.08679 2.96366 7.1009 2.94955C7.47044 2.57991 7.70691 2.34336 7.95001 2.17822C8.94398 1.50299 10.2377 1.46813 11.2277 2.11832C11.4692 2.27689 11.7002 2.508 12.0515 2.85942C12.0662 2.8741 12.081 2.88898 12.0961 2.90408C12.1112 2.91917 12.1261 2.93405 12.1408 2.94871C12.4922 3.30001 12.7233 3.53102 12.8819 3.77248C13.5321 4.76252 13.4972 6.05623 12.822 7.0502C12.6568 7.2933 12.4203 7.52976 12.0507 7.89929C12.0366 7.9134 12.0222 7.92771 12.0077 7.94221L11.389 8.56093C11.1938 8.7562 10.8772 8.7562 10.6819 8.56093C10.4867 8.36567 10.4867 8.04909 10.6819 7.85383L11.3006 7.23511C11.7276 6.80811 11.8899 6.64264 11.9948 6.48827C12.4543 5.81192 12.4633 4.95675 12.046 4.32141C11.9513 4.17714 11.8009 4.02307 11.389 3.61119C10.9771 3.1993 10.8231 3.04893 10.6788 2.95419ZM4.31796 6.43961C4.51322 6.63487 4.51322 6.95146 4.31796 7.14672L3.69924 7.76544C3.27224 8.19244 3.10993 8.35791 3.00507 8.51227C2.54561 9.18863 2.53661 10.0438 2.95385 10.6791C3.0486 10.8234 3.19896 10.9775 3.61085 11.3894C4.02274 11.8012 4.17681 11.9516 4.32107 12.0464C4.95642 12.4636 5.81158 12.4546 6.48794 11.9951C6.6423 11.8903 6.80777 11.728 7.23477 11.301L7.85349 10.6823C8.04875 10.487 8.36533 10.487 8.5606 10.6823C8.75586 10.8775 8.75586 11.1941 8.5606 11.3894L7.94188 12.0081C7.92738 12.0226 7.91307 12.0369 7.89897 12.051C7.52943 12.4206 7.29296 12.6572 7.04986 12.8223C6.05589 13.4976 4.76219 13.5324 3.77214 12.8822C3.53068 12.7237 3.29967 12.4925 2.94837 12.1411C2.93371 12.1264 2.91883 12.1116 2.90374 12.0965C2.88865 12.0814 2.87377 12.0665 2.8591 12.0518C2.50766 11.7005 2.27656 11.4695 2.11799 11.2281C1.4678 10.238 1.50265 8.94432 2.17788 7.95035C2.34303 7.70724 2.57957 7.47077 2.94922 7.10124C2.96333 7.08713 2.97763 7.07283 2.99213 7.05833L3.61085 6.43961C3.80611 6.24435 4.12269 6.24435 4.31796 6.43961Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/linkedin-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 1C1.44772 1 1 1.44772 1 2V13C1 13.5523 1.44772 14 2 14H13C13.5523 14 14 13.5523 14 13V2C14 1.44772 13.5523 1 13 1H2ZM3.05 6H4.95V12H3.05V6ZM5.075 4.005C5.075 4.59871 4.59371 5.08 4 5.08C3.4063 5.08 2.925 4.59871 2.925 4.005C2.925 3.41129 3.4063 2.93 4 2.93C4.59371 2.93 5.075 3.41129 5.075 4.005ZM12 8.35713C12 6.55208 10.8334 5.85033 9.67449 5.85033C9.29502 5.83163 8.91721 5.91119 8.57874 6.08107C8.32172 6.21007 8.05265 6.50523 7.84516 7.01853H7.79179V6.00044H6V12.0047H7.90616V8.8112C7.8786 8.48413 7.98327 8.06142 8.19741 7.80987C8.41156 7.55832 8.71789 7.49825 8.95015 7.46774H9.02258C9.62874 7.46774 10.0786 7.84301 10.0786 8.78868V12.0047H11.9847L12 8.35713Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/list-bullet.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.5 5.25C1.91421 5.25 2.25 4.91421 2.25 4.5C2.25 4.08579 1.91421 3.75 1.5 3.75C1.08579 3.75 0.75 4.08579 0.75 4.5C0.75 4.91421 1.08579 5.25 1.5 5.25ZM4 4.5C4 4.22386 4.22386 4 4.5 4H13.5C13.7761 4 14 4.22386 14 4.5C14 4.77614 13.7761 5 13.5 5H4.5C4.22386 5 4 4.77614 4 4.5ZM4.5 7C4.22386 7 4 7.22386 4 7.5C4 7.77614 4.22386 8 4.5 8H13.5C13.7761 8 14 7.77614 14 7.5C14 7.22386 13.7761 7 13.5 7H4.5ZM4.5 10C4.22386 10 4 10.2239 4 10.5C4 10.7761 4.22386 11 4.5 11H13.5C13.7761 11 14 10.7761 14 10.5C14 10.2239 13.7761 10 13.5 10H4.5ZM2.25 7.5C2.25 7.91421 1.91421 8.25 1.5 8.25C1.08579 8.25 0.75 7.91421 0.75 7.5C0.75 7.08579 1.08579 6.75 1.5 6.75C1.91421 6.75 2.25 7.08579 2.25 7.5ZM1.5 11.25C1.91421 11.25 2.25 10.9142 2.25 10.5C2.25 10.0858 1.91421 9.75 1.5 9.75C1.08579 9.75 0.75 10.0858 0.75 10.5C0.75 10.9142 1.08579 11.25 1.5 11.25Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/lock-closed.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5 4.63601C5 3.76031 5.24219 3.1054 5.64323 2.67357C6.03934 2.24705 6.64582 1.9783 7.5014 1.9783C8.35745 1.9783 8.96306 2.24652 9.35823 2.67208C9.75838 3.10299 10 3.75708 10 4.63325V5.99999H5V4.63601ZM4 5.99999V4.63601C4 3.58148 4.29339 2.65754 4.91049 1.99307C5.53252 1.32329 6.42675 0.978302 7.5014 0.978302C8.57583 0.978302 9.46952 1.32233 10.091 1.99162C10.7076 2.65557 11 3.57896 11 4.63325V5.99999H12C12.5523 5.99999 13 6.44771 13 6.99999V13C13 13.5523 12.5523 14 12 14H3C2.44772 14 2 13.5523 2 13V6.99999C2 6.44771 2.44772 5.99999 3 5.99999H4ZM3 6.99999H12V13H3V6.99999Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/lock-open-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.4986 0C6.3257 0 5.36107 0.38943 4.73753 1.19361C4.23745 1.83856 4 2.68242 4 3.63325H5C5 2.84313 5.19691 2.23312 5.5278 1.80636C5.91615 1.30552 6.55152 1 7.4986 1C8.35683 1 8.96336 1.26502 9.35846 1.68623C9.75793 2.11211 10 2.76044 10 3.63601V6H3C2.44772 6 2 6.44772 2 7V13C2 13.5523 2.44772 14 3 14H12C12.5523 14 13 13.5523 13 13V7C13 6.44771 12.5523 6 12 6H11V3.63601C11 2.58135 10.7065 1.66167 10.0878 1.0021C9.46477 0.337871 8.57061 0 7.4986 0ZM3 7H12V13H3V7Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/lock-open-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9 3.63601C9 2.76044 9.24207 2.11211 9.64154 1.68623C10.0366 1.26502 10.6432 1 11.5014 1C12.4485 1 13.0839 1.30552 13.4722 1.80636C13.8031 2.23312 14 2.84313 14 3.63325H15C15 2.68242 14.7626 1.83856 14.2625 1.19361C13.6389 0.38943 12.6743 0 11.5014 0C10.4294 0 9.53523 0.337871 8.91218 1.0021C8.29351 1.66167 8 2.58135 8 3.63601V6H1C0.447715 6 0 6.44772 0 7V13C0 13.5523 0.447715 14 1 14H10C10.5523 14 11 13.5523 11 13V7C11 6.44772 10.5523 6 10 6H9V3.63601ZM1 7H10V13H1V7Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/loop.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.35355 1.85355C3.54882 1.65829 3.54882 1.34171 3.35355 1.14645C3.15829 0.951184 2.84171 0.951184 2.64645 1.14645L0.646447 3.14645C0.451184 3.34171 0.451184 3.65829 0.646447 3.85355L2.64645 5.85355C2.84171 6.04882 3.15829 6.04882 3.35355 5.85355C3.54882 5.65829 3.54882 5.34171 3.35355 5.14645L2.20711 4H9.5C11.433 4 13 5.567 13 7.5C13 7.77614 13.2239 8 13.5 8C13.7761 8 14 7.77614 14 7.5C14 5.01472 11.9853 3 9.5 3H2.20711L3.35355 1.85355ZM2 7.5C2 7.22386 1.77614 7 1.5 7C1.22386 7 1 7.22386 1 7.5C1 9.98528 3.01472 12 5.5 12H12.7929L11.6464 13.1464C11.4512 13.3417 11.4512 13.6583 11.6464 13.8536C11.8417 14.0488 12.1583 14.0488 12.3536 13.8536L14.3536 11.8536C14.5488 11.6583 14.5488 11.3417 14.3536 11.1464L12.3536 9.14645C12.1583 8.95118 11.8417 8.95118 11.6464 9.14645C11.4512 9.34171 11.4512 9.65829 11.6464 9.85355L12.7929 11H5.5C3.567 11 2 9.433 2 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/magic-wand.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.9 0.499976C13.9 0.279062 13.7209 0.0999756 13.5 0.0999756C13.2791 0.0999756 13.1 0.279062 13.1 0.499976V1.09998H12.5C12.2791 1.09998 12.1 1.27906 12.1 1.49998C12.1 1.72089 12.2791 1.89998 12.5 1.89998H13.1V2.49998C13.1 2.72089 13.2791 2.89998 13.5 2.89998C13.7209 2.89998 13.9 2.72089 13.9 2.49998V1.89998H14.5C14.7209 1.89998 14.9 1.72089 14.9 1.49998C14.9 1.27906 14.7209 1.09998 14.5 1.09998H13.9V0.499976ZM11.8536 3.14642C12.0488 3.34168 12.0488 3.65826 11.8536 3.85353L10.8536 4.85353C10.6583 5.04879 10.3417 5.04879 10.1465 4.85353C9.9512 4.65827 9.9512 4.34169 10.1465 4.14642L11.1464 3.14643C11.3417 2.95116 11.6583 2.95116 11.8536 3.14642ZM9.85357 5.14642C10.0488 5.34168 10.0488 5.65827 9.85357 5.85353L2.85355 12.8535C2.65829 13.0488 2.34171 13.0488 2.14645 12.8535C1.95118 12.6583 1.95118 12.3417 2.14645 12.1464L9.14646 5.14642C9.34172 4.95116 9.65831 4.95116 9.85357 5.14642ZM13.5 5.09998C13.7209 5.09998 13.9 5.27906 13.9 5.49998V6.09998H14.5C14.7209 6.09998 14.9 6.27906 14.9 6.49998C14.9 6.72089 14.7209 6.89998 14.5 6.89998H13.9V7.49998C13.9 7.72089 13.7209 7.89998 13.5 7.89998C13.2791 7.89998 13.1 7.72089 13.1 7.49998V6.89998H12.5C12.2791 6.89998 12.1 6.72089 12.1 6.49998C12.1 6.27906 12.2791 6.09998 12.5 6.09998H13.1V5.49998C13.1 5.27906 13.2791 5.09998 13.5 5.09998ZM8.90002 0.499976C8.90002 0.279062 8.72093 0.0999756 8.50002 0.0999756C8.2791 0.0999756 8.10002 0.279062 8.10002 0.499976V1.09998H7.50002C7.2791 1.09998 7.10002 1.27906 7.10002 1.49998C7.10002 1.72089 7.2791 1.89998 7.50002 1.89998H8.10002V2.49998C8.10002 2.72089 8.2791 2.89998 8.50002 2.89998C8.72093 2.89998 8.90002 2.72089 8.90002 2.49998V1.89998H9.50002C9.72093 1.89998 9.90002 1.72089 9.90002 1.49998C9.90002 1.27906 9.72093 1.09998 9.50002 1.09998H8.90002V0.499976Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/magnifying-glass.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M10 6.5C10 8.433 8.433 10 6.5 10C4.567 10 3 8.433 3 6.5C3 4.567 4.567 3 6.5 3C8.433 3 10 4.567 10 6.5ZM9.30884 10.0159C8.53901 10.6318 7.56251 11 6.5 11C4.01472 11 2 8.98528 2 6.5C2 4.01472 4.01472 2 6.5 2C8.98528 2 11 4.01472 11 6.5C11 7.56251 10.6318 8.53901 10.0159 9.30884L12.8536 12.1464C13.0488 12.3417 13.0488 12.6583 12.8536 12.8536C12.6583 13.0488 12.3417 13.0488 12.1464 12.8536L9.30884 10.0159Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/margin.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.49988 2.00012C1.77602 2.00012 1.99988 1.77626 1.99988 1.50012C1.99988 1.22398 1.77602 1.00012 1.49988 1.00012C1.22374 1.00012 0.999878 1.22398 0.999878 1.50012C0.999878 1.77626 1.22374 2.00012 1.49988 2.00012ZM4.49988 2.00012C4.77602 2.00012 4.99988 1.77626 4.99988 1.50012C4.99988 1.22398 4.77602 1.00012 4.49988 1.00012C4.22374 1.00012 3.99988 1.22398 3.99988 1.50012C3.99988 1.77626 4.22374 2.00012 4.49988 2.00012ZM7.99988 1.50012C7.99988 1.77626 7.77602 2.00012 7.49988 2.00012C7.22374 2.00012 6.99988 1.77626 6.99988 1.50012C6.99988 1.22398 7.22374 1.00012 7.49988 1.00012C7.77602 1.00012 7.99988 1.22398 7.99988 1.50012ZM10.4999 2.00012C10.776 2.00012 10.9999 1.77626 10.9999 1.50012C10.9999 1.22398 10.776 1.00012 10.4999 1.00012C10.2237 1.00012 9.99988 1.22398 9.99988 1.50012C9.99988 1.77626 10.2237 2.00012 10.4999 2.00012ZM13.9999 1.50012C13.9999 1.77626 13.776 2.00012 13.4999 2.00012C13.2237 2.00012 12.9999 1.77626 12.9999 1.50012C12.9999 1.22398 13.2237 1.00012 13.4999 1.00012C13.776 1.00012 13.9999 1.22398 13.9999 1.50012ZM1.49988 14.0001C1.77602 14.0001 1.99988 13.7763 1.99988 13.5001C1.99988 13.224 1.77602 13.0001 1.49988 13.0001C1.22374 13.0001 0.999878 13.224 0.999878 13.5001C0.999878 13.7763 1.22374 14.0001 1.49988 14.0001ZM1.99988 10.5001C1.99988 10.7763 1.77602 11.0001 1.49988 11.0001C1.22374 11.0001 0.999878 10.7763 0.999878 10.5001C0.999878 10.224 1.22374 10.0001 1.49988 10.0001C1.77602 10.0001 1.99988 10.224 1.99988 10.5001ZM1.49988 8.00012C1.77602 8.00012 1.99988 7.77626 1.99988 7.50012C1.99988 7.22398 1.77602 7.00012 1.49988 7.00012C1.22374 7.00012 0.999878 7.22398 0.999878 7.50012C0.999878 7.77626 1.22374 8.00012 1.49988 8.00012ZM1.99988 4.50012C1.99988 4.77626 1.77602 5.00012 1.49988 5.00012C1.22374 5.00012 0.999878 4.77626 0.999878 4.50012C0.999878 4.22398 1.22374 4.00012 1.49988 4.00012C1.77602 4.00012 1.99988 4.22398 1.99988 4.50012ZM13.4999 11.0001C13.776 11.0001 13.9999 10.7763 13.9999 10.5001C13.9999 10.224 13.776 10.0001 13.4999 10.0001C13.2237 10.0001 12.9999 10.224 12.9999 10.5001C12.9999 10.7763 13.2237 11.0001 13.4999 11.0001ZM13.9999 7.50012C13.9999 7.77626 13.776 8.00012 13.4999 8.00012C13.2237 8.00012 12.9999 7.77626 12.9999 7.50012C12.9999 7.22398 13.2237 7.00012 13.4999 7.00012C13.776 7.00012 13.9999 7.22398 13.9999 7.50012ZM13.4999 5.00012C13.776 5.00012 13.9999 4.77626 13.9999 4.50012C13.9999 4.22398 13.776 4.00012 13.4999 4.00012C13.2237 4.00012 12.9999 4.22398 12.9999 4.50012C12.9999 4.77626 13.2237 5.00012 13.4999 5.00012ZM4.99988 13.5001C4.99988 13.7763 4.77602 14.0001 4.49988 14.0001C4.22374 14.0001 3.99988 13.7763 3.99988 13.5001C3.99988 13.224 4.22374 13.0001 4.49988 13.0001C4.77602 13.0001 4.99988 13.224 4.99988 13.5001ZM7.49988 14.0001C7.77602 14.0001 7.99988 13.7763 7.99988 13.5001C7.99988 13.224 7.77602 13.0001 7.49988 13.0001C7.22374 13.0001 6.99988 13.224 6.99988 13.5001C6.99988 13.7763 7.22374 14.0001 7.49988 14.0001ZM10.9999 13.5001C10.9999 13.7763 10.776 14.0001 10.4999 14.0001C10.2237 14.0001 9.99988 13.7763 9.99988 13.5001C9.99988 13.224 10.2237 13.0001 10.4999 13.0001C10.776 13.0001 10.9999 13.224 10.9999 13.5001ZM13.4999 14.0001C13.776 14.0001 13.9999 13.7763 13.9999 13.5001C13.9999 13.224 13.776 13.0001 13.4999 13.0001C13.2237 13.0001 12.9999 13.224 12.9999 13.5001C12.9999 13.7763 13.2237 14.0001 13.4999 14.0001ZM3.99988 5.00012C3.99988 4.44784 4.44759 4.00012 4.99988 4.00012H9.99988C10.5522 4.00012 10.9999 4.44784 10.9999 5.00012V10.0001C10.9999 10.5524 10.5522 11.0001 9.99988 11.0001H4.99988C4.44759 11.0001 3.99988 10.5524 3.99988 10.0001V5.00012ZM4.99988 5.00012H9.99988V10.0001H4.99988V5.00012Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/mask-off.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1 2H14V13H1L1 2ZM0 2C0 1.44772 0.447715 1 1 1H14C14.5523 1 15 1.44772 15 2V13C15 13.5523 14.5523 14 14 14H1C0.447715 14 0 13.5523 0 13V2ZM4.875 7.5C4.875 6.05025 6.05025 4.875 7.5 4.875C8.94975 4.875 10.125 6.05025 10.125 7.5C10.125 8.94975 8.94975 10.125 7.5 10.125C6.05025 10.125 4.875 8.94975 4.875 7.5ZM7.5 3.875C5.49797 3.875 3.875 5.49797 3.875 7.5C3.875 9.50203 5.49797 11.125 7.5 11.125C9.50203 11.125 11.125 9.50203 11.125 7.5C11.125 5.49797 9.50203 3.875 7.5 3.875Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/mask-on.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1 1C0.447715 1 0 1.44772 0 2V13C0 13.5523 0.447715 14 1 14H14C14.5523 14 15 13.5523 15 13V2C15 1.44772 14.5523 1 14 1H1ZM7.5 10.625C9.22589 10.625 10.625 9.22589 10.625 7.5C10.625 5.77411 9.22589 4.375 7.5 4.375C5.77411 4.375 4.375 5.77411 4.375 7.5C4.375 9.22589 5.77411 10.625 7.5 10.625Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/mic-mute.svg+3−0
@@ -0,0 +1,3 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2<path fill-rule="evenodd" clip-rule="evenodd" d="M12.87 1.83637C13.0557 1.63204 13.0407 1.31581 12.8363 1.13006C12.632 0.944307 12.3158 0.959365 12.13 1.16369L10.4589 3.00199C10.2216 1.58215 8.98719 0.5 7.5 0.5C5.84315 0.5 4.5 1.84315 4.5 3.5L4.5 7.5C4.5 8.0754 4.66199 8.61297 4.94286 9.06958L4.24966 9.8321C4.1363 9.6744 4.03412 9.5081 3.94428 9.33433C3.86104 9.17337 3.78845 9.00607 3.72742 8.83338C3.63539 8.57302 3.34973 8.43656 3.08937 8.52858C2.82901 8.6206 2.69255 8.90626 2.78458 9.16662C2.86101 9.38288 2.95188 9.59228 3.056 9.79364C3.20094 10.074 3.37167 10.3388 3.56506 10.5852L2.13003 12.1637C1.94428 12.368 1.95933 12.6842 2.16366 12.87C2.36799 13.0558 2.68422 13.0407 2.86997 12.8364L4.25951 11.3079C5.01297 11.9497 5.95951 12.372 7.00014 12.4753L7.00014 14L5.50014 14C5.22399 14 5.00014 14.2239 5.00014 14.5C5.00014 14.7761 5.22399 15 5.50014 15L7.50014 15L9.50014 15C9.77628 15 10.0001 14.7761 10.0001 14.5C10.0001 14.2239 9.77628 14 9.50014 14L8.00014 14L8.00014 12.4753C9.72168 12.3043 11.1857 11.26 11.9439 9.79364C12.048 9.59228 12.1389 9.38288 12.2153 9.16662C12.3073 8.90626 12.1709 8.6206 11.9105 8.52858C11.6501 8.43656 11.3645 8.57302 11.2725 8.83338C11.2114 9.00607 11.1388 9.17337 11.0556 9.33433C10.3899 10.6218 9.04706 11.5 7.49994 11.5C6.523 11.5 5.62751 11.1498 4.93254 10.5675L5.60604 9.82669C6.12251 10.2476 6.78178 10.5 7.5 10.5C9.15685 10.5 10.5 9.15685 10.5 7.5L10.5 4.44333L12.87 1.83637ZM9.5 4.05673L9.5 3.5C9.5 2.39543 8.60457 1.5 7.5 1.5C6.39543 1.5 5.5 2.39543 5.5 3.5L5.5 7.5C5.5 7.77755 5.55653 8.04189 5.65872 8.28214L9.5 4.05673ZM6.28022 9.08509L9.5 5.54333L9.5 7.5C9.5 8.60457 8.60457 9.5 7.5 9.5C7.04083 9.5 6.6178 9.34527 6.28022 9.08509Z" fill="black"/>
3</svg>
assets/icons/radix/mic.svg+3−0
@@ -0,0 +1,3 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2<path fill-rule="evenodd" clip-rule="evenodd" d="M3.72742 8.83338C3.63539 8.57302 3.34973 8.43656 3.08937 8.52858C2.82901 8.6206 2.69255 8.90626 2.78458 9.16662C2.86101 9.38288 2.95188 9.59228 3.056 9.79364C3.81427 11.2601 5.27842 12.3044 7.00014 12.4753L7.00014 14L5.50014 14C5.22399 14 5.00014 14.2239 5.00014 14.5C5.00014 14.7761 5.22399 15 5.50014 15L7.50014 15L9.50014 15C9.77628 15 10.0001 14.7761 10.0001 14.5C10.0001 14.2239 9.77628 14 9.50014 14L8.00014 14L8.00014 12.4753C9.72168 12.3043 11.1857 11.26 11.9439 9.79364C12.048 9.59228 12.1389 9.38288 12.2153 9.16662C12.3073 8.90626 12.1709 8.6206 11.9105 8.52858C11.6501 8.43656 11.3645 8.57302 11.2725 8.83338C11.2114 9.00607 11.1388 9.17337 11.0556 9.33433C10.3899 10.6218 9.04706 11.5 7.49994 11.5C5.95282 11.5 4.60997 10.6218 3.94428 9.33433C3.86104 9.17337 3.78845 9.00607 3.72742 8.83338ZM5.5 3.5L5.5 7.5C5.5 8.60457 6.39543 9.5 7.5 9.5C8.60457 9.5 9.5 8.60457 9.5 7.5L9.5 3.5C9.5 2.39543 8.60457 1.5 7.5 1.5C6.39543 1.5 5.5 2.39543 5.5 3.5ZM4.5 7.5C4.5 9.15685 5.84315 10.5 7.5 10.5C9.15685 10.5 10.5 9.15685 10.5 7.5L10.5 3.5C10.5 1.84315 9.15685 0.5 7.5 0.5C5.84315 0.5 4.5 1.84315 4.5 3.5L4.5 7.5Z" fill="black"/>
3</svg>
assets/icons/radix/minus-circled.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49991 0.876892C3.84222 0.876892 0.877075 3.84204 0.877075 7.49972C0.877075 11.1574 3.84222 14.1226 7.49991 14.1226C11.1576 14.1226 14.1227 11.1574 14.1227 7.49972C14.1227 3.84204 11.1576 0.876892 7.49991 0.876892ZM1.82707 7.49972C1.82707 4.36671 4.36689 1.82689 7.49991 1.82689C10.6329 1.82689 13.1727 4.36671 13.1727 7.49972C13.1727 10.6327 10.6329 13.1726 7.49991 13.1726C4.36689 13.1726 1.82707 10.6327 1.82707 7.49972ZM4.50003 7C4.22389 7 4.00003 7.22386 4.00003 7.5C4.00003 7.77614 4.22389 8 4.50003 8H10.5C10.7762 8 11 7.77614 11 7.5C11 7.22386 10.7762 7 10.5 7H4.50003Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/minus.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.25 7.5C2.25 7.22386 2.47386 7 2.75 7H12.25C12.5261 7 12.75 7.22386 12.75 7.5C12.75 7.77614 12.5261 8 12.25 8H2.75C2.47386 8 2.25 7.77614 2.25 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/mix.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.14921 3.99996C2.14921 2.97778 2.97784 2.14915 4.00002 2.14915C5.02219 2.14915 5.85083 2.97778 5.85083 3.99996C5.85083 5.02213 5.02219 5.85077 4.00002 5.85077C2.97784 5.85077 2.14921 5.02213 2.14921 3.99996ZM4.00002 1.24915C2.48079 1.24915 1.24921 2.48073 1.24921 3.99996C1.24921 5.51919 2.48079 6.75077 4.00002 6.75077C5.51925 6.75077 6.75083 5.51919 6.75083 3.99996C6.75083 2.48073 5.51925 1.24915 4.00002 1.24915ZM5.82034 11.0001L2.49998 12.8369V9.16331L5.82034 11.0001ZM2.63883 8.21159C2.17228 7.9535 1.59998 8.29093 1.59998 8.82411V13.1761C1.59998 13.7093 2.17228 14.0467 2.63883 13.7886L6.57235 11.6126C7.05389 11.3462 7.05389 10.654 6.57235 10.3876L2.63883 8.21159ZM8.30001 9.00003C8.30001 8.61343 8.61341 8.30003 9.00001 8.30003H13C13.3866 8.30003 13.7 8.61343 13.7 9.00003V13C13.7 13.3866 13.3866 13.7 13 13.7H9.00001C8.61341 13.7 8.30001 13.3866 8.30001 13V9.00003ZM9.20001 9.20003V12.8H12.8V9.20003H9.20001ZM13.4432 2.19311C13.6189 2.01737 13.6189 1.73245 13.4432 1.55671C13.2675 1.38098 12.9826 1.38098 12.8068 1.55671L11 3.36353L9.19321 1.55674C9.01748 1.381 8.73255 1.381 8.55682 1.55674C8.38108 1.73247 8.38108 2.0174 8.55682 2.19313L10.3636 3.99992L8.55682 5.80671C8.38108 5.98245 8.38108 6.26737 8.55682 6.44311C8.73255 6.61885 9.01748 6.61885 9.19321 6.44311L11 4.63632L12.8068 6.44314C12.9826 6.61887 13.2675 6.61887 13.4432 6.44314C13.6189 6.2674 13.6189 5.98247 13.4432 5.80674L11.6364 3.99992L13.4432 2.19311Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/mixer-horizontal.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.5 3C4.67157 3 4 3.67157 4 4.5C4 5.32843 4.67157 6 5.5 6C6.32843 6 7 5.32843 7 4.5C7 3.67157 6.32843 3 5.5 3ZM3 5C3.01671 5 3.03323 4.99918 3.04952 4.99758C3.28022 6.1399 4.28967 7 5.5 7C6.71033 7 7.71978 6.1399 7.95048 4.99758C7.96677 4.99918 7.98329 5 8 5H13.5C13.7761 5 14 4.77614 14 4.5C14 4.22386 13.7761 4 13.5 4H8C7.98329 4 7.96677 4.00082 7.95048 4.00242C7.71978 2.86009 6.71033 2 5.5 2C4.28967 2 3.28022 2.86009 3.04952 4.00242C3.03323 4.00082 3.01671 4 3 4H1.5C1.22386 4 1 4.22386 1 4.5C1 4.77614 1.22386 5 1.5 5H3ZM11.9505 10.9976C11.7198 12.1399 10.7103 13 9.5 13C8.28967 13 7.28022 12.1399 7.04952 10.9976C7.03323 10.9992 7.01671 11 7 11H1.5C1.22386 11 1 10.7761 1 10.5C1 10.2239 1.22386 10 1.5 10H7C7.01671 10 7.03323 10.0008 7.04952 10.0024C7.28022 8.8601 8.28967 8 9.5 8C10.7103 8 11.7198 8.8601 11.9505 10.0024C11.9668 10.0008 11.9833 10 12 10H13.5C13.7761 10 14 10.2239 14 10.5C14 10.7761 13.7761 11 13.5 11H12C11.9833 11 11.9668 10.9992 11.9505 10.9976ZM8 10.5C8 9.67157 8.67157 9 9.5 9C10.3284 9 11 9.67157 11 10.5C11 11.3284 10.3284 12 9.5 12C8.67157 12 8 11.3284 8 10.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/mixer-vertical.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5 1.5C5 1.22386 4.77614 1 4.5 1C4.22386 1 4 1.22386 4 1.5L4 7C4 7.01671 4.00082 7.03323 4.00242 7.04952C2.86009 7.28022 2 8.28967 2 9.5C2 10.7103 2.86009 11.7198 4.00242 11.9505C4.00082 11.9668 4 11.9833 4 12V13.5C4 13.7761 4.22386 14 4.5 14C4.77614 14 5 13.7761 5 13.5V12C5 11.9833 4.99918 11.9668 4.99758 11.9505C6.1399 11.7198 7 10.7103 7 9.5C7 8.28967 6.1399 7.28022 4.99758 7.04952C4.99918 7.03323 5 7.01671 5 7L5 1.5ZM11 1.5C11 1.22386 10.7761 1 10.5 1C10.2239 1 10 1.22386 10 1.5V3C10 3.01671 10.0008 3.03323 10.0024 3.04952C8.8601 3.28022 8 4.28967 8 5.5C8 6.71033 8.8601 7.71978 10.0024 7.95048C10.0008 7.96677 10 7.98329 10 8V13.5C10 13.7761 10.2239 14 10.5 14C10.7761 14 11 13.7761 11 13.5V8C11 7.98329 10.9992 7.96677 10.9976 7.95048C12.1399 7.71978 13 6.71033 13 5.5C13 4.28967 12.1399 3.28022 10.9976 3.04952C10.9992 3.03323 11 3.01671 11 3V1.5ZM4.5 8C3.67157 8 3 8.67157 3 9.5C3 10.3284 3.67157 11 4.5 11C5.32843 11 6 10.3284 6 9.5C6 8.67157 5.32843 8 4.5 8ZM9 5.5C9 4.67157 9.67157 4 10.5 4C11.3284 4 12 4.67157 12 5.5C12 6.32843 11.3284 7 10.5 7C9.67157 7 9 6.32843 9 5.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/mobile.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4 2.5C4 2.22386 4.22386 2 4.5 2H10.5C10.7761 2 11 2.22386 11 2.5V12.5C11 12.7761 10.7761 13 10.5 13H4.5C4.22386 13 4 12.7761 4 12.5V2.5ZM4.5 1C3.67157 1 3 1.67157 3 2.5V12.5C3 13.3284 3.67157 14 4.5 14H10.5C11.3284 14 12 13.3284 12 12.5V2.5C12 1.67157 11.3284 1 10.5 1H4.5ZM6 11.65C5.8067 11.65 5.65 11.8067 5.65 12C5.65 12.1933 5.8067 12.35 6 12.35H9C9.1933 12.35 9.35 12.1933 9.35 12C9.35 11.8067 9.1933 11.65 9 11.65H6Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/modulz-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.25925 3.16667L4.37036 5.33333V1L7.25925 3.16667ZM1 8.22222L3.88889 6.05555L1 3.88889V8.22222ZM1 14L3.88889 11.8333L1 9.66666V14ZM7.74072 8.22222L10.6296 6.05555L7.74072 3.88889V8.22222ZM14 3.16667L11.1111 5.33333V1L14 3.16667ZM11.1111 11.1111L14 8.94444L11.1111 6.77777V11.1111ZM3.88889 11.1111L1 8.94444L3.88889 6.77777V11.1111ZM4.37036 6.05555L7.25925 8.22222V3.88889L4.37036 6.05555ZM3.88889 5.33333L1 3.16667L3.88889 1V5.33333ZM7.74072 3.16667L10.6296 5.33333V1L7.74072 3.16667ZM14 8.22222L11.1111 6.05555L14 3.88889V8.22222ZM11.1111 11.8333L14 14V9.66666L11.1111 11.8333Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/moon.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.89998 0.499976C2.89998 0.279062 2.72089 0.0999756 2.49998 0.0999756C2.27906 0.0999756 2.09998 0.279062 2.09998 0.499976V1.09998H1.49998C1.27906 1.09998 1.09998 1.27906 1.09998 1.49998C1.09998 1.72089 1.27906 1.89998 1.49998 1.89998H2.09998V2.49998C2.09998 2.72089 2.27906 2.89998 2.49998 2.89998C2.72089 2.89998 2.89998 2.72089 2.89998 2.49998V1.89998H3.49998C3.72089 1.89998 3.89998 1.72089 3.89998 1.49998C3.89998 1.27906 3.72089 1.09998 3.49998 1.09998H2.89998V0.499976ZM5.89998 3.49998C5.89998 3.27906 5.72089 3.09998 5.49998 3.09998C5.27906 3.09998 5.09998 3.27906 5.09998 3.49998V4.09998H4.49998C4.27906 4.09998 4.09998 4.27906 4.09998 4.49998C4.09998 4.72089 4.27906 4.89998 4.49998 4.89998H5.09998V5.49998C5.09998 5.72089 5.27906 5.89998 5.49998 5.89998C5.72089 5.89998 5.89998 5.72089 5.89998 5.49998V4.89998H6.49998C6.72089 4.89998 6.89998 4.72089 6.89998 4.49998C6.89998 4.27906 6.72089 4.09998 6.49998 4.09998H5.89998V3.49998ZM1.89998 6.49998C1.89998 6.27906 1.72089 6.09998 1.49998 6.09998C1.27906 6.09998 1.09998 6.27906 1.09998 6.49998V7.09998H0.499976C0.279062 7.09998 0.0999756 7.27906 0.0999756 7.49998C0.0999756 7.72089 0.279062 7.89998 0.499976 7.89998H1.09998V8.49998C1.09998 8.72089 1.27906 8.89997 1.49998 8.89997C1.72089 8.89997 1.89998 8.72089 1.89998 8.49998V7.89998H2.49998C2.72089 7.89998 2.89998 7.72089 2.89998 7.49998C2.89998 7.27906 2.72089 7.09998 2.49998 7.09998H1.89998V6.49998ZM8.54406 0.98184L8.24618 0.941586C8.03275 0.917676 7.90692 1.1655 8.02936 1.34194C8.17013 1.54479 8.29981 1.75592 8.41754 1.97445C8.91878 2.90485 9.20322 3.96932 9.20322 5.10022C9.20322 8.37201 6.82247 11.0878 3.69887 11.6097C3.45736 11.65 3.20988 11.6772 2.96008 11.6906C2.74563 11.702 2.62729 11.9535 2.77721 12.1072C2.84551 12.1773 2.91535 12.2458 2.98667 12.3128L3.05883 12.3795L3.31883 12.6045L3.50684 12.7532L3.62796 12.8433L3.81491 12.9742L3.99079 13.089C4.11175 13.1651 4.23536 13.2375 4.36157 13.3059L4.62496 13.4412L4.88553 13.5607L5.18837 13.6828L5.43169 13.7686C5.56564 13.8128 5.70149 13.8529 5.83857 13.8885C5.94262 13.9155 6.04767 13.9401 6.15405 13.9622C6.27993 13.9883 6.40713 14.0109 6.53544 14.0298L6.85241 14.0685L7.11934 14.0892C7.24637 14.0965 7.37436 14.1002 7.50322 14.1002C11.1483 14.1002 14.1032 11.1453 14.1032 7.50023C14.1032 7.25044 14.0893 7.00389 14.0623 6.76131L14.0255 6.48407C13.991 6.26083 13.9453 6.04129 13.8891 5.82642C13.8213 5.56709 13.7382 5.31398 13.6409 5.06881L13.5279 4.80132L13.4507 4.63542L13.3766 4.48666C13.2178 4.17773 13.0353 3.88295 12.8312 3.60423L12.6782 3.40352L12.4793 3.16432L12.3157 2.98361L12.1961 2.85951L12.0355 2.70246L11.8134 2.50184L11.4925 2.24191L11.2483 2.06498L10.9562 1.87446L10.6346 1.68894L10.3073 1.52378L10.1938 1.47176L9.95488 1.3706L9.67791 1.2669L9.42566 1.1846L9.10075 1.09489L8.83599 1.03486L8.54406 0.98184ZM10.4032 5.30023C10.4032 4.27588 10.2002 3.29829 9.83244 2.40604C11.7623 3.28995 13.1032 5.23862 13.1032 7.50023C13.1032 10.593 10.596 13.1002 7.50322 13.1002C6.63646 13.1002 5.81597 12.9036 5.08355 12.5522C6.5419 12.0941 7.81081 11.2082 8.74322 10.0416C8.87963 10.2284 9.10028 10.3497 9.34928 10.3497C9.76349 10.3497 10.0993 10.0139 10.0993 9.59971C10.0993 9.24256 9.84965 8.94373 9.51535 8.86816C9.57741 8.75165 9.63653 8.63334 9.6926 8.51332C9.88358 8.63163 10.1088 8.69993 10.35 8.69993C11.0403 8.69993 11.6 8.14028 11.6 7.44993C11.6 6.75976 11.0406 6.20024 10.3505 6.19993C10.3853 5.90487 10.4032 5.60464 10.4032 5.30023Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/move.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.81819 0.93179C7.64245 0.756054 7.35753 0.756054 7.18179 0.93179L5.43179 2.68179C5.25605 2.85753 5.25605 3.14245 5.43179 3.31819C5.60753 3.49392 5.89245 3.49392 6.06819 3.31819L6.99999 2.38638V5.49999C6.99999 5.77613 7.22385 5.99999 7.49999 5.99999C7.77613 5.99999 7.99999 5.77613 7.99999 5.49999V2.38638L8.93179 3.31819C9.10753 3.49392 9.39245 3.49392 9.56819 3.31819C9.74392 3.14245 9.74392 2.85753 9.56819 2.68179L7.81819 0.93179ZM7.99999 9.49999C7.99999 9.22385 7.77613 8.99999 7.49999 8.99999C7.22385 8.99999 6.99999 9.22385 6.99999 9.49999V12.6136L6.06819 11.6818C5.89245 11.5061 5.60753 11.5061 5.43179 11.6818C5.25605 11.8575 5.25605 12.1424 5.43179 12.3182L7.18179 14.0682C7.35753 14.2439 7.64245 14.2439 7.81819 14.0682L9.56819 12.3182C9.74392 12.1424 9.74392 11.8575 9.56819 11.6818C9.39245 11.5061 9.10753 11.5061 8.93179 11.6818L7.99999 12.6136V9.49999ZM8.99999 7.49999C8.99999 7.22385 9.22385 6.99999 9.49999 6.99999H12.6136L11.6818 6.06819C11.5061 5.89245 11.5061 5.60753 11.6818 5.43179C11.8575 5.25605 12.1424 5.25605 12.3182 5.43179L14.0682 7.18179C14.2439 7.35753 14.2439 7.64245 14.0682 7.81819L12.3182 9.56819C12.1424 9.74392 11.8575 9.74392 11.6818 9.56819C11.5061 9.39245 11.5061 9.10753 11.6818 8.93179L12.6136 7.99999H9.49999C9.22385 7.99999 8.99999 7.77613 8.99999 7.49999ZM3.31819 6.06819L2.38638 6.99999H5.49999C5.77613 6.99999 5.99999 7.22385 5.99999 7.49999C5.99999 7.77613 5.77613 7.99999 5.49999 7.99999H2.38638L3.31819 8.93179C3.49392 9.10753 3.49392 9.39245 3.31819 9.56819C3.14245 9.74392 2.85753 9.74392 2.68179 9.56819L0.93179 7.81819C0.756054 7.64245 0.756054 7.35753 0.93179 7.18179L2.68179 5.43179C2.85753 5.25605 3.14245 5.25605 3.31819 5.43179C3.49392 5.60753 3.49392 5.89245 3.31819 6.06819Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/notion-logo.svg+6−0
@@ -0,0 +1,6 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 d="M3.25781 3.11684C3.67771 3.45796 3.83523 3.43193 4.62369 3.37933L12.0571 2.93299C12.2147 2.93299 12.0836 2.77571 12.0311 2.74957L10.7965 1.85711C10.56 1.67347 10.2448 1.46315 9.64083 1.51576L2.44308 2.04074C2.18059 2.06677 2.12815 2.19801 2.2327 2.30322L3.25781 3.11684ZM3.7041 4.84917V12.6704C3.7041 13.0907 3.91415 13.248 4.38693 13.222L12.5562 12.7493C13.0292 12.7233 13.0819 12.4341 13.0819 12.0927V4.32397C13.0819 3.98306 12.9508 3.79921 12.6612 3.82545L4.12422 4.32397C3.80918 4.35044 3.7041 4.50803 3.7041 4.84917ZM11.7688 5.26872C11.8212 5.50518 11.7688 5.74142 11.5319 5.76799L11.1383 5.84641V11.6205C10.7965 11.8042 10.4814 11.9092 10.2188 11.9092C9.79835 11.9092 9.69305 11.7779 9.37812 11.3844L6.80345 7.34249V11.2532L7.61816 11.437C7.61816 11.437 7.61816 11.9092 6.96086 11.9092L5.14879 12.0143C5.09615 11.9092 5.14879 11.647 5.33259 11.5944L5.80546 11.4634V6.29276L5.1489 6.24015C5.09625 6.00369 5.22739 5.66278 5.5954 5.63631L7.53935 5.50528L10.2188 9.5998V5.97765L9.53564 5.89924C9.4832 5.61018 9.69305 5.40028 9.95576 5.37425L11.7688 5.26872ZM1.83874 1.33212L9.32557 0.780787C10.245 0.701932 10.4815 0.754753 11.0594 1.17452L13.4492 2.85424C13.8436 3.14309 13.975 3.22173 13.975 3.53661V12.7493C13.975 13.3266 13.7647 13.6681 13.0293 13.7203L4.33492 14.2454C3.78291 14.2717 3.52019 14.193 3.23111 13.8253L1.47116 11.5419C1.1558 11.1216 1.02466 10.8071 1.02466 10.4392V2.25041C1.02466 1.77825 1.23504 1.38441 1.83874 1.33212Z"
4 fill="currentColor"
5 />
6</svg>
assets/icons/radix/opacity.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 1.5C4.5 4.25 3 6.5 3 9C3 11.4853 5.01472 13.5 7.5 13.5C9.98528 13.5 12 11.4853 12 9C12 6.5 10.5 4.25 7.5 1.5ZM11 9C11 7.11203 9.97315 5.27195 7.5 2.87357C5.02686 5.27195 4 7.11203 4 9C4 10.933 5.567 12.5 7.5 12.5C9.433 12.5 11 10.933 11 9Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/open-in-new-window.svg+10−0
@@ -0,0 +1,10 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13 12C13 12.5523 12.5523 13 12 13H8.5C8.22386 13 8 12.7761 8 12.5C8 12.2239 8.22386 12 8.5 12H12V3H3V6.5C3 6.77614 2.77614 7 2.5 7C2.22386 7 2 6.77614 2 6.5V3C2 2.44771 2.44771 2 3 2H12C12.5523 2 13 2.44771 13 3V12Z"
6 fill="currentColor"
7 />
8 <path d="M5.5 6.5H8.5V9.5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" />
9 <path d="M2.5 12.5L8.5 6.5" stroke="currentColor" stroke-linecap="round" />
10</svg>
assets/icons/radix/outer-shadow.svg+43−0
@@ -0,0 +1,43 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 opacity=".05"
4 fill-rule="evenodd"
5 clip-rule="evenodd"
6 d="M12.1398 3.88616C13.8553 4.94159 15 6.837 15 8.99999C15 12.3137 12.3137 15 9.00001 15C6.8435 15 4.95295 13.8621 3.89569 12.1552L4.32075 11.8919C5.29069 13.4578 7.02375 14.5 9.00001 14.5C12.0375 14.5 14.5 12.0375 14.5 8.99999C14.5 7.0178 13.4516 5.28026 11.8778 4.31202L12.1398 3.88616Z"
7 fill="currentColor"
8 />
9 <path
10 opacity=".2"
11 fill-rule="evenodd"
12 clip-rule="evenodd"
13 d="M12.851 5.0732C13.8683 6.07105 14.5 7.46198 14.5 8.99999C14.5 12.0375 12.0375 14.5 8.99996 14.5C7.46208 14.5 6.07125 13.8685 5.07342 12.8512L5.43036 12.5011C6.33803 13.4264 7.60179 14 8.99996 14C11.7614 14 14 11.7614 14 8.99999C14 7.6017 13.4263 6.33785 12.5009 5.43017L12.851 5.0732Z"
14 fill="currentColor"
15 />
16 <path
17 opacity=".35"
18 fill-rule="evenodd"
19 clip-rule="evenodd"
20 d="M13.3021 6.45071C13.7455 7.19737 14 8.06934 14 9C14 11.7614 11.7614 14 9.00001 14C8.04867 14 7.15867 13.7341 6.40118 13.2723L6.66141 12.8454C7.34274 13.2607 8.14305 13.5 9.00001 13.5C11.4853 13.5 13.5 11.4853 13.5 9C13.5 8.16164 13.271 7.37753 12.8722 6.70598L13.3021 6.45071Z"
21 fill="currentColor"
22 />
23 <path
24 opacity=".5"
25 fill-rule="evenodd"
26 clip-rule="evenodd"
27 d="M13.3744 7.94021C13.4566 8.2803 13.5 8.63524 13.5 9C13.5 11.4853 11.4853 13.5 9.00002 13.5C8.61103 13.5 8.23321 13.4506 7.87267 13.3576L7.99758 12.8734C8.31767 12.956 8.65352 13 9.00002 13C11.2091 13 13 11.2091 13 9C13 8.67507 12.9613 8.35952 12.8884 8.05756L13.3744 7.94021Z"
28 fill="currentColor"
29 />
30 <path
31 opacity=".65"
32 fill-rule="evenodd"
33 clip-rule="evenodd"
34 d="M12.9155 9.82132C12.5898 11.3813 11.3562 12.6072 9.79203 12.9215L9.69353 12.4313C11.0613 12.1565 12.1413 11.0833 12.4261 9.71913L12.9155 9.82132Z"
35 fill="currentColor"
36 />
37 <path
38 fill-rule="evenodd"
39 clip-rule="evenodd"
40 d="M1.2771 7.50252C1.2771 4.06455 4.06413 1.27753 7.50209 1.27753C10.94 1.27753 13.7271 4.06455 13.7271 7.50252C13.7271 10.9405 10.94 13.7275 7.50209 13.7275C4.06412 13.7275 1.2771 10.9405 1.2771 7.50252ZM7.50209 2.22752C4.5888 2.22752 2.2271 4.58922 2.2271 7.50252C2.2271 10.4158 4.5888 12.7775 7.50209 12.7775C10.4154 12.7775 12.7771 10.4158 12.7771 7.50252C12.7771 4.58922 10.4154 2.22752 7.50209 2.22752Z"
41 fill="currentColor"
42 />
43</svg>
assets/icons/radix/overline.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.49985 1.10001C3.27894 1.10001 3.09985 1.27909 3.09985 1.50001C3.09985 1.72092 3.27894 1.90001 3.49985 1.90001H11.4999C11.7208 1.90001 11.8999 1.72092 11.8999 1.50001C11.8999 1.27909 11.7208 1.10001 11.4999 1.10001H3.49985ZM4.99995 4.25001C4.99995 3.97387 4.77609 3.75001 4.49995 3.75001C4.22381 3.75001 3.99995 3.97387 3.99995 4.25001V9.55001C3.99995 11.483 5.56695 13.05 7.49995 13.05C9.43295 13.05 11 11.483 11 9.55001V4.25001C11 3.97387 10.7761 3.75001 10.5 3.75001C10.2238 3.75001 9.99995 3.97387 9.99995 4.25001V9.55001C9.99995 10.9307 8.88066 12.05 7.49995 12.05C6.11924 12.05 4.99995 10.9307 4.99995 9.55001V4.25001Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/padding.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.85714 2H12.1429C12.6162 2 13 2.38376 13 2.85714V12.1429C13 12.6162 12.6162 13 12.1429 13H2.85714C2.38376 13 2 12.6162 2 12.1429V2.85714C2 2.38376 2.38376 2 2.85714 2ZM1 2.85714C1 1.83147 1.83147 1 2.85714 1H12.1429C13.1685 1 14 1.83147 14 2.85714V12.1429C14 13.1685 13.1685 14 12.1429 14H2.85714C1.83147 14 1 13.1685 1 12.1429V2.85714ZM7.49988 5.00012C7.77602 5.00012 7.99988 4.77626 7.99988 4.50012C7.99988 4.22398 7.77602 4.00012 7.49988 4.00012C7.22374 4.00012 6.99988 4.22398 6.99988 4.50012C6.99988 4.77626 7.22374 5.00012 7.49988 5.00012ZM4.49988 11.0001C4.77602 11.0001 4.99988 10.7763 4.99988 10.5001C4.99988 10.224 4.77602 10.0001 4.49988 10.0001C4.22374 10.0001 3.99988 10.224 3.99988 10.5001C3.99988 10.7763 4.22374 11.0001 4.49988 11.0001ZM4.99988 7.50012C4.99988 7.77626 4.77602 8.00012 4.49988 8.00012C4.22374 8.00012 3.99988 7.77626 3.99988 7.50012C3.99988 7.22398 4.22374 7.00012 4.49988 7.00012C4.77602 7.00012 4.99988 7.22398 4.99988 7.50012ZM4.49988 5.00012C4.77602 5.00012 4.99988 4.77626 4.99988 4.50012C4.99988 4.22398 4.77602 4.00012 4.49988 4.00012C4.22374 4.00012 3.99988 4.22398 3.99988 4.50012C3.99988 4.77626 4.22374 5.00012 4.49988 5.00012ZM10.9999 10.5001C10.9999 10.7763 10.776 11.0001 10.4999 11.0001C10.2237 11.0001 9.99988 10.7763 9.99988 10.5001C9.99988 10.224 10.2237 10.0001 10.4999 10.0001C10.776 10.0001 10.9999 10.224 10.9999 10.5001ZM10.4999 8.00012C10.776 8.00012 10.9999 7.77626 10.9999 7.50012C10.9999 7.22398 10.776 7.00012 10.4999 7.00012C10.2237 7.00012 9.99988 7.22398 9.99988 7.50012C9.99988 7.77626 10.2237 8.00012 10.4999 8.00012ZM10.9999 4.50012C10.9999 4.77626 10.776 5.00012 10.4999 5.00012C10.2237 5.00012 9.99988 4.77626 9.99988 4.50012C9.99988 4.22398 10.2237 4.00012 10.4999 4.00012C10.776 4.00012 10.9999 4.22398 10.9999 4.50012ZM7.49988 11.0001C7.77602 11.0001 7.99988 10.7763 7.99988 10.5001C7.99988 10.224 7.77602 10.0001 7.49988 10.0001C7.22374 10.0001 6.99988 10.224 6.99988 10.5001C6.99988 10.7763 7.22374 11.0001 7.49988 11.0001Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/paper-plane.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.20308 1.04312C1.00481 0.954998 0.772341 1.0048 0.627577 1.16641C0.482813 1.32802 0.458794 1.56455 0.568117 1.75196L3.92115 7.50002L0.568117 13.2481C0.458794 13.4355 0.482813 13.672 0.627577 13.8336C0.772341 13.9952 1.00481 14.045 1.20308 13.9569L14.7031 7.95693C14.8836 7.87668 15 7.69762 15 7.50002C15 7.30243 14.8836 7.12337 14.7031 7.04312L1.20308 1.04312ZM4.84553 7.10002L2.21234 2.586L13.2689 7.50002L2.21234 12.414L4.84552 7.90002H9C9.22092 7.90002 9.4 7.72094 9.4 7.50002C9.4 7.27911 9.22092 7.10002 9 7.10002H4.84553Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/pause.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.04995 2.74998C6.04995 2.44623 5.80371 2.19998 5.49995 2.19998C5.19619 2.19998 4.94995 2.44623 4.94995 2.74998V12.25C4.94995 12.5537 5.19619 12.8 5.49995 12.8C5.80371 12.8 6.04995 12.5537 6.04995 12.25V2.74998ZM10.05 2.74998C10.05 2.44623 9.80371 2.19998 9.49995 2.19998C9.19619 2.19998 8.94995 2.44623 8.94995 2.74998V12.25C8.94995 12.5537 9.19619 12.8 9.49995 12.8C9.80371 12.8 10.05 12.5537 10.05 12.25V2.74998Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/pencil-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11.8536 1.14645C11.6583 0.951184 11.3417 0.951184 11.1465 1.14645L3.71455 8.57836C3.62459 8.66832 3.55263 8.77461 3.50251 8.89155L2.04044 12.303C1.9599 12.491 2.00189 12.709 2.14646 12.8536C2.29103 12.9981 2.50905 13.0401 2.69697 12.9596L6.10847 11.4975C6.2254 11.4474 6.3317 11.3754 6.42166 11.2855L13.8536 3.85355C14.0488 3.65829 14.0488 3.34171 13.8536 3.14645L11.8536 1.14645ZM4.42166 9.28547L11.5 2.20711L12.7929 3.5L5.71455 10.5784L4.21924 11.2192L3.78081 10.7808L4.42166 9.28547Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/pencil-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.1464 1.14645C12.3417 0.951184 12.6583 0.951184 12.8535 1.14645L14.8535 3.14645C15.0488 3.34171 15.0488 3.65829 14.8535 3.85355L10.9109 7.79618C10.8349 7.87218 10.7471 7.93543 10.651 7.9835L6.72359 9.94721C6.53109 10.0435 6.29861 10.0057 6.14643 9.85355C5.99425 9.70137 5.95652 9.46889 6.05277 9.27639L8.01648 5.34897C8.06455 5.25283 8.1278 5.16507 8.2038 5.08907L12.1464 1.14645ZM12.5 2.20711L8.91091 5.79618L7.87266 7.87267L8.12731 8.12732L10.2038 7.08907L13.7929 3.5L12.5 2.20711ZM9.99998 2L8.99998 3H4.9C4.47171 3 4.18056 3.00039 3.95552 3.01877C3.73631 3.03668 3.62421 3.06915 3.54601 3.10899C3.35785 3.20487 3.20487 3.35785 3.10899 3.54601C3.06915 3.62421 3.03669 3.73631 3.01878 3.95552C3.00039 4.18056 3 4.47171 3 4.9V11.1C3 11.5283 3.00039 11.8194 3.01878 12.0445C3.03669 12.2637 3.06915 12.3758 3.10899 12.454C3.20487 12.6422 3.35785 12.7951 3.54601 12.891C3.62421 12.9309 3.73631 12.9633 3.95552 12.9812C4.18056 12.9996 4.47171 13 4.9 13H11.1C11.5283 13 11.8194 12.9996 12.0445 12.9812C12.2637 12.9633 12.3758 12.9309 12.454 12.891C12.6422 12.7951 12.7951 12.6422 12.891 12.454C12.9309 12.3758 12.9633 12.2637 12.9812 12.0445C12.9996 11.8194 13 11.5283 13 11.1V6.99998L14 5.99998V11.1V11.1207C14 11.5231 14 11.8553 13.9779 12.1259C13.9549 12.407 13.9057 12.6653 13.782 12.908C13.5903 13.2843 13.2843 13.5903 12.908 13.782C12.6653 13.9057 12.407 13.9549 12.1259 13.9779C11.8553 14 11.5231 14 11.1207 14H11.1H4.9H4.87934C4.47686 14 4.14468 14 3.87409 13.9779C3.59304 13.9549 3.33469 13.9057 3.09202 13.782C2.7157 13.5903 2.40973 13.2843 2.21799 12.908C2.09434 12.6653 2.04506 12.407 2.0221 12.1259C1.99999 11.8553 1.99999 11.5231 2 11.1207V11.1206V11.1V4.9V4.87935V4.87932V4.87931C1.99999 4.47685 1.99999 4.14468 2.0221 3.87409C2.04506 3.59304 2.09434 3.33469 2.21799 3.09202C2.40973 2.71569 2.7157 2.40973 3.09202 2.21799C3.33469 2.09434 3.59304 2.04506 3.87409 2.0221C4.14468 1.99999 4.47685 1.99999 4.87932 2H4.87935H4.9H9.99998Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/person.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 0.875C5.49797 0.875 3.875 2.49797 3.875 4.5C3.875 6.15288 4.98124 7.54738 6.49373 7.98351C5.2997 8.12901 4.27557 8.55134 3.50407 9.31167C2.52216 10.2794 2.02502 11.72 2.02502 13.5999C2.02502 13.8623 2.23769 14.0749 2.50002 14.0749C2.76236 14.0749 2.97502 13.8623 2.97502 13.5999C2.97502 11.8799 3.42786 10.7206 4.17091 9.9883C4.91536 9.25463 6.02674 8.87499 7.49995 8.87499C8.97317 8.87499 10.0846 9.25463 10.8291 9.98831C11.5721 10.7206 12.025 11.8799 12.025 13.5999C12.025 13.8623 12.2376 14.0749 12.5 14.0749C12.7623 14.075 12.975 13.8623 12.975 13.6C12.975 11.72 12.4778 10.2794 11.4959 9.31166C10.7244 8.55135 9.70025 8.12903 8.50625 7.98352C10.0187 7.5474 11.125 6.15289 11.125 4.5C11.125 2.49797 9.50203 0.875 7.5 0.875ZM4.825 4.5C4.825 3.02264 6.02264 1.825 7.5 1.825C8.97736 1.825 10.175 3.02264 10.175 4.5C10.175 5.97736 8.97736 7.175 7.5 7.175C6.02264 7.175 4.825 5.97736 4.825 4.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/pie-chart.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.85001 7.50043C1.85001 4.37975 4.37963 1.85001 7.50001 1.85001C10.6204 1.85001 13.15 4.37975 13.15 7.50043C13.15 10.6211 10.6204 13.1509 7.50001 13.1509C4.37963 13.1509 1.85001 10.6211 1.85001 7.50043ZM7.50001 0.850006C3.82728 0.850006 0.850006 3.82753 0.850006 7.50043C0.850006 11.1733 3.82728 14.1509 7.50001 14.1509C11.1727 14.1509 14.15 11.1733 14.15 7.50043C14.15 3.82753 11.1727 0.850006 7.50001 0.850006ZM7.00001 8.00001V3.12811C7.16411 3.10954 7.33094 3.10001 7.50001 3.10001C9.93006 3.10001 11.9 5.07014 11.9 7.50043C11.9 7.66935 11.8905 7.83604 11.872 8.00001H7.00001Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/pilcrow.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3 5.5C3 7.983 4.99169 9 7 9V12.5C7 12.7761 7.22386 13 7.5 13C7.77614 13 8 12.7761 8 12.5V9V3.1H9V12.5C9 12.7761 9.22386 13 9.5 13C9.77614 13 10 12.7761 10 12.5V3.1H11.5C11.8038 3.1 12.05 2.85376 12.05 2.55C12.05 2.24624 11.8038 2 11.5 2H9.5H8H7.5H7C4.99169 2 3 3.017 3 5.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/pin-bottom.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.5 13.95C13.7485 13.95 13.95 13.7485 13.95 13.5C13.95 13.2514 13.7485 13.05 13.5 13.05L1.49995 13.05C1.25142 13.05 1.04995 13.2514 1.04995 13.5C1.04995 13.7485 1.25142 13.95 1.49995 13.95L13.5 13.95ZM11.0681 7.5683C11.2439 7.39257 11.2439 7.10764 11.0681 6.93191C10.8924 6.75617 10.6075 6.75617 10.4317 6.93191L7.94993 9.41371L7.94993 1.49998C7.94993 1.25146 7.74846 1.04998 7.49993 1.04998C7.2514 1.04998 7.04993 1.25146 7.04993 1.49998L7.04993 9.41371L4.56813 6.93191C4.39239 6.75617 4.10746 6.75617 3.93173 6.93191C3.75599 7.10764 3.75599 7.39257 3.93173 7.5683L7.18173 10.8183C7.35746 10.994 7.64239 10.994 7.81812 10.8183L11.0681 7.5683Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/pin-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.05005 13.5C2.05005 13.7485 2.25152 13.95 2.50005 13.95C2.74858 13.95 2.95005 13.7485 2.95005 13.5L2.95005 1.49995C2.95005 1.25142 2.74858 1.04995 2.50005 1.04995C2.25152 1.04995 2.05005 1.25142 2.05005 1.49995L2.05005 13.5ZM8.4317 11.0681C8.60743 11.2439 8.89236 11.2439 9.06809 11.0681C9.24383 10.8924 9.24383 10.6075 9.06809 10.4317L6.58629 7.94993L14.5 7.94993C14.7485 7.94993 14.95 7.74846 14.95 7.49993C14.95 7.2514 14.7485 7.04993 14.5 7.04993L6.58629 7.04993L9.06809 4.56813C9.24383 4.39239 9.24383 4.10746 9.06809 3.93173C8.89236 3.75599 8.60743 3.75599 8.4317 3.93173L5.1817 7.18173C5.00596 7.35746 5.00596 7.64239 5.1817 7.81812L8.4317 11.0681Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/pin-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.95 1.50005C12.95 1.25152 12.7485 1.05005 12.5 1.05005C12.2514 1.05005 12.05 1.25152 12.05 1.50005L12.05 13.5C12.05 13.7486 12.2514 13.95 12.5 13.95C12.7485 13.95 12.95 13.7486 12.95 13.5L12.95 1.50005ZM6.5683 3.93188C6.39257 3.75614 6.10764 3.75614 5.93191 3.93188C5.75617 4.10761 5.75617 4.39254 5.93191 4.56827L8.41371 7.05007L0.499984 7.05007C0.251456 7.05007 0.0499847 7.25155 0.0499847 7.50007C0.0499846 7.7486 0.251457 7.95007 0.499984 7.95007L8.41371 7.95007L5.93191 10.4319C5.75617 10.6076 5.75617 10.8925 5.93191 11.0683C6.10764 11.244 6.39257 11.244 6.56831 11.0683L9.8183 7.81827C9.99404 7.64254 9.99404 7.35761 9.8183 7.18188L6.5683 3.93188Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/pin-top.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.50005 1.05005C1.25152 1.05005 1.05005 1.25152 1.05005 1.50005C1.05005 1.74858 1.25152 1.95005 1.50005 1.95005L13.5 1.95005C13.7486 1.95005 13.95 1.74858 13.95 1.50005C13.95 1.25152 13.7486 1.05005 13.5 1.05005H1.50005ZM3.93188 7.43169C3.75614 7.60743 3.75614 7.89236 3.93188 8.06809C4.10761 8.24383 4.39254 8.24383 4.56827 8.06809L7.05007 5.58629V13.5C7.05007 13.7485 7.25155 13.95 7.50007 13.95C7.7486 13.95 7.95007 13.7485 7.95007 13.5L7.95007 5.58629L10.4319 8.06809C10.6076 8.24383 10.8925 8.24383 11.0683 8.06809C11.244 7.89235 11.244 7.60743 11.0683 7.43169L7.81827 4.18169C7.64254 4.00596 7.35761 4.00596 7.18188 4.18169L3.93188 7.43169Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/play.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.24182 2.32181C3.3919 2.23132 3.5784 2.22601 3.73338 2.30781L12.7334 7.05781C12.8974 7.14436 13 7.31457 13 7.5C13 7.68543 12.8974 7.85564 12.7334 7.94219L3.73338 12.6922C3.5784 12.774 3.3919 12.7687 3.24182 12.6782C3.09175 12.5877 3 12.4252 3 12.25V2.75C3 2.57476 3.09175 2.4123 3.24182 2.32181ZM4 3.57925V11.4207L11.4288 7.5L4 3.57925Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/plus-circled.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49991 0.876892C3.84222 0.876892 0.877075 3.84204 0.877075 7.49972C0.877075 11.1574 3.84222 14.1226 7.49991 14.1226C11.1576 14.1226 14.1227 11.1574 14.1227 7.49972C14.1227 3.84204 11.1576 0.876892 7.49991 0.876892ZM1.82707 7.49972C1.82707 4.36671 4.36689 1.82689 7.49991 1.82689C10.6329 1.82689 13.1727 4.36671 13.1727 7.49972C13.1727 10.6327 10.6329 13.1726 7.49991 13.1726C4.36689 13.1726 1.82707 10.6327 1.82707 7.49972ZM7.50003 4C7.77617 4 8.00003 4.22386 8.00003 4.5V7H10.5C10.7762 7 11 7.22386 11 7.5C11 7.77614 10.7762 8 10.5 8H8.00003V10.5C8.00003 10.7761 7.77617 11 7.50003 11C7.22389 11 7.00003 10.7761 7.00003 10.5V8H4.50003C4.22389 8 4.00003 7.77614 4.00003 7.5C4.00003 7.22386 4.22389 7 4.50003 7H7.00003V4.5C7.00003 4.22386 7.22389 4 7.50003 4Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/plus.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8 2.75C8 2.47386 7.77614 2.25 7.5 2.25C7.22386 2.25 7 2.47386 7 2.75V7H2.75C2.47386 7 2.25 7.22386 2.25 7.5C2.25 7.77614 2.47386 8 2.75 8H7V12.25C7 12.5261 7.22386 12.75 7.5 12.75C7.77614 12.75 8 12.5261 8 12.25V8H12.25C12.5261 8 12.75 7.77614 12.75 7.5C12.75 7.22386 12.5261 7 12.25 7H8V2.75Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/question-mark-circled.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.877075 7.49972C0.877075 3.84204 3.84222 0.876892 7.49991 0.876892C11.1576 0.876892 14.1227 3.84204 14.1227 7.49972C14.1227 11.1574 11.1576 14.1226 7.49991 14.1226C3.84222 14.1226 0.877075 11.1574 0.877075 7.49972ZM7.49991 1.82689C4.36689 1.82689 1.82708 4.36671 1.82708 7.49972C1.82708 10.6327 4.36689 13.1726 7.49991 13.1726C10.6329 13.1726 13.1727 10.6327 13.1727 7.49972C13.1727 4.36671 10.6329 1.82689 7.49991 1.82689ZM8.24993 10.5C8.24993 10.9142 7.91414 11.25 7.49993 11.25C7.08571 11.25 6.74993 10.9142 6.74993 10.5C6.74993 10.0858 7.08571 9.75 7.49993 9.75C7.91414 9.75 8.24993 10.0858 8.24993 10.5ZM6.05003 6.25C6.05003 5.57211 6.63511 4.925 7.50003 4.925C8.36496 4.925 8.95003 5.57211 8.95003 6.25C8.95003 6.74118 8.68002 6.99212 8.21447 7.27494C8.16251 7.30651 8.10258 7.34131 8.03847 7.37854L8.03841 7.37858C7.85521 7.48497 7.63788 7.61119 7.47449 7.73849C7.23214 7.92732 6.95003 8.23198 6.95003 8.7C6.95004 9.00376 7.19628 9.25 7.50004 9.25C7.8024 9.25 8.04778 9.00601 8.05002 8.70417L8.05056 8.7033C8.05924 8.6896 8.08493 8.65735 8.15058 8.6062C8.25207 8.52712 8.36508 8.46163 8.51567 8.37436L8.51571 8.37433C8.59422 8.32883 8.68296 8.27741 8.78559 8.21506C9.32004 7.89038 10.05 7.35382 10.05 6.25C10.05 4.92789 8.93511 3.825 7.50003 3.825C6.06496 3.825 4.95003 4.92789 4.95003 6.25C4.95003 6.55376 5.19628 6.8 5.50003 6.8C5.80379 6.8 6.05003 6.55376 6.05003 6.25Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/question-mark.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.07505 4.10001C5.07505 2.91103 6.25727 1.92502 7.50005 1.92502C8.74283 1.92502 9.92505 2.91103 9.92505 4.10001C9.92505 5.19861 9.36782 5.71436 8.61854 6.37884L8.58757 6.4063C7.84481 7.06467 6.92505 7.87995 6.92505 9.5C6.92505 9.81757 7.18248 10.075 7.50005 10.075C7.81761 10.075 8.07505 9.81757 8.07505 9.5C8.07505 8.41517 8.62945 7.90623 9.38156 7.23925L9.40238 7.22079C10.1496 6.55829 11.075 5.73775 11.075 4.10001C11.075 2.12757 9.21869 0.775024 7.50005 0.775024C5.7814 0.775024 3.92505 2.12757 3.92505 4.10001C3.92505 4.41758 4.18249 4.67501 4.50005 4.67501C4.81761 4.67501 5.07505 4.41758 5.07505 4.10001ZM7.50005 13.3575C7.9833 13.3575 8.37505 12.9657 8.37505 12.4825C8.37505 11.9992 7.9833 11.6075 7.50005 11.6075C7.0168 11.6075 6.62505 11.9992 6.62505 12.4825C6.62505 12.9657 7.0168 13.3575 7.50005 13.3575Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/quote.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M9.42503 3.44136C10.0561 3.23654 10.7837 3.2402 11.3792 3.54623C12.7532 4.25224 13.3477 6.07191 12.7946 8C12.5465 8.8649 12.1102 9.70472 11.1861 10.5524C10.262 11.4 8.98034 11.9 8.38571 11.9C8.17269 11.9 8 11.7321 8 11.525C8 11.3179 8.17644 11.15 8.38571 11.15C9.06497 11.15 9.67189 10.7804 10.3906 10.236C10.9406 9.8193 11.3701 9.28633 11.608 8.82191C12.0628 7.93367 12.0782 6.68174 11.3433 6.34901C10.9904 6.73455 10.5295 6.95946 9.97725 6.95946C8.7773 6.95946 8.0701 5.99412 8.10051 5.12009C8.12957 4.28474 8.66032 3.68954 9.42503 3.44136ZM3.42503 3.44136C4.05614 3.23654 4.78366 3.2402 5.37923 3.54623C6.7532 4.25224 7.34766 6.07191 6.79462 8C6.54654 8.8649 6.11019 9.70472 5.1861 10.5524C4.26201 11.4 2.98034 11.9 2.38571 11.9C2.17269 11.9 2 11.7321 2 11.525C2 11.3179 2.17644 11.15 2.38571 11.15C3.06497 11.15 3.67189 10.7804 4.39058 10.236C4.94065 9.8193 5.37014 9.28633 5.60797 8.82191C6.06282 7.93367 6.07821 6.68174 5.3433 6.34901C4.99037 6.73455 4.52948 6.95946 3.97725 6.95946C2.7773 6.95946 2.0701 5.99412 2.10051 5.12009C2.12957 4.28474 2.66032 3.68954 3.42503 3.44136Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/radiobutton.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49985 0.877045C3.84216 0.877045 0.877014 3.84219 0.877014 7.49988C0.877014 11.1575 3.84216 14.1227 7.49985 14.1227C11.1575 14.1227 14.1227 11.1575 14.1227 7.49988C14.1227 3.84219 11.1575 0.877045 7.49985 0.877045ZM1.82701 7.49988C1.82701 4.36686 4.36683 1.82704 7.49985 1.82704C10.6328 1.82704 13.1727 4.36686 13.1727 7.49988C13.1727 10.6329 10.6328 13.1727 7.49985 13.1727C4.36683 13.1727 1.82701 10.6329 1.82701 7.49988ZM7.49999 9.49999C8.60456 9.49999 9.49999 8.60456 9.49999 7.49999C9.49999 6.39542 8.60456 5.49999 7.49999 5.49999C6.39542 5.49999 5.49999 6.39542 5.49999 7.49999C5.49999 8.60456 6.39542 9.49999 7.49999 9.49999Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/reader.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.2 1H4.17741H4.1774C3.86936 0.999988 3.60368 0.999978 3.38609 1.02067C3.15576 1.04257 2.92825 1.09113 2.71625 1.22104C2.51442 1.34472 2.34473 1.51442 2.22104 1.71625C2.09113 1.92825 2.04257 2.15576 2.02067 2.38609C1.99998 2.60367 1.99999 2.86935 2 3.17738V3.1774V3.2V11.8V11.8226V11.8226C1.99999 12.1307 1.99998 12.3963 2.02067 12.6139C2.04257 12.8442 2.09113 13.0717 2.22104 13.2837C2.34473 13.4856 2.51442 13.6553 2.71625 13.779C2.92825 13.9089 3.15576 13.9574 3.38609 13.9793C3.60368 14 3.86937 14 4.17741 14H4.2H10.8H10.8226C11.1306 14 11.3963 14 11.6139 13.9793C11.8442 13.9574 12.0717 13.9089 12.2837 13.779C12.4856 13.6553 12.6553 13.4856 12.779 13.2837C12.9089 13.0717 12.9574 12.8442 12.9793 12.6139C13 12.3963 13 12.1306 13 11.8226V11.8V3.2V3.17741C13 2.86936 13 2.60368 12.9793 2.38609C12.9574 2.15576 12.9089 1.92825 12.779 1.71625C12.6553 1.51442 12.4856 1.34472 12.2837 1.22104C12.0717 1.09113 11.8442 1.04257 11.6139 1.02067C11.3963 0.999978 11.1306 0.999988 10.8226 1H10.8H4.2ZM3.23875 2.07368C3.26722 2.05623 3.32362 2.03112 3.48075 2.01618C3.64532 2.00053 3.86298 2 4.2 2H10.8C11.137 2 11.3547 2.00053 11.5193 2.01618C11.6764 2.03112 11.7328 2.05623 11.7613 2.07368C11.8285 2.11491 11.8851 2.17147 11.9263 2.23875C11.9438 2.26722 11.9689 2.32362 11.9838 2.48075C11.9995 2.64532 12 2.86298 12 3.2V11.8C12 12.137 11.9995 12.3547 11.9838 12.5193C11.9689 12.6764 11.9438 12.7328 11.9263 12.7613C11.8851 12.8285 11.8285 12.8851 11.7613 12.9263C11.7328 12.9438 11.6764 12.9689 11.5193 12.9838C11.3547 12.9995 11.137 13 10.8 13H4.2C3.86298 13 3.64532 12.9995 3.48075 12.9838C3.32362 12.9689 3.26722 12.9438 3.23875 12.9263C3.17147 12.8851 3.11491 12.8285 3.07368 12.7613C3.05624 12.7328 3.03112 12.6764 3.01618 12.5193C3.00053 12.3547 3 12.137 3 11.8V3.2C3 2.86298 3.00053 2.64532 3.01618 2.48075C3.03112 2.32362 3.05624 2.26722 3.07368 2.23875C3.11491 2.17147 3.17147 2.11491 3.23875 2.07368ZM5 10C4.72386 10 4.5 10.2239 4.5 10.5C4.5 10.7761 4.72386 11 5 11H8C8.27614 11 8.5 10.7761 8.5 10.5C8.5 10.2239 8.27614 10 8 10H5ZM4.5 7.5C4.5 7.22386 4.72386 7 5 7H10C10.2761 7 10.5 7.22386 10.5 7.5C10.5 7.77614 10.2761 8 10 8H5C4.72386 8 4.5 7.77614 4.5 7.5ZM5 4C4.72386 4 4.5 4.22386 4.5 4.5C4.5 4.77614 4.72386 5 5 5H10C10.2761 5 10.5 4.77614 10.5 4.5C10.5 4.22386 10.2761 4 10 4H5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/reload.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.84998 7.49998C1.84998 4.66458 4.05979 1.84998 7.49998 1.84998C10.2783 1.84998 11.6515 3.9064 12.2367 5H10.5C10.2239 5 10 5.22386 10 5.5C10 5.77614 10.2239 6 10.5 6H13.5C13.7761 6 14 5.77614 14 5.5V2.5C14 2.22386 13.7761 2 13.5 2C13.2239 2 13 2.22386 13 2.5V4.31318C12.2955 3.07126 10.6659 0.849976 7.49998 0.849976C3.43716 0.849976 0.849976 4.18537 0.849976 7.49998C0.849976 10.8146 3.43716 14.15 7.49998 14.15C9.44382 14.15 11.0622 13.3808 12.2145 12.2084C12.8315 11.5806 13.3133 10.839 13.6418 10.0407C13.7469 9.78536 13.6251 9.49315 13.3698 9.38806C13.1144 9.28296 12.8222 9.40478 12.7171 9.66014C12.4363 10.3425 12.0251 10.9745 11.5013 11.5074C10.5295 12.4963 9.16504 13.15 7.49998 13.15C4.05979 13.15 1.84998 10.3354 1.84998 7.49998Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/reset.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.85355 2.14645C5.04882 2.34171 5.04882 2.65829 4.85355 2.85355L3.70711 4H9C11.4853 4 13.5 6.01472 13.5 8.5C13.5 10.9853 11.4853 13 9 13H5C4.72386 13 4.5 12.7761 4.5 12.5C4.5 12.2239 4.72386 12 5 12H9C10.933 12 12.5 10.433 12.5 8.5C12.5 6.567 10.933 5 9 5H3.70711L4.85355 6.14645C5.04882 6.34171 5.04882 6.65829 4.85355 6.85355C4.65829 7.04882 4.34171 7.04882 4.14645 6.85355L2.14645 4.85355C1.95118 4.65829 1.95118 4.34171 2.14645 4.14645L4.14645 2.14645C4.34171 1.95118 4.65829 1.95118 4.85355 2.14645Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/resume.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.04995 2.74995C3.04995 2.44619 2.80371 2.19995 2.49995 2.19995C2.19619 2.19995 1.94995 2.44619 1.94995 2.74995V12.25C1.94995 12.5537 2.19619 12.8 2.49995 12.8C2.80371 12.8 3.04995 12.5537 3.04995 12.25V2.74995ZM5.73333 2.30776C5.57835 2.22596 5.39185 2.23127 5.24177 2.32176C5.0917 2.41225 4.99995 2.57471 4.99995 2.74995V12.25C4.99995 12.4252 5.0917 12.5877 5.24177 12.6781C5.39185 12.7686 5.57835 12.7739 5.73333 12.6921L14.7333 7.94214C14.8973 7.85559 15 7.68539 15 7.49995C15 7.31452 14.8973 7.14431 14.7333 7.05776L5.73333 2.30776ZM5.99995 11.4207V3.5792L13.4287 7.49995L5.99995 11.4207Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/rocket.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.85357 3.85355L7.65355 3.05353C8.2981 2.40901 9.42858 1.96172 10.552 1.80125C11.1056 1.72217 11.6291 1.71725 12.0564 1.78124C12.4987 1.84748 12.7698 1.97696 12.8965 2.10357C13.0231 2.23018 13.1526 2.50125 13.2188 2.94357C13.2828 3.37086 13.2779 3.89439 13.1988 4.44801C13.0383 5.57139 12.591 6.70188 11.9464 7.34645L7.49999 11.7929L6.35354 10.6465C6.15827 10.4512 5.84169 10.4512 5.64643 10.6465C5.45117 10.8417 5.45117 11.1583 5.64643 11.3536L7.14644 12.8536C7.34171 13.0488 7.65829 13.0488 7.85355 12.8536L8.40073 12.3064L9.57124 14.2572C9.65046 14.3893 9.78608 14.4774 9.9389 14.4963C10.0917 14.5151 10.2447 14.4624 10.3535 14.3536L12.3535 12.3536C12.4648 12.2423 12.5172 12.0851 12.495 11.9293L12.0303 8.67679L12.6536 8.05355C13.509 7.19808 14.0117 5.82855 14.1887 4.58943C14.2784 3.9618 14.2891 3.33847 14.2078 2.79546C14.1287 2.26748 13.9519 1.74482 13.6035 1.39645C13.2552 1.04809 12.7325 0.871332 12.2045 0.792264C11.6615 0.710945 11.0382 0.721644 10.4105 0.8113C9.17143 0.988306 7.80189 1.491 6.94644 2.34642L6.32322 2.96968L3.07071 2.50504C2.91492 2.48278 2.75773 2.53517 2.64645 2.64646L0.646451 4.64645C0.537579 4.75533 0.484938 4.90829 0.50375 5.0611C0.522563 5.21391 0.61073 5.34954 0.742757 5.42876L2.69364 6.59928L2.14646 7.14645C2.0527 7.24022 2.00002 7.3674 2.00002 7.50001C2.00002 7.63261 2.0527 7.75979 2.14646 7.85356L3.64647 9.35356C3.84173 9.54883 4.15831 9.54883 4.35357 9.35356C4.54884 9.1583 4.54884 8.84172 4.35357 8.64646L3.20712 7.50001L3.85357 6.85356L6.85357 3.85355ZM10.0993 13.1936L9.12959 11.5775L11.1464 9.56067L11.4697 11.8232L10.0993 13.1936ZM3.42251 5.87041L5.43935 3.85356L3.17678 3.53034L1.80638 4.90074L3.42251 5.87041ZM2.35356 10.3535C2.54882 10.1583 2.54882 9.8417 2.35356 9.64644C2.1583 9.45118 1.84171 9.45118 1.64645 9.64644L0.646451 10.6464C0.451188 10.8417 0.451188 11.1583 0.646451 11.3535C0.841713 11.5488 1.1583 11.5488 1.35356 11.3535L2.35356 10.3535ZM3.85358 11.8536C4.04884 11.6583 4.04885 11.3417 3.85359 11.1465C3.65833 10.9512 3.34175 10.9512 3.14648 11.1465L1.14645 13.1464C0.95119 13.3417 0.951187 13.6583 1.14645 13.8535C1.34171 14.0488 1.65829 14.0488 1.85355 13.8536L3.85358 11.8536ZM5.35356 13.3535C5.54882 13.1583 5.54882 12.8417 5.35356 12.6464C5.1583 12.4512 4.84171 12.4512 4.64645 12.6464L3.64645 13.6464C3.45119 13.8417 3.45119 14.1583 3.64645 14.3535C3.84171 14.5488 4.1583 14.5488 4.35356 14.3535L5.35356 13.3535ZM9.49997 6.74881C10.1897 6.74881 10.7488 6.1897 10.7488 5.5C10.7488 4.8103 10.1897 4.25118 9.49997 4.25118C8.81026 4.25118 8.25115 4.8103 8.25115 5.5C8.25115 6.1897 8.81026 6.74881 9.49997 6.74881Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/rotate-counter-clockwise.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.59664 2.93628C7.76085 3.06401 8.00012 2.94698 8.00012 2.73895V1.99998C9.98143 2 11.1848 2.3637 11.9105 3.08945C12.6363 3.81522 13 5.0186 13 6.99998C13 7.27613 13.2239 7.49998 13.5 7.49998C13.7761 7.49998 14 7.27613 14 6.99998C14 4.9438 13.6325 3.39719 12.6176 2.38234C11.6028 1.36752 10.0562 0.999999 8.00012 0.999984V0.261266C8.00012 0.0532293 7.76085 -0.0637944 7.59664 0.063928L6.00384 1.30277C5.87516 1.40286 5.87516 1.59735 6.00384 1.69744L7.59664 2.93628ZM9.5 5H2.5C2.22386 5 2 5.22386 2 5.5V12.5C2 12.7761 2.22386 13 2.5 13H9.5C9.77614 13 10 12.7761 10 12.5V5.5C10 5.22386 9.77614 5 9.5 5ZM2.5 4C1.67157 4 1 4.67157 1 5.5V12.5C1 13.3284 1.67157 14 2.5 14H9.5C10.3284 14 11 13.3284 11 12.5V5.5C11 4.67157 10.3284 4 9.5 4H2.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/row-spacing.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.81832 0.68179C7.64258 0.506054 7.35766 0.506054 7.18192 0.68179L5.18192 2.68179C5.00619 2.85753 5.00619 3.14245 5.18192 3.31819C5.35766 3.49392 5.64258 3.49392 5.81832 3.31819L7.05012 2.08638L7.05012 5.50023C7.05012 5.74876 7.25159 5.95023 7.50012 5.95023C7.74865 5.95023 7.95012 5.74876 7.95012 5.50023L7.95012 2.08638L9.18192 3.31819C9.35766 3.49392 9.64258 3.49392 9.81832 3.31819C9.99406 3.14245 9.99406 2.85753 9.81832 2.68179L7.81832 0.68179ZM7.95012 12.9136V9.50023C7.95012 9.2517 7.74865 9.05023 7.50012 9.05023C7.25159 9.05023 7.05012 9.2517 7.05012 9.50023V12.9136L5.81832 11.6818C5.64258 11.5061 5.35766 11.5061 5.18192 11.6818C5.00619 11.8575 5.00619 12.1424 5.18192 12.3182L7.18192 14.3182C7.26632 14.4026 7.38077 14.45 7.50012 14.45C7.61947 14.45 7.73393 14.4026 7.81832 14.3182L9.81832 12.3182C9.99406 12.1424 9.99406 11.8575 9.81832 11.6818C9.64258 11.5061 9.35766 11.5061 9.18192 11.6818L7.95012 12.9136ZM1.49994 7.00017C1.2238 7.00017 0.999939 7.22403 0.999939 7.50017C0.999939 7.77631 1.2238 8.00017 1.49994 8.00017L13.4999 8.00017C13.7761 8.00017 13.9999 7.77631 13.9999 7.50017C13.9999 7.22403 13.7761 7.00017 13.4999 7.00017L1.49994 7.00017Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/rows.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M14 12.85L1 12.85L1 14.15L14 14.15L14 12.85ZM14 8.85002L1 8.85002L1 10.15L14 10.15L14 8.85002ZM1 4.85003L14 4.85003L14 6.15003L1 6.15002L1 4.85003ZM14 0.850025L1 0.850025L1 2.15002L14 2.15002L14 0.850025Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/ruler-horizontal.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.5 4C0.223858 4 0 4.22386 0 4.5V10.5C0 10.7761 0.223858 11 0.5 11H14.5C14.7761 11 15 10.7761 15 10.5V4.5C15 4.22386 14.7761 4 14.5 4H0.5ZM1 10V5H2.075V7.5C2.075 7.73472 2.26528 7.925 2.5 7.925C2.73472 7.925 2.925 7.73472 2.925 7.5V5H4.075V6.5C4.075 6.73472 4.26528 6.925 4.5 6.925C4.73472 6.925 4.925 6.73472 4.925 6.5V5H6.075V6.5C6.075 6.73472 6.26528 6.925 6.5 6.925C6.73472 6.925 6.925 6.73472 6.925 6.5V5H8.075V7.5C8.075 7.73472 8.26528 7.925 8.5 7.925C8.73472 7.925 8.925 7.73472 8.925 7.5V5H10.075V6.5C10.075 6.73472 10.2653 6.925 10.5 6.925C10.7347 6.925 10.925 6.73472 10.925 6.5V5H12.075V6.5C12.075 6.73472 12.2653 6.925 12.5 6.925C12.7347 6.925 12.925 6.73472 12.925 6.5V5H14V10H1Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/ruler-square.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.5 0C0.223858 0 0 0.223858 0 0.5V14.5C0 14.7761 0.223858 15 0.5 15H4.5C4.77614 15 5 14.7761 5 14.5V5H14.5C14.7761 5 15 4.77614 15 4.5V0.5C15 0.223858 14.7761 0 14.5 0H0.5ZM1 4.07505L1 1H4.07502C4.07502 1 4.07502 1 4.07502 1L4.07505 4.07507L1 4.07505ZM0.999997 4.92505L1 14H4V12.925H2.75002C2.5153 12.925 2.32502 12.7348 2.32502 12.5C2.32502 12.2653 2.5153 12.075 2.75002 12.075H4V10.925H2.25002C2.0153 10.925 1.82502 10.7347 1.82502 10.5C1.82502 10.2653 2.0153 10.075 2.25002 10.075H4V8.92504L2.75002 8.92502C2.5153 8.92502 2.32502 8.73474 2.32502 8.50002C2.32503 8.26529 2.51531 8.07502 2.75003 8.07502L4 8.07504V6.92502L2.74999 6.925C2.51527 6.925 2.325 6.73472 2.325 6.5C2.325 6.26528 2.51529 6.075 2.75001 6.075L4 6.07502V4.92507L0.999997 4.92505ZM4.92505 4H6.075V2.75006C6.075 2.51534 6.26528 2.32506 6.5 2.32506C6.73472 2.32506 6.925 2.51534 6.925 2.75006V4H8.07502V2.75005C8.07502 2.51533 8.2653 2.32505 8.50002 2.32505C8.73474 2.32505 8.92502 2.51533 8.92502 2.75005V4H10.0751V2.25005C10.0751 2.01533 10.2653 1.82505 10.5001 1.82505C10.7348 1.82505 10.9251 2.01533 10.9251 2.25005V4H12.0751V2.75005C12.0751 2.51533 12.2654 2.32505 12.5001 2.32505C12.7348 2.32505 12.9251 2.51533 12.9251 2.75005V4H14V1H4.92502L4.92505 4Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/scissors.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.949988 4.48455C0.949988 5.34059 1.64395 6.03455 2.49999 6.03455C3.35603 6.03455 4.04999 5.34059 4.04999 4.48455C4.04999 3.6285 3.35603 2.93455 2.49999 2.93455C1.64395 2.93455 0.949988 3.6285 0.949988 4.48455ZM2.49999 6.93455C1.14689 6.93455 0.0499878 5.83764 0.0499878 4.48455C0.0499878 3.13145 1.14689 2.03455 2.49999 2.03455C3.85309 2.03455 4.94999 3.13145 4.94999 4.48455C4.94999 4.80813 4.88726 5.11707 4.77329 5.39985L5.73655 6.04413C5.72943 6.06656 5.72269 6.08914 5.71635 6.11188L5.56288 6.66186L5.21005 6.89773L4.21554 6.23366C3.77357 6.6672 3.168 6.93455 2.49999 6.93455ZM0.949991 10.5C0.949991 9.64394 1.64395 8.94998 2.49999 8.94998C3.35603 8.94998 4.04999 9.64394 4.04999 10.5C4.04999 11.356 3.35603 12.05 2.49999 12.05C1.64395 12.05 0.949991 11.356 0.949991 10.5ZM2.49999 8.04998C1.14689 8.04998 0.0499908 9.14688 0.0499908 10.5C0.0499908 11.8531 1.14689 12.95 2.49999 12.95C3.85309 12.95 4.94999 11.8531 4.94999 10.5C4.94999 10.1803 4.88877 9.87497 4.77743 9.595L15 2.75737L14.0486 2.85737C12.7077 2.9983 11.4091 3.40895 10.231 4.06461L7.15646 5.77564C6.92307 5.90553 6.75134 6.12339 6.67955 6.38066L6.42653 7.28737L4.22437 8.75957C3.78166 8.32091 3.17246 8.04998 2.49999 8.04998ZM7.14435 9.2149L7.15646 9.22176L10.231 10.9328C11.4091 11.5884 12.7077 11.9991 14.0486 12.14L15 12.24L8.81072 8.1003L7.14435 9.2149Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/section.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 1.5C2 1.77614 1.77614 2 1.5 2C1.22386 2 1 1.77614 1 1.5C1 1.22386 1.22386 1 1.5 1C1.77614 1 2 1.22386 2 1.5ZM2 5L2 10H13V5H2ZM2 4C1.44772 4 1 4.44772 1 5V10C1 10.5523 1.44772 11 2 11H13C13.5523 11 14 10.5523 14 10V5C14 4.44772 13.5523 4 13 4H2ZM1.5 14C1.77614 14 2 13.7761 2 13.5C2 13.2239 1.77614 13 1.5 13C1.22386 13 1 13.2239 1 13.5C1 13.7761 1.22386 14 1.5 14ZM4 1.5C4 1.77614 3.77614 2 3.5 2C3.22386 2 3 1.77614 3 1.5C3 1.22386 3.22386 1 3.5 1C3.77614 1 4 1.22386 4 1.5ZM3.5 14C3.77614 14 4 13.7761 4 13.5C4 13.2239 3.77614 13 3.5 13C3.22386 13 3 13.2239 3 13.5C3 13.7761 3.22386 14 3.5 14ZM6 1.5C6 1.77614 5.77614 2 5.5 2C5.22386 2 5 1.77614 5 1.5C5 1.22386 5.22386 1 5.5 1C5.77614 1 6 1.22386 6 1.5ZM5.5 14C5.77614 14 6 13.7761 6 13.5C6 13.2239 5.77614 13 5.5 13C5.22386 13 5 13.2239 5 13.5C5 13.7761 5.22386 14 5.5 14ZM8 1.5C8 1.77614 7.77614 2 7.5 2C7.22386 2 7 1.77614 7 1.5C7 1.22386 7.22386 1 7.5 1C7.77614 1 8 1.22386 8 1.5ZM7.5 14C7.77614 14 8 13.7761 8 13.5C8 13.2239 7.77614 13 7.5 13C7.22386 13 7 13.2239 7 13.5C7 13.7761 7.22386 14 7.5 14ZM10 1.5C10 1.77614 9.77614 2 9.5 2C9.22386 2 9 1.77614 9 1.5C9 1.22386 9.22386 1 9.5 1C9.77614 1 10 1.22386 10 1.5ZM9.5 14C9.77614 14 10 13.7761 10 13.5C10 13.2239 9.77614 13 9.5 13C9.22386 13 9 13.2239 9 13.5C9 13.7761 9.22386 14 9.5 14ZM12 1.5C12 1.77614 11.7761 2 11.5 2C11.2239 2 11 1.77614 11 1.5C11 1.22386 11.2239 1 11.5 1C11.7761 1 12 1.22386 12 1.5ZM11.5 14C11.7761 14 12 13.7761 12 13.5C12 13.2239 11.7761 13 11.5 13C11.2239 13 11 13.2239 11 13.5C11 13.7761 11.2239 14 11.5 14ZM14 1.5C14 1.77614 13.7761 2 13.5 2C13.2239 2 13 1.77614 13 1.5C13 1.22386 13.2239 1 13.5 1C13.7761 1 14 1.22386 14 1.5ZM13.5 14C13.7761 14 14 13.7761 14 13.5C14 13.2239 13.7761 13 13.5 13C13.2239 13 13 13.2239 13 13.5C13 13.7761 13.2239 14 13.5 14Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/sewing-pin-filled.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M10 3.5C10 4.70948 9.14112 5.71836 8 5.94999V13.5C8 13.7761 7.77614 14 7.5 14C7.22386 14 7 13.7761 7 13.5V5.94999C5.85888 5.71836 5 4.70948 5 3.5C5 2.11929 6.11929 1 7.5 1C8.88071 1 10 2.11929 10 3.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/sewing-pin-solid.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M10 3.5C10 4.70948 9.14112 5.71836 8 5.94999V13.5C8 13.7761 7.77614 14 7.5 14C7.22386 14 7 13.7761 7 13.5V5.94999C5.85888 5.71836 5 4.70948 5 3.5C5 2.11929 6.11929 1 7.5 1C8.88071 1 10 2.11929 10 3.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/sewing-pin.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6 3.5C6 2.67157 6.67157 2 7.5 2C8.32843 2 9 2.67157 9 3.5C9 4.32843 8.32843 5 7.5 5C6.67157 5 6 4.32843 6 3.5ZM8 5.94999C9.14112 5.71836 10 4.70948 10 3.5C10 2.11929 8.88071 1 7.5 1C6.11929 1 5 2.11929 5 3.5C5 4.70948 5.85888 5.71836 7 5.94999V13.5C7 13.7761 7.22386 14 7.5 14C7.77614 14 8 13.7761 8 13.5V5.94999Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/shadow-inner.svg+78−0
@@ -0,0 +1,78 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 opacity=".05"
4 fill-rule="evenodd"
5 clip-rule="evenodd"
6 d="M12.1619 3.85182C8.35817 4.88918 4.88936 8.358 3.85199 12.1617L3.3696 12.0301C4.45356 8.05564 8.05581 4.45339 12.0303 3.36943L12.1619 3.85182Z"
7 fill="currentColor"
8 />
9 <path
10 opacity=".1"
11 fill-rule="evenodd"
12 clip-rule="evenodd"
13 d="M11.8807 3.42707C8.03441 4.50542 4.50561 8.03422 3.42726 11.8805L2.94582 11.7456C4.07129 7.73121 7.7314 4.0711 11.7458 2.94563L11.8807 3.42707Z"
14 fill="currentColor"
15 />
16 <path
17 opacity=".15"
18 fill-rule="evenodd"
19 clip-rule="evenodd"
20 d="M11.5201 3.02556C7.69092 4.16199 4.16779 7.68323 3.02805 11.512L2.54883 11.3694C3.73676 7.37869 7.38659 3.73076 11.3778 2.54623L11.5201 3.02556Z"
21 fill="currentColor"
22 />
23 <path
24 opacity=".2"
25 fill-rule="evenodd"
26 clip-rule="evenodd"
27 d="M11.0468 2.66169C7.31117 3.87664 3.87918 7.3079 2.66298 11.0434L2.18754 10.8886C3.45324 7.00109 7.00445 3.45062 10.8921 2.18621L11.0468 2.66169Z"
28 fill="currentColor"
29 />
30 <path
31 opacity=".25"
32 fill-rule="evenodd"
33 clip-rule="evenodd"
34 d="M10.5201 2.32365C6.92091 3.61447 3.62391 6.90876 2.32845 10.5073L1.858 10.338C3.20398 6.59909 6.61155 3.19424 10.3513 1.85301L10.5201 2.32365Z"
35 fill="currentColor"
36 />
37 <path
38 opacity=".3"
39 fill-rule="evenodd"
40 clip-rule="evenodd"
41 d="M9.90222 2.03122C6.50003 3.39465 3.39968 6.49367 2.03399 9.89551L1.56998 9.70924C2.98651 6.18076 6.18728 2.98133 9.71622 1.5671L9.90222 2.03122Z"
42 fill="currentColor"
43 />
44 <path
45 opacity=".35"
46 fill-rule="evenodd"
47 clip-rule="evenodd"
48 d="M9.20727 1.78873C6.06136 3.20349 3.21103 6.05203 1.79331 9.19738L1.33747 8.99192C2.80536 5.73528 5.74485 2.7976 9.0022 1.33272L9.20727 1.78873Z"
49 fill="currentColor"
50 />
51 <path
52 opacity=".4"
53 fill-rule="evenodd"
54 clip-rule="evenodd"
55 d="M8.40713 1.62085C5.59323 3.05117 3.05794 5.58509 1.62544 8.39847L1.17987 8.1716C2.66036 5.26397 5.27232 2.6534 8.18057 1.17513L8.40713 1.62085Z"
56 fill="currentColor"
57 />
58 <path
59 opacity=".45"
60 fill-rule="evenodd"
61 clip-rule="evenodd"
62 d="M7.46207 1.56747C5.08689 2.94695 2.95362 5.07912 1.57249 7.45379L1.14028 7.20241C2.56503 4.75273 4.7607 2.55818 7.21096 1.1351L7.46207 1.56747Z"
63 fill="currentColor"
64 />
65 <path
66 opacity=".5"
67 fill-rule="evenodd"
68 clip-rule="evenodd"
69 d="M6.30407 1.70487C4.51964 2.91063 2.90983 4.52061 1.7043 6.30513L1.28998 6.02524C2.5313 4.18773 4.18673 2.53214 6.02413 1.29059L6.30407 1.70487Z"
70 fill="currentColor"
71 />
72 <path
73 fill-rule="evenodd"
74 clip-rule="evenodd"
75 d="M0.877075 7.49988C0.877075 3.84219 3.84222 0.877045 7.49991 0.877045C11.1576 0.877045 14.1227 3.84219 14.1227 7.49988C14.1227 11.1575 11.1576 14.1227 7.49991 14.1227C3.84222 14.1227 0.877075 11.1575 0.877075 7.49988ZM7.49991 1.82704C4.36689 1.82704 1.82708 4.36686 1.82708 7.49988C1.82708 10.6329 4.36689 13.1727 7.49991 13.1727C10.6329 13.1727 13.1727 10.6329 13.1727 7.49988C13.1727 4.36686 10.6329 1.82704 7.49991 1.82704Z"
76 fill="currentColor"
77 />
78</svg>
assets/icons/radix/shadow-none.svg+78−0
@@ -0,0 +1,78 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 opacity=".05"
4 fill-rule="evenodd"
5 clip-rule="evenodd"
6 d="M6.78296 13.376C8.73904 9.95284 8.73904 5.04719 6.78296 1.62405L7.21708 1.37598C9.261 4.95283 9.261 10.0472 7.21708 13.624L6.78296 13.376Z"
7 fill="currentColor"
8 />
9 <path
10 opacity=".1"
11 fill-rule="evenodd"
12 clip-rule="evenodd"
13 d="M7.28204 13.4775C9.23929 9.99523 9.23929 5.00475 7.28204 1.52248L7.71791 1.2775C9.76067 4.9119 9.76067 10.0881 7.71791 13.7225L7.28204 13.4775Z"
14 fill="currentColor"
15 />
16 <path
17 opacity=".15"
18 fill-rule="evenodd"
19 clip-rule="evenodd"
20 d="M7.82098 13.5064C9.72502 9.99523 9.72636 5.01411 7.82492 1.50084L8.26465 1.26285C10.2465 4.92466 10.2451 10.085 8.26052 13.7448L7.82098 13.5064Z"
21 fill="currentColor"
22 />
23 <path
24 opacity=".2"
25 fill-rule="evenodd"
26 clip-rule="evenodd"
27 d="M8.41284 13.429C10.1952 9.92842 10.1957 5.07537 8.41435 1.57402L8.85999 1.34729C10.7139 4.99113 10.7133 10.0128 8.85841 13.6559L8.41284 13.429Z"
28 fill="currentColor"
29 />
30 <path
31 opacity=".25"
32 fill-rule="evenodd"
33 clip-rule="evenodd"
34 d="M9.02441 13.2956C10.6567 9.8379 10.6586 5.17715 9.03005 1.71656L9.48245 1.50366C11.1745 5.09919 11.1726 9.91629 9.47657 13.5091L9.02441 13.2956Z"
35 fill="currentColor"
36 />
37 <path
38 opacity=".3"
39 fill-rule="evenodd"
40 clip-rule="evenodd"
41 d="M9.66809 13.0655C11.1097 9.69572 11.1107 5.3121 9.67088 1.94095L10.1307 1.74457C11.6241 5.24121 11.6231 9.76683 10.1278 13.2622L9.66809 13.0655Z"
42 fill="currentColor"
43 />
44 <path
45 opacity=".35"
46 fill-rule="evenodd"
47 clip-rule="evenodd"
48 d="M10.331 12.7456C11.5551 9.52073 11.5564 5.49103 10.3347 2.26444L10.8024 2.0874C12.0672 5.42815 12.0659 9.58394 10.7985 12.9231L10.331 12.7456Z"
49 fill="currentColor"
50 />
51 <path
52 opacity=".4"
53 fill-rule="evenodd"
54 clip-rule="evenodd"
55 d="M11.0155 12.2986C11.9938 9.29744 11.9948 5.71296 11.0184 2.71067L11.4939 2.55603C12.503 5.6589 12.502 9.35178 11.4909 12.4535L11.0155 12.2986Z"
56 fill="currentColor"
57 />
58 <path
59 opacity=".45"
60 fill-rule="evenodd"
61 clip-rule="evenodd"
62 d="M11.7214 11.668C12.4254 9.01303 12.4262 5.99691 11.7237 3.34116L12.2071 3.21329C12.9318 5.95292 12.931 9.05728 12.2047 11.7961L11.7214 11.668Z"
63 fill="currentColor"
64 />
65 <path
66 opacity=".5"
67 fill-rule="evenodd"
68 clip-rule="evenodd"
69 d="M12.4432 10.752C12.8524 8.63762 12.8523 6.36089 12.4429 4.2466L12.9338 4.15155C13.3553 6.32861 13.3554 8.66985 12.9341 10.847L12.4432 10.752Z"
70 fill="currentColor"
71 />
72 <path
73 fill-rule="evenodd"
74 clip-rule="evenodd"
75 d="M7.49991 0.877045C3.84222 0.877045 0.877075 3.84219 0.877075 7.49988C0.877075 9.1488 1.47969 10.657 2.4767 11.8162L1.64647 12.6464C1.45121 12.8417 1.45121 13.1583 1.64647 13.3535C1.84173 13.5488 2.15832 13.5488 2.35358 13.3535L3.18383 12.5233C4.34302 13.5202 5.8511 14.1227 7.49991 14.1227C11.1576 14.1227 14.1227 11.1575 14.1227 7.49988C14.1227 5.85107 13.5202 4.34298 12.5233 3.1838L13.3536 2.35355C13.5488 2.15829 13.5488 1.8417 13.3536 1.64644C13.1583 1.45118 12.8417 1.45118 12.6465 1.64644L11.8162 2.47667C10.657 1.47966 9.14883 0.877045 7.49991 0.877045ZM11.1423 3.15065C10.1568 2.32449 8.88644 1.82704 7.49991 1.82704C4.36689 1.82704 1.82708 4.36686 1.82708 7.49988C1.82708 8.88641 2.32452 10.1568 3.15069 11.1422L11.1423 3.15065ZM3.85781 11.8493C4.84322 12.6753 6.11348 13.1727 7.49991 13.1727C10.6329 13.1727 13.1727 10.6329 13.1727 7.49988C13.1727 6.11345 12.6754 4.84319 11.8493 3.85778L3.85781 11.8493Z"
76 fill="currentColor"
77 />
78</svg>
assets/icons/radix/shadow-outer.svg+43−0
@@ -0,0 +1,43 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 opacity=".05"
4 fill-rule="evenodd"
5 clip-rule="evenodd"
6 d="M12.1398 3.88617C13.8553 4.94159 15 6.83701 15 9.00001C15 12.3137 12.3137 15 9.00002 15C6.84351 15 4.95296 13.8621 3.89569 12.1552L4.32076 11.8919C5.29069 13.4578 7.02376 14.5 9.00002 14.5C12.0376 14.5 14.5 12.0375 14.5 9.00001C14.5 7.01781 13.4516 5.28027 11.8778 4.31203L12.1398 3.88617Z"
7 fill="currentColor"
8 />
9 <path
10 opacity=".2"
11 fill-rule="evenodd"
12 clip-rule="evenodd"
13 d="M12.851 5.07321C13.8684 6.07106 14.5 7.46199 14.5 9C14.5 12.0375 12.0376 14.5 9.00004 14.5C7.46215 14.5 6.07132 13.8685 5.07349 12.8513L5.43043 12.5011C6.3381 13.4264 7.60186 14 9.00004 14C11.7614 14 14 11.7614 14 9C14 7.60171 13.4264 6.33786 12.5009 5.43017L12.851 5.07321Z"
14 fill="currentColor"
15 />
16 <path
17 opacity=".35"
18 fill-rule="evenodd"
19 clip-rule="evenodd"
20 d="M13.3022 6.45071C13.7455 7.19737 14 8.06935 14 9.00001C14 11.7614 11.7614 14 9.00002 14C8.04868 14 7.15868 13.7341 6.40118 13.2724L6.66142 12.8454C7.34275 13.2607 8.14306 13.5 9.00002 13.5C11.4853 13.5 13.5 11.4853 13.5 9.00001C13.5 8.16165 13.271 7.37754 12.8722 6.70599L13.3022 6.45071Z"
21 fill="currentColor"
22 />
23 <path
24 opacity=".5"
25 fill-rule="evenodd"
26 clip-rule="evenodd"
27 d="M13.3745 7.94022C13.4566 8.28031 13.5 8.63525 13.5 9.00001C13.5 11.4853 11.4853 13.5 9.00003 13.5C8.61104 13.5 8.23323 13.4506 7.87268 13.3576L7.99759 12.8734C8.31768 12.956 8.65353 13 9.00003 13C11.2091 13 13 11.2091 13 9.00001C13 8.67509 12.9613 8.35953 12.8884 8.05757L13.3745 7.94022Z"
28 fill="currentColor"
29 />
30 <path
31 opacity=".65"
32 fill-rule="evenodd"
33 clip-rule="evenodd"
34 d="M12.9155 9.82133C12.5898 11.3813 11.3562 12.6072 9.79205 12.9215L9.69354 12.4313C11.0613 12.1565 12.1413 11.0834 12.4261 9.71915L12.9155 9.82133Z"
35 fill="currentColor"
36 />
37 <path
38 fill-rule="evenodd"
39 clip-rule="evenodd"
40 d="M1.2771 7.50253C1.2771 4.06456 4.06413 1.27753 7.5021 1.27753C10.94 1.27753 13.7271 4.06456 13.7271 7.50253C13.7271 10.9405 10.94 13.7275 7.5021 13.7275C4.06413 13.7275 1.2771 10.9405 1.2771 7.50253ZM7.5021 2.22753C4.5888 2.22753 2.2271 4.58923 2.2271 7.50253C2.2271 10.4158 4.5888 12.7775 7.5021 12.7775C10.4154 12.7775 12.7771 10.4158 12.7771 7.50253C12.7771 4.58923 10.4154 2.22753 7.5021 2.22753Z"
41 fill="currentColor"
42 />
43</svg>
assets/icons/radix/shadow.svg+78−0
@@ -0,0 +1,78 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 opacity=".05"
4 fill-rule="evenodd"
5 clip-rule="evenodd"
6 d="M6.78296 13.376C8.73904 9.95284 8.73904 5.04719 6.78296 1.62405L7.21708 1.37598C9.261 4.95283 9.261 10.0472 7.21708 13.624L6.78296 13.376Z"
7 fill="currentColor"
8 />
9 <path
10 opacity=".1"
11 fill-rule="evenodd"
12 clip-rule="evenodd"
13 d="M7.28204 13.4775C9.23929 9.99523 9.23929 5.00475 7.28204 1.52248L7.71791 1.2775C9.76067 4.9119 9.76067 10.0881 7.71791 13.7225L7.28204 13.4775Z"
14 fill="currentColor"
15 />
16 <path
17 opacity=".15"
18 fill-rule="evenodd"
19 clip-rule="evenodd"
20 d="M7.82098 13.5064C9.72502 9.99523 9.72636 5.01411 7.82492 1.50084L8.26465 1.26285C10.2465 4.92466 10.2451 10.085 8.26052 13.7448L7.82098 13.5064Z"
21 fill="currentColor"
22 />
23 <path
24 opacity=".2"
25 fill-rule="evenodd"
26 clip-rule="evenodd"
27 d="M8.41284 13.429C10.1952 9.92842 10.1957 5.07537 8.41435 1.57402L8.85999 1.34729C10.7139 4.99113 10.7133 10.0128 8.85841 13.6559L8.41284 13.429Z"
28 fill="currentColor"
29 />
30 <path
31 opacity=".25"
32 fill-rule="evenodd"
33 clip-rule="evenodd"
34 d="M9.02441 13.2956C10.6567 9.8379 10.6586 5.17715 9.03005 1.71656L9.48245 1.50366C11.1745 5.09919 11.1726 9.91629 9.47657 13.5091L9.02441 13.2956Z"
35 fill="currentColor"
36 />
37 <path
38 opacity=".3"
39 fill-rule="evenodd"
40 clip-rule="evenodd"
41 d="M9.66809 13.0655C11.1097 9.69572 11.1107 5.3121 9.67088 1.94095L10.1307 1.74457C11.6241 5.24121 11.6231 9.76683 10.1278 13.2622L9.66809 13.0655Z"
42 fill="currentColor"
43 />
44 <path
45 opacity=".35"
46 fill-rule="evenodd"
47 clip-rule="evenodd"
48 d="M10.331 12.7456C11.5551 9.52073 11.5564 5.49103 10.3347 2.26444L10.8024 2.0874C12.0672 5.42815 12.0659 9.58394 10.7985 12.9231L10.331 12.7456Z"
49 fill="currentColor"
50 />
51 <path
52 opacity=".4"
53 fill-rule="evenodd"
54 clip-rule="evenodd"
55 d="M11.0155 12.2986C11.9938 9.29744 11.9948 5.71296 11.0184 2.71067L11.4939 2.55603C12.503 5.6589 12.502 9.35178 11.4909 12.4535L11.0155 12.2986Z"
56 fill="currentColor"
57 />
58 <path
59 opacity=".45"
60 fill-rule="evenodd"
61 clip-rule="evenodd"
62 d="M11.7214 11.668C12.4254 9.01303 12.4262 5.99691 11.7237 3.34116L12.2071 3.21329C12.9318 5.95292 12.931 9.05728 12.2047 11.7961L11.7214 11.668Z"
63 fill="currentColor"
64 />
65 <path
66 opacity=".5"
67 fill-rule="evenodd"
68 clip-rule="evenodd"
69 d="M12.4432 10.752C12.8524 8.63762 12.8523 6.36089 12.4429 4.2466L12.9338 4.15155C13.3553 6.32861 13.3554 8.66985 12.9341 10.847L12.4432 10.752Z"
70 fill="currentColor"
71 />
72 <path
73 fill-rule="evenodd"
74 clip-rule="evenodd"
75 d="M0.877075 7.49988C0.877075 3.84219 3.84222 0.877045 7.49991 0.877045C11.1576 0.877045 14.1227 3.84219 14.1227 7.49988C14.1227 11.1575 11.1576 14.1227 7.49991 14.1227C3.84222 14.1227 0.877075 11.1575 0.877075 7.49988ZM7.49991 1.82704C4.36689 1.82704 1.82708 4.36686 1.82708 7.49988C1.82708 10.6329 4.36689 13.1727 7.49991 13.1727C10.6329 13.1727 13.1727 10.6329 13.1727 7.49988C13.1727 4.36686 10.6329 1.82704 7.49991 1.82704Z"
76 fill="currentColor"
77 />
78</svg>
assets/icons/radix/share-1.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5 7.50003C5 8.32845 4.32843 9.00003 3.5 9.00003C2.67157 9.00003 2 8.32845 2 7.50003C2 6.6716 2.67157 6.00003 3.5 6.00003C4.32843 6.00003 5 6.6716 5 7.50003ZM5.71313 8.66388C5.29445 9.45838 4.46048 10 3.5 10C2.11929 10 1 8.88074 1 7.50003C1 6.11931 2.11929 5.00003 3.5 5.00003C4.46048 5.00003 5.29445 5.54167 5.71313 6.33616L9.10424 4.21671C9.03643 3.98968 9 3.74911 9 3.50003C9 2.11932 10.1193 1.00003 11.5 1.00003C12.8807 1.00003 14 2.11932 14 3.50003C14 4.88074 12.8807 6.00003 11.5 6.00003C10.6915 6.00003 9.97264 5.61624 9.51566 5.0209L5.9853 7.22738C5.99502 7.31692 6 7.40789 6 7.50003C6 7.59216 5.99502 7.68312 5.9853 7.77267L9.51567 9.97915C9.97265 9.38382 10.6915 9.00003 11.5 9.00003C12.8807 9.00003 14 10.1193 14 11.5C14 12.8807 12.8807 14 11.5 14C10.1193 14 9 12.8807 9 11.5C9 11.2509 9.03643 11.0104 9.10425 10.7833L5.71313 8.66388ZM11.5 5.00003C12.3284 5.00003 13 4.32846 13 3.50003C13 2.6716 12.3284 2.00003 11.5 2.00003C10.6716 2.00003 10 2.6716 10 3.50003C10 4.32846 10.6716 5.00003 11.5 5.00003ZM13 11.5C13 12.3285 12.3284 13 11.5 13C10.6716 13 10 12.3285 10 11.5C10 10.6716 10.6716 10 11.5 10C12.3284 10 13 10.6716 13 11.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/share-2.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.5 5.00006C3.22386 5.00006 3 5.22392 3 5.50006L3 11.5001C3 11.7762 3.22386 12.0001 3.5 12.0001L11.5 12.0001C11.7761 12.0001 12 11.7762 12 11.5001L12 5.50006C12 5.22392 11.7761 5.00006 11.5 5.00006L10.25 5.00006C9.97386 5.00006 9.75 4.7762 9.75 4.50006C9.75 4.22392 9.97386 4.00006 10.25 4.00006L11.5 4.00006C12.3284 4.00006 13 4.67163 13 5.50006L13 11.5001C13 12.3285 12.3284 13.0001 11.5 13.0001L3.5 13.0001C2.67157 13.0001 2 12.3285 2 11.5001L2 5.50006C2 4.67163 2.67157 4.00006 3.5 4.00006L4.75 4.00006C5.02614 4.00006 5.25 4.22392 5.25 4.50006C5.25 4.7762 5.02614 5.00006 4.75 5.00006L3.5 5.00006ZM7 1.6364L5.5682 3.0682C5.39246 3.24393 5.10754 3.24393 4.9318 3.0682C4.75607 2.89246 4.75607 2.60754 4.9318 2.4318L7.1818 0.181802C7.26619 0.09741 7.38065 0.049999 7.5 0.049999C7.61935 0.049999 7.73381 0.09741 7.8182 0.181802L10.0682 2.4318C10.2439 2.60754 10.2439 2.89246 10.0682 3.0682C9.89246 3.24393 9.60754 3.24393 9.4318 3.0682L8 1.6364L8 8.5C8 8.77614 7.77614 9 7.5 9C7.22386 9 7 8.77614 7 8.5L7 1.6364Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/shuffle.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M12.3536 1.14645C12.1583 0.951184 11.8417 0.951184 11.6464 1.14645C11.4512 1.34171 11.4512 1.65829 11.6464 1.85355L12.7929 3H12C10.7037 3 9.71111 3.58423 8.87248 4.38931C8.20065 5.03427 7.59349 5.85684 6.99461 6.6682C6.86287 6.84668 6.73154 7.02462 6.6 7.2C5.10874 9.18835 3.49037 11 0.5 11C0.223858 11 0 11.2239 0 11.5C0 11.7761 0.223858 12 0.5 12C4.00963 12 5.89126 9.81165 7.4 7.8C7.54367 7.60845 7.6832 7.41962 7.81996 7.23454L7.82005 7.23443L7.82006 7.23441C8.41674 6.42695 8.96069 5.69085 9.56502 5.11069C10.2889 4.41577 11.0463 4 12 4H12.7929L11.6464 5.14645C11.4512 5.34171 11.4512 5.65829 11.6464 5.85355C11.8417 6.04882 12.1583 6.04882 12.3536 5.85355L14.3536 3.85355C14.5488 3.65829 14.5488 3.34171 14.3536 3.14645L12.3536 1.14645ZM0.5 3C3.35278 3 5.12992 4.44588 6.50548 6.06746L6.3762 6.24266C6.2483 6.4161 6.12293 6.58609 6 6.75C5.96397 6.79804 5.92798 6.84581 5.892 6.89331C4.57348 5.29306 3.02637 4 0.5 4C0.223858 4 0 3.77614 0 3.5C0 3.22386 0.223858 3 0.5 3ZM8.87248 10.6107C8.37284 10.131 7.90897 9.55314 7.45767 8.95468C7.64688 8.71693 7.82704 8.48061 8 8.25L8.08987 8.12987C8.58412 8.79402 9.05288 9.39766 9.56502 9.88931C10.2889 10.5842 11.0463 11 12 11H12.7929L11.6464 9.85355C11.4512 9.65829 11.4512 9.34171 11.6464 9.14645C11.8417 8.95118 12.1583 8.95118 12.3536 9.14645L14.3536 11.1464C14.5488 11.3417 14.5488 11.6583 14.3536 11.8536L12.3536 13.8536C12.1583 14.0488 11.8417 14.0488 11.6464 13.8536C11.4512 13.6583 11.4512 13.3417 11.6464 13.1464L12.7929 12H12C10.7037 12 9.71111 11.4158 8.87248 10.6107Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/size.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M11.5 3.04999C11.7485 3.04999 11.95 3.25146 11.95 3.49999V7.49999C11.95 7.74852 11.7485 7.94999 11.5 7.94999C11.2515 7.94999 11.05 7.74852 11.05 7.49999V4.58639L4.58638 11.05H7.49999C7.74852 11.05 7.94999 11.2515 7.94999 11.5C7.94999 11.7485 7.74852 11.95 7.49999 11.95L3.49999 11.95C3.38064 11.95 3.26618 11.9026 3.18179 11.8182C3.0974 11.7338 3.04999 11.6193 3.04999 11.5L3.04999 7.49999C3.04999 7.25146 3.25146 7.04999 3.49999 7.04999C3.74852 7.04999 3.94999 7.25146 3.94999 7.49999L3.94999 10.4136L10.4136 3.94999L7.49999 3.94999C7.25146 3.94999 7.04999 3.74852 7.04999 3.49999C7.04999 3.25146 7.25146 3.04999 7.49999 3.04999L11.5 3.04999Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/sketch-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.53731 0.826873C7.5125 0.824392 7.4875 0.824392 7.46269 0.826873L3.96269 1.17687C3.85672 1.18747 3.76025 1.24262 3.69736 1.32857L0.699771 5.42528C0.654046 5.48627 0.62647 5.56165 0.625057 5.6434C0.625019 5.6456 0.625 5.64781 0.625 5.65001C0.625 5.65052 0.625001 5.65103 0.625003 5.65153C0.625363 5.74237 0.658021 5.82559 0.712087 5.8903L7.21042 13.7883C7.28165 13.8749 7.38789 13.925 7.5 13.925C7.61211 13.925 7.71835 13.8749 7.78958 13.7883L14.2879 5.89031C14.342 5.8256 14.3746 5.74237 14.375 5.65153C14.375 5.65103 14.375 5.65052 14.375 5.65001C14.375 5.64849 14.375 5.64697 14.375 5.64545C14.3749 5.63963 14.3747 5.63382 14.3744 5.62801C14.37 5.55219 14.3431 5.48242 14.3002 5.42527L11.3026 1.32857C11.2397 1.24262 11.1433 1.18747 11.0373 1.17687L7.53731 0.826873ZM10.925 5.27501V5.25236L10.9223 5.27501H10.925ZM10.9342 5.17498H13.1877L11.2495 2.5261L10.9342 5.17498ZM10.5707 1.88395L8.04432 1.63131L10.1747 5.21034L10.5707 1.88395ZM6.95568 1.63131L4.42931 1.88395L4.82531 5.21034L6.95568 1.63131ZM3.75046 2.5261L1.81226 5.17498H4.0658L3.75046 2.5261ZM1.79416 6.02501L6.75861 12.0587L4.22371 6.0669C4.21787 6.0531 4.21314 6.0391 4.20949 6.02501H1.79416ZM5.15055 6.02501L7.49999 12.1085L9.84943 6.02501H9.78681H5.21319H5.15055ZM10.7905 6.02501C10.7869 6.0391 10.7821 6.0531 10.7763 6.0669L8.24139 12.0587L13.2058 6.02501H10.7905ZM7.5 2.18317L9.34038 5.27501H5.65962L7.5 2.18317Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/slash.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.10876 14L9.46582 1H10.8178L5.46074 14H4.10876Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/slider.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M10.3004 7.49991C10.3004 8.4943 9.49426 9.30041 8.49988 9.30041C7.50549 9.30041 6.69938 8.4943 6.69938 7.49991C6.69938 6.50553 7.50549 5.69942 8.49988 5.69942C9.49426 5.69942 10.3004 6.50553 10.3004 7.49991ZM11.205 8C10.9699 9.28029 9.84816 10.2504 8.49988 10.2504C7.1516 10.2504 6.0299 9.28029 5.79473 8H0.5C0.223858 8 0 7.77614 0 7.5C0 7.22386 0.223858 7 0.5 7H5.7947C6.0298 5.71962 7.15154 4.74942 8.49988 4.74942C9.84822 4.74942 10.97 5.71962 11.2051 7H14.5C14.7761 7 15 7.22386 15 7.5C15 7.77614 14.7761 8 14.5 8H11.205Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/space-between-horizontally.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M14.4999 0.999994C14.2237 0.999994 13.9999 1.22385 13.9999 1.49999L13.9999 5.99995L9.99992 5.99995C9.44764 5.99995 8.99993 6.44766 8.99993 6.99994L8.99993 7.99994C8.99993 8.55222 9.44764 8.99993 9.99992 8.99993L13.9999 8.99993L13.9999 13.4999C13.9999 13.776 14.2237 13.9999 14.4999 13.9999C14.776 13.9999 14.9999 13.776 14.9999 13.4999L14.9999 1.49999C14.9999 1.22385 14.776 0.999994 14.4999 0.999994ZM4.99996 5.99995L0.999992 5.99995L0.999992 1.49999C0.999992 1.22385 0.776136 0.999994 0.499996 0.999994C0.223856 0.999994 -9.7852e-09 1.22385 -2.18557e-08 1.49999L4.07279e-07 13.4999C3.95208e-07 13.776 0.223855 13.9999 0.499996 13.9999C0.776136 13.9999 0.999992 13.776 0.999992 13.4999L0.999992 8.99993L4.99996 8.99993C5.55224 8.99993 5.99995 8.55222 5.99995 7.99993L5.99995 6.99994C5.99995 6.44766 5.55224 5.99995 4.99996 5.99995Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/space-between-vertically.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.999878 0.5C0.999878 0.223858 1.22374 0 1.49988 0H13.4999C13.776 0 13.9999 0.223858 13.9999 0.5C13.9999 0.776142 13.776 1 13.4999 1L9 1V5C9 5.55228 8.55228 6 8 6H7C6.44772 6 6 5.55228 6 5V1H1.49988C1.22374 1 0.999878 0.776142 0.999878 0.5ZM7 9C6.44772 9 6 9.44771 6 10V14H1.49988C1.22374 14 0.999878 14.2239 0.999878 14.5C0.999878 14.7761 1.22374 15 1.49988 15H13.4999C13.776 15 13.9999 14.7761 13.9999 14.5C13.9999 14.2239 13.776 14 13.4999 14H9V10C9 9.44772 8.55228 9 8 9H7Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/space-evenly-horizontally.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M14.4999 0.999992C14.2237 0.999992 13.9999 1.22385 13.9999 1.49999L13.9999 13.4999C13.9999 13.776 14.2237 13.9999 14.4999 13.9999C14.776 13.9999 14.9999 13.776 14.9999 13.4999L14.9999 1.49999C14.9999 1.22385 14.776 0.999992 14.4999 0.999992ZM0.499996 0.999992C0.223856 0.999992 -9.78509e-09 1.22385 -2.18556e-08 1.49999L4.07279e-07 13.4999C3.95208e-07 13.776 0.223855 13.9999 0.499996 13.9999C0.776136 13.9999 0.999992 13.776 0.999992 13.4999L0.999992 1.49999C0.999992 1.22385 0.776136 0.999992 0.499996 0.999992ZM1.99998 6.99994C1.99998 6.44766 2.44769 5.99995 2.99998 5.99995L5.99995 5.99995C6.55223 5.99995 6.99994 6.44766 6.99994 6.99994L6.99994 7.99993C6.99994 8.55221 6.55223 8.99992 5.99995 8.99992L2.99998 8.99992C2.4477 8.99992 1.99998 8.55221 1.99998 7.99993L1.99998 6.99994ZM8.99993 5.99995C8.44765 5.99995 7.99993 6.44766 7.99993 6.99994L7.99993 7.99993C7.99993 8.55221 8.44765 8.99992 8.99993 8.99992L11.9999 8.99992C12.5522 8.99992 12.9999 8.55221 12.9999 7.99993L12.9999 6.99994C12.9999 6.44766 12.5522 5.99995 11.9999 5.99995L8.99993 5.99995Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/space-evenly-vertically.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.999878 0.5C0.999878 0.223858 1.22374 0 1.49988 0H13.4999C13.776 0 13.9999 0.223858 13.9999 0.5C13.9999 0.776142 13.776 1 13.4999 1H1.49988C1.22374 1 0.999878 0.776142 0.999878 0.5ZM7 2C6.44772 2 6 2.44772 6 3V6C6 6.55228 6.44772 7 7 7H8C8.55228 7 9 6.55228 9 6V3C9 2.44772 8.55228 2 8 2H7ZM7 8C6.44772 8 6 8.44771 6 9V12C6 12.5523 6.44772 13 7 13H8C8.55228 13 9 12.5523 9 12V9C9 8.44772 8.55228 8 8 8H7ZM1.49988 14C1.22374 14 0.999878 14.2239 0.999878 14.5C0.999878 14.7761 1.22374 15 1.49988 15H13.4999C13.776 15 13.9999 14.7761 13.9999 14.5C13.9999 14.2239 13.776 14 13.4999 14H1.49988Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/speaker-loud.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.46968 1.05085C7.64122 1.13475 7.75 1.30904 7.75 1.5V13.5C7.75 13.691 7.64122 13.8653 7.46968 13.9492C7.29813 14.0331 7.09377 14.0119 6.94303 13.8947L3.2213 11H1.5C0.671571 11 0 10.3284 0 9.5V5.5C0 4.67158 0.671573 4 1.5 4H3.2213L6.94303 1.10533C7.09377 0.988085 7.29813 0.966945 7.46968 1.05085ZM6.75 2.52232L3.69983 4.89468C3.61206 4.96294 3.50405 5 3.39286 5H1.5C1.22386 5 1 5.22386 1 5.5V9.5C1 9.77615 1.22386 10 1.5 10H3.39286C3.50405 10 3.61206 10.0371 3.69983 10.1053L6.75 12.4777V2.52232ZM10.2784 3.84804C10.4623 3.72567 10.7106 3.77557 10.833 3.95949C12.2558 6.09798 12.2558 8.90199 10.833 11.0405C10.7106 11.2244 10.4623 11.2743 10.2784 11.1519C10.0944 11.0296 10.0445 10.7813 10.1669 10.5973C11.4111 8.72728 11.4111 6.27269 10.1669 4.40264C10.0445 4.21871 10.0944 3.97041 10.2784 3.84804ZM12.6785 1.43044C12.5356 1.2619 12.2832 1.24104 12.1147 1.38386C11.9462 1.52667 11.9253 1.77908 12.0681 1.94762C14.7773 5.14488 14.7773 9.85513 12.0681 13.0524C11.9253 13.2209 11.9462 13.4733 12.1147 13.6161C12.2832 13.759 12.5356 13.7381 12.6785 13.5696C15.6406 10.0739 15.6406 4.92612 12.6785 1.43044Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/speaker-moderate.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8 1.5C8 1.31062 7.893 1.13749 7.72361 1.05279C7.55421 0.968093 7.35151 0.986371 7.2 1.1L3.33333 4H1.5C0.671573 4 0 4.67158 0 5.5V9.5C0 10.3284 0.671573 11 1.5 11H3.33333L7.2 13.9C7.35151 14.0136 7.55421 14.0319 7.72361 13.9472C7.893 13.8625 8 13.6894 8 13.5V1.5ZM3.8 4.9L7 2.5V12.5L3.8 10.1C3.71345 10.0351 3.60819 10 3.5 10H1.5C1.22386 10 1 9.77614 1 9.5V5.5C1 5.22386 1.22386 5 1.5 5H3.5C3.60819 5 3.71345 4.96491 3.8 4.9ZM10.833 3.95949C10.7106 3.77557 10.4623 3.72567 10.2784 3.84804C10.0944 3.97041 10.0445 4.21871 10.1669 4.40264C11.4111 6.27268 11.4111 8.72728 10.1669 10.5973C10.0445 10.7813 10.0944 11.0296 10.2784 11.1519C10.4623 11.2743 10.7106 11.2244 10.833 11.0405C12.2558 8.90199 12.2558 6.09798 10.833 3.95949Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/speaker-off.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.72361 1.05279C7.893 1.13749 8 1.31062 8 1.5V13.5C8 13.6894 7.893 13.8625 7.72361 13.9472C7.55421 14.0319 7.35151 14.0136 7.2 13.9L3.33333 11H1.5C0.671573 11 0 10.3284 0 9.5V5.5C0 4.67158 0.671573 4 1.5 4H3.33333L7.2 1.1C7.35151 0.986371 7.55421 0.968093 7.72361 1.05279ZM7 2.5L3.8 4.9C3.71345 4.96491 3.60819 5 3.5 5H1.5C1.22386 5 1 5.22386 1 5.5V9.5C1 9.77614 1.22386 10 1.5 10H3.5C3.60819 10 3.71345 10.0351 3.8 10.1L7 12.5V2.5ZM14.8536 5.14645C15.0488 5.34171 15.0488 5.65829 14.8536 5.85355L13.2071 7.5L14.8536 9.14645C15.0488 9.34171 15.0488 9.65829 14.8536 9.85355C14.6583 10.0488 14.3417 10.0488 14.1464 9.85355L12.5 8.20711L10.8536 9.85355C10.6583 10.0488 10.3417 10.0488 10.1464 9.85355C9.95118 9.65829 9.95118 9.34171 10.1464 9.14645L11.7929 7.5L10.1464 5.85355C9.95118 5.65829 9.95118 5.34171 10.1464 5.14645C10.3417 4.95118 10.6583 4.95118 10.8536 5.14645L12.5 6.79289L14.1464 5.14645C14.3417 4.95118 14.6583 4.95118 14.8536 5.14645Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/speaker-quiet.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8 1.5C8 1.31062 7.893 1.13749 7.72361 1.05279C7.55421 0.968093 7.35151 0.986371 7.2 1.1L3.33333 4H1.5C0.671573 4 0 4.67158 0 5.5V9.5C0 10.3284 0.671573 11 1.5 11H3.33333L7.2 13.9C7.35151 14.0136 7.55421 14.0319 7.72361 13.9472C7.893 13.8625 8 13.6894 8 13.5V1.5ZM3.8 4.9L7 2.5V12.5L3.8 10.1C3.71345 10.0351 3.60819 10 3.5 10H1.5C1.22386 10 1 9.77614 1 9.5V5.5C1 5.22386 1.22386 5 1.5 5H3.5C3.60819 5 3.71345 4.96491 3.8 4.9ZM10.083 5.05577C9.96066 4.87185 9.71235 4.82195 9.52843 4.94432C9.3445 5.06669 9.2946 5.31499 9.41697 5.49892C10.2207 6.70693 10.2207 8.29303 9.41697 9.50104C9.2946 9.68496 9.3445 9.93326 9.52843 10.0556C9.71235 10.178 9.96066 10.1281 10.083 9.94418C11.0653 8.46773 11.0653 6.53222 10.083 5.05577Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/square.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1 1H1.5H13.5H14V1.5V13.5V14H13.5H1.5H1V13.5V1.5V1ZM2 2V13H13V2H2Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/stack.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.75432 1.81954C7.59742 1.72682 7.4025 1.72682 7.24559 1.81954L1.74559 5.06954C1.59336 5.15949 1.49996 5.32317 1.49996 5.5C1.49996 5.67683 1.59336 5.84051 1.74559 5.93046L7.24559 9.18046C7.4025 9.27318 7.59742 9.27318 7.75432 9.18046L13.2543 5.93046C13.4066 5.84051 13.5 5.67683 13.5 5.5C13.5 5.32317 13.4066 5.15949 13.2543 5.06954L7.75432 1.81954ZM7.49996 8.16923L2.9828 5.5L7.49996 2.83077L12.0171 5.5L7.49996 8.16923ZM2.25432 8.31954C2.01658 8.17906 1.70998 8.2579 1.56949 8.49564C1.42901 8.73337 1.50785 9.03998 1.74559 9.18046L7.24559 12.4305C7.4025 12.5232 7.59742 12.5232 7.75432 12.4305L13.2543 9.18046C13.4921 9.03998 13.5709 8.73337 13.4304 8.49564C13.2899 8.2579 12.9833 8.17906 12.7456 8.31954L7.49996 11.4192L2.25432 8.31954Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/star-filled.svg+6−0
@@ -0,0 +1,6 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 d="M7.22303 0.665992C7.32551 0.419604 7.67454 0.419604 7.77702 0.665992L9.41343 4.60039C9.45663 4.70426 9.55432 4.77523 9.66645 4.78422L13.914 5.12475C14.18 5.14607 14.2878 5.47802 14.0852 5.65162L10.849 8.42374C10.7636 8.49692 10.7263 8.61176 10.7524 8.72118L11.7411 12.866C11.803 13.1256 11.5206 13.3308 11.2929 13.1917L7.6564 10.9705C7.5604 10.9119 7.43965 10.9119 7.34365 10.9705L3.70718 13.1917C3.47945 13.3308 3.19708 13.1256 3.25899 12.866L4.24769 8.72118C4.2738 8.61176 4.23648 8.49692 4.15105 8.42374L0.914889 5.65162C0.712228 5.47802 0.820086 5.14607 1.08608 5.12475L5.3336 4.78422C5.44573 4.77523 5.54342 4.70426 5.58662 4.60039L7.22303 0.665992Z"
4 fill="currentColor"
5 />
6</svg>
assets/icons/radix/star.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.97942 1.25171L6.9585 1.30199L5.58662 4.60039C5.54342 4.70426 5.44573 4.77523 5.3336 4.78422L1.7727 5.0697L1.71841 5.07405L1.38687 5.10063L1.08608 5.12475C0.820085 5.14607 0.712228 5.47802 0.914889 5.65162L1.14406 5.84793L1.39666 6.06431L1.43802 6.09974L4.15105 8.42374C4.23648 8.49692 4.2738 8.61176 4.24769 8.72118L3.41882 12.196L3.40618 12.249L3.32901 12.5725L3.25899 12.866C3.19708 13.1256 3.47945 13.3308 3.70718 13.1917L3.9647 13.0344L4.24854 12.861L4.29502 12.8326L7.34365 10.9705C7.43965 10.9119 7.5604 10.9119 7.6564 10.9705L10.705 12.8326L10.7515 12.861L11.0354 13.0344L11.2929 13.1917C11.5206 13.3308 11.803 13.1256 11.7411 12.866L11.671 12.5725L11.5939 12.249L11.5812 12.196L10.7524 8.72118C10.7263 8.61176 10.7636 8.49692 10.849 8.42374L13.562 6.09974L13.6034 6.06431L13.856 5.84793L14.0852 5.65162C14.2878 5.47802 14.18 5.14607 13.914 5.12475L13.6132 5.10063L13.2816 5.07405L13.2274 5.0697L9.66645 4.78422C9.55432 4.77523 9.45663 4.70426 9.41343 4.60039L8.04155 1.30199L8.02064 1.25171L7.89291 0.944609L7.77702 0.665992C7.67454 0.419604 7.32551 0.419604 7.22303 0.665992L7.10715 0.944609L6.97942 1.25171ZM7.50003 2.60397L6.50994 4.98442C6.32273 5.43453 5.89944 5.74207 5.41351 5.78103L2.84361 5.98705L4.8016 7.66428C5.17183 7.98142 5.33351 8.47903 5.2204 8.95321L4.62221 11.461L6.8224 10.1171C7.23842 9.86302 7.76164 9.86302 8.17766 10.1171L10.3778 11.461L9.77965 8.95321C9.66654 8.47903 9.82822 7.98142 10.1984 7.66428L12.1564 5.98705L9.58654 5.78103C9.10061 5.74207 8.67732 5.43453 8.49011 4.98442L7.50003 2.60397Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/stitches-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.84998 7.49998C1.84998 7.21321 1.87134 6.93143 1.91256 6.65615L9.56374 2.23875C9.86311 2.35627 10.15 2.49861 10.4219 2.66322L3.77065 6.50332C3.73669 6.52183 3.70482 6.5449 3.67602 6.57238C3.5911 6.65308 3.54245 6.76286 3.53682 6.87658C3.53359 6.9418 3.54451 7.00831 3.57086 7.07137C3.58927 7.1157 3.6149 7.15742 3.64744 7.19458C3.67306 7.22396 3.702 7.24941 3.73337 7.27069L7.32533 9.83813L3.87232 11.8317C2.63604 10.7953 1.84998 9.23944 1.84998 7.49998ZM8.36843 10.2751C8.37682 10.2706 8.38509 10.2659 8.39322 10.2608L9.84091 9.42499C9.84706 9.42163 9.85314 9.41812 9.85915 9.41446L11.3101 8.57677C11.3655 8.54649 11.4154 8.504 11.4554 8.44995C11.6034 8.25031 11.5616 7.96848 11.362 7.82046L7.82779 5.20017L11.2161 3.24393C12.4013 4.27963 13.15 5.80237 13.15 7.49998C13.15 7.83546 13.1207 8.16411 13.0647 8.48353L5.56875 12.8113C5.26138 12.6995 4.96646 12.5618 4.68662 12.4008L8.36843 10.2751ZM8.18149 9.34383L4.81659 6.93868L5.50918 6.53881L8.80604 8.98324L8.18149 9.34383ZM6.35875 6.04832L6.97822 5.69067L10.2751 8.13506L9.6556 8.49275L6.35875 6.04832ZM8.3318 1.91078L2.24263 5.42636C3.06941 3.33188 5.11164 1.84998 7.49998 1.84998C7.78258 1.84998 8.06033 1.87072 8.3318 1.91078ZM6.84684 13.1126C7.06114 13.1373 7.27908 13.15 7.49998 13.15C9.8246 13.15 11.8213 11.7461 12.6886 9.7399L6.84684 13.1126ZM7.49998 0.849976C3.82728 0.849976 0.849976 3.82728 0.849976 7.49998C0.849976 11.1727 3.82728 14.15 7.49998 14.15C11.1727 14.15 14.15 11.1727 14.15 7.49998C14.15 3.82728 11.1727 0.849976 7.49998 0.849976Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/stop.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 3C2 2.44772 2.44772 2 3 2H12C12.5523 2 13 2.44772 13 3V12C13 12.5523 12.5523 13 12 13H3C2.44772 13 2 12.5523 2 12V3ZM12 3H3V12H12V3Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/stopwatch.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.49998 0.5C5.49998 0.223858 5.72383 0 5.99998 0H7.49998H8.99998C9.27612 0 9.49998 0.223858 9.49998 0.5C9.49998 0.776142 9.27612 1 8.99998 1H7.99998V2.11922C9.09832 2.20409 10.119 2.56622 10.992 3.13572C11.0116 3.10851 11.0336 3.08252 11.058 3.05806L11.858 2.25806C12.1021 2.01398 12.4978 2.01398 12.7419 2.25806C12.986 2.50214 12.986 2.89786 12.7419 3.14194L11.967 3.91682C13.1595 5.07925 13.9 6.70314 13.9 8.49998C13.9 12.0346 11.0346 14.9 7.49998 14.9C3.96535 14.9 1.09998 12.0346 1.09998 8.49998C1.09998 5.13362 3.69904 2.3743 6.99998 2.11922V1H5.99998C5.72383 1 5.49998 0.776142 5.49998 0.5ZM2.09998 8.49998C2.09998 5.51764 4.51764 3.09998 7.49998 3.09998C10.4823 3.09998 12.9 5.51764 12.9 8.49998C12.9 11.4823 10.4823 13.9 7.49998 13.9C4.51764 13.9 2.09998 11.4823 2.09998 8.49998ZM7.99998 4.5C7.99998 4.22386 7.77612 4 7.49998 4C7.22383 4 6.99998 4.22386 6.99998 4.5V9.5C6.99998 9.77614 7.22383 10 7.49998 10C7.77612 10 7.99998 9.77614 7.99998 9.5V4.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/stretch-horizontally.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M14.4999 0.999992C14.2237 0.999992 13.9999 1.22385 13.9999 1.49999L13.9999 5.99995L0.999992 5.99995L0.999992 1.49999C0.999992 1.22385 0.776136 0.999992 0.499996 0.999992C0.223856 0.999992 -9.78509e-09 1.22385 -2.18556e-08 1.49999L4.07279e-07 13.4999C3.95208e-07 13.776 0.223855 13.9999 0.499996 13.9999C0.776136 13.9999 0.999992 13.776 0.999992 13.4999L0.999992 8.99992L13.9999 8.99992L13.9999 13.4999C13.9999 13.776 14.2237 13.9999 14.4999 13.9999C14.776 13.9999 14.9999 13.776 14.9999 13.4999L14.9999 1.49999C14.9999 1.22385 14.776 0.999992 14.4999 0.999992Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/stretch-vertically.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.999878 0.5C0.999878 0.223858 1.22374 0 1.49988 0H13.4999C13.776 0 13.9999 0.223858 13.9999 0.5C13.9999 0.776142 13.776 1 13.4999 1H6H1.49988C1.22374 1 0.999878 0.776142 0.999878 0.5ZM9 14V1L6 1V14H1.49988C1.22374 14 0.999878 14.2239 0.999878 14.5C0.999878 14.7761 1.22374 15 1.49988 15H13.4999C13.776 15 13.9999 14.7761 13.9999 14.5C13.9999 14.2239 13.776 14 13.4999 14H9Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/strikethrough.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.00003 3.25C5.00003 2.97386 4.77617 2.75 4.50003 2.75C4.22389 2.75 4.00003 2.97386 4.00003 3.25V7.10003H2.49998C2.27906 7.10003 2.09998 7.27912 2.09998 7.50003C2.09998 7.72094 2.27906 7.90003 2.49998 7.90003H4.00003V8.55C4.00003 10.483 5.56703 12.05 7.50003 12.05C9.43303 12.05 11 10.483 11 8.55V7.90003H12.5C12.7209 7.90003 12.9 7.72094 12.9 7.50003C12.9 7.27912 12.7209 7.10003 12.5 7.10003H11V3.25C11 2.97386 10.7762 2.75 10.5 2.75C10.2239 2.75 10 2.97386 10 3.25V7.10003H5.00003V3.25ZM5.00003 7.90003V8.55C5.00003 9.93071 6.11932 11.05 7.50003 11.05C8.88074 11.05 10 9.93071 10 8.55V7.90003H5.00003Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/sun.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 0C7.77614 0 8 0.223858 8 0.5V2.5C8 2.77614 7.77614 3 7.5 3C7.22386 3 7 2.77614 7 2.5V0.5C7 0.223858 7.22386 0 7.5 0ZM2.1967 2.1967C2.39196 2.00144 2.70854 2.00144 2.90381 2.1967L4.31802 3.61091C4.51328 3.80617 4.51328 4.12276 4.31802 4.31802C4.12276 4.51328 3.80617 4.51328 3.61091 4.31802L2.1967 2.90381C2.00144 2.70854 2.00144 2.39196 2.1967 2.1967ZM0.5 7C0.223858 7 0 7.22386 0 7.5C0 7.77614 0.223858 8 0.5 8H2.5C2.77614 8 3 7.77614 3 7.5C3 7.22386 2.77614 7 2.5 7H0.5ZM2.1967 12.8033C2.00144 12.608 2.00144 12.2915 2.1967 12.0962L3.61091 10.682C3.80617 10.4867 4.12276 10.4867 4.31802 10.682C4.51328 10.8772 4.51328 11.1938 4.31802 11.3891L2.90381 12.8033C2.70854 12.9986 2.39196 12.9986 2.1967 12.8033ZM12.5 7C12.2239 7 12 7.22386 12 7.5C12 7.77614 12.2239 8 12.5 8H14.5C14.7761 8 15 7.77614 15 7.5C15 7.22386 14.7761 7 14.5 7H12.5ZM10.682 4.31802C10.4867 4.12276 10.4867 3.80617 10.682 3.61091L12.0962 2.1967C12.2915 2.00144 12.608 2.00144 12.8033 2.1967C12.9986 2.39196 12.9986 2.70854 12.8033 2.90381L11.3891 4.31802C11.1938 4.51328 10.8772 4.51328 10.682 4.31802ZM8 12.5C8 12.2239 7.77614 12 7.5 12C7.22386 12 7 12.2239 7 12.5V14.5C7 14.7761 7.22386 15 7.5 15C7.77614 15 8 14.7761 8 14.5V12.5ZM10.682 10.682C10.8772 10.4867 11.1938 10.4867 11.3891 10.682L12.8033 12.0962C12.9986 12.2915 12.9986 12.608 12.8033 12.8033C12.608 12.9986 12.2915 12.9986 12.0962 12.8033L10.682 11.3891C10.4867 11.1938 10.4867 10.8772 10.682 10.682ZM5.5 7.5C5.5 6.39543 6.39543 5.5 7.5 5.5C8.60457 5.5 9.5 6.39543 9.5 7.5C9.5 8.60457 8.60457 9.5 7.5 9.5C6.39543 9.5 5.5 8.60457 5.5 7.5ZM7.5 4.5C5.84315 4.5 4.5 5.84315 4.5 7.5C4.5 9.15685 5.84315 10.5 7.5 10.5C9.15685 10.5 10.5 9.15685 10.5 7.5C10.5 5.84315 9.15685 4.5 7.5 4.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/switch.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M10.5 4C8.567 4 7 5.567 7 7.5C7 9.433 8.567 11 10.5 11C12.433 11 14 9.433 14 7.5C14 5.567 12.433 4 10.5 4ZM7.67133 11C6.65183 10.175 6 8.91363 6 7.5C6 6.08637 6.65183 4.82498 7.67133 4H4.5C2.567 4 1 5.567 1 7.5C1 9.433 2.567 11 4.5 11H7.67133ZM0 7.5C0 5.01472 2.01472 3 4.5 3H10.5C12.9853 3 15 5.01472 15 7.5C15 9.98528 12.9853 12 10.5 12H4.5C2.01472 12 0 9.98528 0 7.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/symbol.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.90321 7.29677C1.90321 10.341 4.11041 12.4147 6.58893 12.8439C6.87255 12.893 7.06266 13.1627 7.01355 13.4464C6.96444 13.73 6.69471 13.9201 6.41109 13.871C3.49942 13.3668 0.86084 10.9127 0.86084 7.29677C0.860839 5.76009 1.55996 4.55245 2.37639 3.63377C2.96124 2.97568 3.63034 2.44135 4.16846 2.03202L2.53205 2.03202C2.25591 2.03202 2.03205 1.80816 2.03205 1.53202C2.03205 1.25588 2.25591 1.03202 2.53205 1.03202L5.53205 1.03202C5.80819 1.03202 6.03205 1.25588 6.03205 1.53202L6.03205 4.53202C6.03205 4.80816 5.80819 5.03202 5.53205 5.03202C5.25591 5.03202 5.03205 4.80816 5.03205 4.53202L5.03205 2.68645L5.03054 2.68759L5.03045 2.68766L5.03044 2.68767L5.03043 2.68767C4.45896 3.11868 3.76059 3.64538 3.15554 4.3262C2.44102 5.13021 1.90321 6.10154 1.90321 7.29677ZM13.0109 7.70321C13.0109 4.69115 10.8505 2.6296 8.40384 2.17029C8.12093 2.11718 7.93465 1.84479 7.98776 1.56188C8.04087 1.27898 8.31326 1.0927 8.59616 1.14581C11.4704 1.68541 14.0532 4.12605 14.0532 7.70321C14.0532 9.23988 13.3541 10.4475 12.5377 11.3662C11.9528 12.0243 11.2837 12.5586 10.7456 12.968L12.3821 12.968C12.6582 12.968 12.8821 13.1918 12.8821 13.468C12.8821 13.7441 12.6582 13.968 12.3821 13.968L9.38205 13.968C9.10591 13.968 8.88205 13.7441 8.88205 13.468L8.88205 10.468C8.88205 10.1918 9.10591 9.96796 9.38205 9.96796C9.65819 9.96796 9.88205 10.1918 9.88205 10.468L9.88205 12.3135L9.88362 12.3123C10.4551 11.8813 11.1535 11.3546 11.7585 10.6738C12.4731 9.86976 13.0109 8.89844 13.0109 7.70321Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/table.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8 2H12.5C12.7761 2 13 2.22386 13 2.5V5H8V2ZM7 5V2H2.5C2.22386 2 2 2.22386 2 2.5V5H7ZM2 6V9H7V6H2ZM8 6H13V9H8V6ZM8 10H13V12.5C13 12.7761 12.7761 13 12.5 13H8V10ZM2 12.5V10H7V13H2.5C2.22386 13 2 12.7761 2 12.5ZM1 2.5C1 1.67157 1.67157 1 2.5 1H12.5C13.3284 1 14 1.67157 14 2.5V12.5C14 13.3284 13.3284 14 12.5 14H2.5C1.67157 14 1 13.3284 1 12.5V2.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/target.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.900024 7.50002C0.900024 3.85495 3.85495 0.900024 7.50002 0.900024C11.1451 0.900024 14.1 3.85495 14.1 7.50002C14.1 11.1451 11.1451 14.1 7.50002 14.1C3.85495 14.1 0.900024 11.1451 0.900024 7.50002ZM7.50002 1.80002C4.35201 1.80002 1.80002 4.35201 1.80002 7.50002C1.80002 10.648 4.35201 13.2 7.50002 13.2C10.648 13.2 13.2 10.648 13.2 7.50002C13.2 4.35201 10.648 1.80002 7.50002 1.80002ZM3.07504 7.50002C3.07504 5.05617 5.05618 3.07502 7.50004 3.07502C9.94388 3.07502 11.925 5.05617 11.925 7.50002C11.925 9.94386 9.94388 11.925 7.50004 11.925C5.05618 11.925 3.07504 9.94386 3.07504 7.50002ZM7.50004 3.92502C5.52562 3.92502 3.92504 5.52561 3.92504 7.50002C3.92504 9.47442 5.52563 11.075 7.50004 11.075C9.47444 11.075 11.075 9.47442 11.075 7.50002C11.075 5.52561 9.47444 3.92502 7.50004 3.92502ZM7.50004 5.25002C6.2574 5.25002 5.25004 6.25739 5.25004 7.50002C5.25004 8.74266 6.2574 9.75002 7.50004 9.75002C8.74267 9.75002 9.75004 8.74266 9.75004 7.50002C9.75004 6.25738 8.74267 5.25002 7.50004 5.25002ZM6.05004 7.50002C6.05004 6.69921 6.69923 6.05002 7.50004 6.05002C8.30084 6.05002 8.95004 6.69921 8.95004 7.50002C8.95004 8.30083 8.30084 8.95002 7.50004 8.95002C6.69923 8.95002 6.05004 8.30083 6.05004 7.50002Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/text-align-bottom.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.89949 5.50002C3.89949 5.27911 3.7204 5.10003 3.49949 5.10003C3.27857 5.10003 3.09949 5.27911 3.09949 5.50002L3.09949 12.5343L1.78233 11.2172C1.62612 11.061 1.37285 11.061 1.21664 11.2172C1.06043 11.3734 1.06043 11.6267 1.21664 11.7829L3.21664 13.7829C3.29166 13.8579 3.3934 13.9 3.49949 13.9C3.60557 13.9 3.70732 13.8579 3.78233 13.7829L5.78233 11.7829C5.93854 11.6267 5.93854 11.3734 5.78233 11.2172C5.62612 11.061 5.37285 11.061 5.21664 11.2172L3.89949 12.5343L3.89949 5.50002ZM8.49998 13C8.22383 13 7.99998 12.7762 7.99998 12.5C7.99998 12.2239 8.22383 12 8.49998 12H14.5C14.7761 12 15 12.2239 15 12.5C15 12.7762 14.7761 13 14.5 13H8.49998ZM8.49998 10C8.22383 10 7.99998 9.77617 7.99998 9.50002C7.99998 9.22388 8.22383 9.00002 8.49998 9.00002H14.5C14.7761 9.00002 15 9.22388 15 9.50002C15 9.77617 14.7761 10 14.5 10H8.49998ZM7.99998 6.50002C7.99998 6.77617 8.22383 7.00002 8.49998 7.00002H14.5C14.7761 7.00002 15 6.77617 15 6.50002C15 6.22388 14.7761 6.00002 14.5 6.00002H8.49998C8.22383 6.00002 7.99998 6.22388 7.99998 6.50002Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/text-align-center.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 4.5C2 4.22386 2.22386 4 2.5 4H12.5C12.7761 4 13 4.22386 13 4.5C13 4.77614 12.7761 5 12.5 5H2.5C2.22386 5 2 4.77614 2 4.5ZM4 7.5C4 7.22386 4.22386 7 4.5 7H10.5C10.7761 7 11 7.22386 11 7.5C11 7.77614 10.7761 8 10.5 8H4.5C4.22386 8 4 7.77614 4 7.5ZM3 10.5C3 10.2239 3.22386 10 3.5 10H11.5C11.7761 10 12 10.2239 12 10.5C12 10.7761 11.7761 11 11.5 11H3.5C3.22386 11 3 10.7761 3 10.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/text-align-justify.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2.5 4C2.22386 4 2 4.22386 2 4.5C2 4.77614 2.22386 5 2.5 5H12.5C12.7761 5 13 4.77614 13 4.5C13 4.22386 12.7761 4 12.5 4H2.5ZM2 7.5C2 7.22386 2.22386 7 2.5 7H12.5C12.7761 7 13 7.22386 13 7.5C13 7.77614 12.7761 8 12.5 8H2.5C2.22386 8 2 7.77614 2 7.5ZM2 10.5C2 10.2239 2.22386 10 2.5 10H12.5C12.7761 10 13 10.2239 13 10.5C13 10.7761 12.7761 11 12.5 11H2.5C2.22386 11 2 10.7761 2 10.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/text-align-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 4.5C2 4.22386 2.22386 4 2.5 4H12.5C12.7761 4 13 4.22386 13 4.5C13 4.77614 12.7761 5 12.5 5H2.5C2.22386 5 2 4.77614 2 4.5ZM2 7.5C2 7.22386 2.22386 7 2.5 7H7.5C7.77614 7 8 7.22386 8 7.5C8 7.77614 7.77614 8 7.5 8H2.5C2.22386 8 2 7.77614 2 7.5ZM2 10.5C2 10.2239 2.22386 10 2.5 10H10.5C10.7761 10 11 10.2239 11 10.5C11 10.7761 10.7761 11 10.5 11H2.5C2.22386 11 2 10.7761 2 10.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/text-align-middle.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.49949 14.9C3.7204 14.9 3.89949 14.7209 3.89949 14.5L3.89949 10.4657L5.21664 11.7829C5.37285 11.9391 5.62612 11.9391 5.78233 11.7829C5.93854 11.6267 5.93854 11.3734 5.78233 11.2172L3.78233 9.21718C3.70732 9.14217 3.60557 9.10002 3.49949 9.10002C3.3934 9.10002 3.29166 9.14217 3.21664 9.21718L1.21664 11.2172C1.06043 11.3734 1.06043 11.6267 1.21664 11.7829C1.37285 11.9391 1.62612 11.9391 1.78233 11.7829L3.09949 10.4657L3.09949 14.5C3.09949 14.7209 3.27857 14.9 3.49949 14.9ZM7.99998 10.5C7.99998 10.7762 8.22383 11 8.49998 11H14.5C14.7761 11 15 10.7762 15 10.5C15 10.2239 14.7761 10 14.5 10H8.49998C8.22383 10 7.99998 10.2239 7.99998 10.5ZM7.99998 7.50002C7.99998 7.77617 8.22383 8.00002 8.49998 8.00002H14.5C14.7761 8.00002 15 7.77617 15 7.50002C15 7.22388 14.7761 7.00002 14.5 7.00002H8.49998C8.22383 7.00002 7.99998 7.22388 7.99998 7.50002ZM8.49998 5.00002C8.22383 5.00002 7.99998 4.77617 7.99998 4.50002C7.99998 4.22388 8.22383 4.00002 8.49998 4.00002H14.5C14.7761 4.00002 15 4.22388 15 4.50002C15 4.77617 14.7761 5.00002 14.5 5.00002H8.49998ZM3.89949 0.500025C3.89949 0.279111 3.7204 0.100025 3.49949 0.100025C3.27857 0.100025 3.09949 0.279111 3.09949 0.500025L3.09949 4.53434L1.78233 3.21718C1.62612 3.06097 1.37285 3.06097 1.21664 3.21718C1.06043 3.37339 1.06043 3.62666 1.21664 3.78287L3.21664 5.78287C3.29166 5.85788 3.3934 5.90002 3.49949 5.90002C3.60557 5.90002 3.70732 5.85788 3.78233 5.78287L5.78233 3.78287C5.93854 3.62666 5.93854 3.37339 5.78233 3.21718C5.62612 3.06097 5.37285 3.06097 5.21664 3.21718L3.89949 4.53434L3.89949 0.500025Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/text-align-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M2 4.5C2 4.22386 2.22386 4 2.5 4H12.5C12.7761 4 13 4.22386 13 4.5C13 4.77614 12.7761 5 12.5 5H2.5C2.22386 5 2 4.77614 2 4.5ZM7 7.5C7 7.22386 7.22386 7 7.5 7H12.5C12.7761 7 13 7.22386 13 7.5C13 7.77614 12.7761 8 12.5 8H7.5C7.22386 8 7 7.77614 7 7.5ZM4 10.5C4 10.2239 4.22386 10 4.5 10H12.5C12.7761 10 13 10.2239 13 10.5C13 10.7761 12.7761 11 12.5 11H4.5C4.22386 11 4 10.7761 4 10.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/text-align-top.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.89949 9.49998C3.89949 9.72089 3.7204 9.89997 3.49949 9.89997C3.27857 9.89997 3.09949 9.72089 3.09949 9.49998L3.09949 2.46566L1.78233 3.78282C1.62612 3.93903 1.37285 3.93903 1.21664 3.78282C1.06043 3.62661 1.06043 3.37334 1.21664 3.21713L3.21664 1.21713C3.29166 1.14212 3.3934 1.09998 3.49949 1.09998C3.60557 1.09998 3.70732 1.14212 3.78233 1.21713L5.78233 3.21713C5.93854 3.37334 5.93854 3.62661 5.78233 3.78282C5.62612 3.93903 5.37285 3.93903 5.21664 3.78282L3.89949 2.46566L3.89949 9.49998ZM8.49998 1.99998C8.22383 1.99998 7.99998 2.22383 7.99998 2.49998C7.99998 2.77612 8.22383 2.99998 8.49998 2.99998H14.5C14.7761 2.99998 15 2.77612 15 2.49998C15 2.22383 14.7761 1.99998 14.5 1.99998H8.49998ZM8.49998 4.99998C8.22383 4.99998 7.99998 5.22383 7.99998 5.49998C7.99998 5.77612 8.22383 5.99998 8.49998 5.99998H14.5C14.7761 5.99998 15 5.77612 15 5.49998C15 5.22383 14.7761 4.99998 14.5 4.99998H8.49998ZM7.99998 8.49998C7.99998 8.22383 8.22383 7.99998 8.49998 7.99998H14.5C14.7761 7.99998 15 8.22383 15 8.49998C15 8.77612 14.7761 8.99998 14.5 8.99998H8.49998C8.22383 8.99998 7.99998 8.77612 7.99998 8.49998Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/text-none.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.3536 2.35355C13.5488 2.15829 13.5488 1.84171 13.3536 1.64645C13.1583 1.45118 12.8417 1.45118 12.6464 1.64645L11.9291 2.36383C11.9159 2.32246 11.897 2.28368 11.8732 2.24845C11.7923 2.12875 11.6554 2.05005 11.5001 2.05005H3.50005C3.29909 2.05005 3.1289 2.18178 3.07111 2.3636C3.05743 2.40665 3.05005 2.45249 3.05005 2.50007V4.50001C3.05005 4.74854 3.25152 4.95001 3.50005 4.95001C3.74858 4.95001 3.95005 4.74854 3.95005 4.50001V2.95005H6.95006V7.34284L1.64645 12.6464C1.45118 12.8417 1.45118 13.1583 1.64645 13.3536C1.84171 13.5488 2.15829 13.5488 2.35355 13.3536L6.95006 8.75705V12.0501H5.7544C5.50587 12.0501 5.3044 12.2515 5.3044 12.5001C5.3044 12.7486 5.50587 12.9501 5.7544 12.9501H9.2544C9.50293 12.9501 9.7044 12.7486 9.7044 12.5001C9.7044 12.2515 9.50293 12.0501 9.2544 12.0501H8.05006V7.65705L13.3536 2.35355ZM8.05006 6.24284L11.0501 3.24283V2.95005H8.05006V6.24284Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/text.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M3.94993 2.95002L3.94993 4.49998C3.94993 4.74851 3.74845 4.94998 3.49993 4.94998C3.2514 4.94998 3.04993 4.74851 3.04993 4.49998V2.50004C3.04993 2.45246 3.05731 2.40661 3.07099 2.36357C3.12878 2.18175 3.29897 2.05002 3.49993 2.05002H11.4999C11.6553 2.05002 11.7922 2.12872 11.8731 2.24842C11.9216 2.32024 11.9499 2.40682 11.9499 2.50002L11.9499 2.50004V4.49998C11.9499 4.74851 11.7485 4.94998 11.4999 4.94998C11.2514 4.94998 11.0499 4.74851 11.0499 4.49998V2.95002H8.04993V12.05H9.25428C9.50281 12.05 9.70428 12.2515 9.70428 12.5C9.70428 12.7486 9.50281 12.95 9.25428 12.95H5.75428C5.50575 12.95 5.30428 12.7486 5.30428 12.5C5.30428 12.2515 5.50575 12.05 5.75428 12.05H6.94993V2.95002H3.94993Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/thick-arrow-down.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5 3.5C5 3.22386 5.22386 3 5.5 3H9.5C9.77614 3 10 3.22386 10 3.5V6H12.5C12.6873 6 12.8589 6.10467 12.9446 6.27121C13.0303 6.43774 13.0157 6.63821 12.9069 6.79062L7.90687 13.7906C7.81301 13.922 7.66148 14 7.5 14C7.33853 14 7.18699 13.922 7.09314 13.7906L2.09314 6.79062C1.98427 6.63821 1.96972 6.43774 2.05542 6.27121C2.14112 6.10467 2.31271 6 2.5 6H5V3.5ZM6 4V6.5C6 6.77614 5.77614 7 5.5 7H3.4716L7.5 12.6398L11.5284 7H9.5C9.22386 7 9 6.77614 9 6.5V4H6Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/thick-arrow-left.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1 7.5C1 7.66148 1.07798 7.81301 1.20938 7.90687L8.20938 12.9069C8.36179 13.0157 8.56226 13.0303 8.72879 12.9446C8.89533 12.8589 9 12.6873 9 12.5L9 10L11.5 10C11.7761 10 12 9.77614 12 9.5L12 5.5C12 5.22386 11.7761 5 11.5 5L9 5L9 2.5C9 2.31271 8.89533 2.14112 8.72879 2.05542C8.56226 1.96972 8.36179 1.98427 8.20938 2.09313L1.20938 7.09314C1.07798 7.18699 1 7.33853 1 7.5ZM8 3.4716L8 5.5C8 5.77614 8.22386 6 8.5 6L11 6L11 9L8.5 9C8.22386 9 8 9.22386 8 9.5L8 11.5284L2.36023 7.5L8 3.4716Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/thick-arrow-right.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M14 7.5C14 7.66148 13.922 7.81301 13.7906 7.90687L6.79062 12.9069C6.63821 13.0157 6.43774 13.0303 6.27121 12.9446C6.10467 12.8589 6 12.6873 6 12.5L6 10L3.5 10C3.22386 10 3 9.77614 3 9.5L3 5.5C3 5.22386 3.22386 5 3.5 5L6 5L6 2.5C6 2.31271 6.10467 2.14112 6.27121 2.05542C6.43774 1.96972 6.63821 1.98427 6.79062 2.09313L13.7906 7.09314C13.922 7.18699 14 7.33853 14 7.5ZM7 3.4716L7 5.5C7 5.77614 6.77614 6 6.5 6L4 6L4 9L6.5 9C6.77614 9 7 9.22386 7 9.5L7 11.5284L12.6398 7.5L7 3.4716Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/thick-arrow-up.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.5 1C7.66148 1 7.81301 1.07798 7.90687 1.20938L12.9069 8.20938C13.0157 8.36179 13.0303 8.56226 12.9446 8.72879C12.8589 8.89533 12.6873 9 12.5 9H10V11.5C10 11.7761 9.77614 12 9.5 12H5.5C5.22386 12 5 11.7761 5 11.5V9H2.5C2.31271 9 2.14112 8.89533 2.05542 8.72879C1.96972 8.56226 1.98427 8.36179 2.09314 8.20938L7.09314 1.20938C7.18699 1.07798 7.33853 1 7.5 1ZM3.4716 8H5.5C5.77614 8 6 8.22386 6 8.5V11H9V8.5C9 8.22386 9.22386 8 9.5 8H11.5284L7.5 2.36023L3.4716 8Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/timer.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49998 0.849976C7.22383 0.849976 6.99998 1.07383 6.99998 1.34998V3.52234C6.99998 3.79848 7.22383 4.02234 7.49998 4.02234C7.77612 4.02234 7.99998 3.79848 7.99998 3.52234V1.8718C10.8862 2.12488 13.15 4.54806 13.15 7.49998C13.15 10.6204 10.6204 13.15 7.49998 13.15C4.37957 13.15 1.84998 10.6204 1.84998 7.49998C1.84998 6.10612 2.35407 4.83128 3.19049 3.8459C3.36919 3.63538 3.34339 3.31985 3.13286 3.14115C2.92234 2.96245 2.60681 2.98825 2.42811 3.19877C1.44405 4.35808 0.849976 5.86029 0.849976 7.49998C0.849976 11.1727 3.82728 14.15 7.49998 14.15C11.1727 14.15 14.15 11.1727 14.15 7.49998C14.15 3.82728 11.1727 0.849976 7.49998 0.849976ZM6.74049 8.08072L4.22363 4.57237C4.15231 4.47295 4.16346 4.33652 4.24998 4.25C4.33649 4.16348 4.47293 4.15233 4.57234 4.22365L8.08069 6.74051C8.56227 7.08599 8.61906 7.78091 8.19998 8.2C7.78089 8.61909 7.08597 8.56229 6.74049 8.08072Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/tokens.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.5 2C3.11929 2 2 3.11929 2 4.5C2 5.88072 3.11929 7 4.5 7C5.88072 7 7 5.88072 7 4.5C7 3.11929 5.88072 2 4.5 2ZM3 4.5C3 3.67157 3.67157 3 4.5 3C5.32843 3 6 3.67157 6 4.5C6 5.32843 5.32843 6 4.5 6C3.67157 6 3 5.32843 3 4.5ZM10.5 2C9.11929 2 8 3.11929 8 4.5C8 5.88072 9.11929 7 10.5 7C11.8807 7 13 5.88072 13 4.5C13 3.11929 11.8807 2 10.5 2ZM9 4.5C9 3.67157 9.67157 3 10.5 3C11.3284 3 12 3.67157 12 4.5C12 5.32843 11.3284 6 10.5 6C9.67157 6 9 5.32843 9 4.5ZM2 10.5C2 9.11929 3.11929 8 4.5 8C5.88072 8 7 9.11929 7 10.5C7 11.8807 5.88072 13 4.5 13C3.11929 13 2 11.8807 2 10.5ZM4.5 9C3.67157 9 3 9.67157 3 10.5C3 11.3284 3.67157 12 4.5 12C5.32843 12 6 11.3284 6 10.5C6 9.67157 5.32843 9 4.5 9ZM10.5 8C9.11929 8 8 9.11929 8 10.5C8 11.8807 9.11929 13 10.5 13C11.8807 13 13 11.8807 13 10.5C13 9.11929 11.8807 8 10.5 8ZM9 10.5C9 9.67157 9.67157 9 10.5 9C11.3284 9 12 9.67157 12 10.5C12 11.3284 11.3284 12 10.5 12C9.67157 12 9 11.3284 9 10.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/track-next.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M13.0502 2.74989C13.0502 2.44613 12.804 2.19989 12.5002 2.19989C12.1965 2.19989 11.9502 2.44613 11.9502 2.74989V7.2825C11.9046 7.18802 11.8295 7.10851 11.7334 7.05776L2.73338 2.30776C2.5784 2.22596 2.3919 2.23127 2.24182 2.32176C2.09175 2.41225 2 2.57471 2 2.74995V12.25C2 12.4252 2.09175 12.5877 2.24182 12.6781C2.3919 12.7686 2.5784 12.7739 2.73338 12.6921L11.7334 7.94214C11.8295 7.89139 11.9046 7.81188 11.9502 7.7174V12.2499C11.9502 12.5536 12.1965 12.7999 12.5002 12.7999C12.804 12.7999 13.0502 12.5536 13.0502 12.2499V2.74989ZM3 11.4207V3.5792L10.4288 7.49995L3 11.4207Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/track-previous.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.94976 2.74989C1.94976 2.44613 2.196 2.19989 2.49976 2.19989C2.80351 2.19989 3.04976 2.44613 3.04976 2.74989V7.2825C3.0954 7.18802 3.17046 7.10851 3.26662 7.05776L12.2666 2.30776C12.4216 2.22596 12.6081 2.23127 12.7582 2.32176C12.9083 2.41225 13 2.57471 13 2.74995V12.25C13 12.4252 12.9083 12.5877 12.7582 12.6781C12.6081 12.7686 12.4216 12.7739 12.2666 12.6921L3.26662 7.94214C3.17046 7.89139 3.0954 7.81188 3.04976 7.7174V12.2499C3.04976 12.5536 2.80351 12.7999 2.49976 12.7999C2.196 12.7999 1.94976 12.5536 1.94976 12.2499V2.74989ZM4.57122 7.49995L12 11.4207V3.5792L4.57122 7.49995Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/transform.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.849976 1.74998C0.849976 1.25292 1.25292 0.849976 1.74998 0.849976H3.24998C3.74703 0.849976 4.14998 1.25292 4.14998 1.74998V2.04998H10.85V1.74998C10.85 1.25292 11.2529 0.849976 11.75 0.849976H13.25C13.747 0.849976 14.15 1.25292 14.15 1.74998V3.24998C14.15 3.74703 13.747 4.14998 13.25 4.14998H12.95V10.85H13.25C13.747 10.85 14.15 11.2529 14.15 11.75V13.25C14.15 13.747 13.747 14.15 13.25 14.15H11.75C11.2529 14.15 10.85 13.747 10.85 13.25V12.95H4.14998V13.25C4.14998 13.747 3.74703 14.15 3.24998 14.15H1.74998C1.25292 14.15 0.849976 13.747 0.849976 13.25V11.75C0.849976 11.2529 1.25292 10.85 1.74998 10.85H2.04998V4.14998H1.74998C1.25292 4.14998 0.849976 3.74703 0.849976 3.24998V1.74998ZM2.94998 4.14998V10.85H3.24998C3.74703 10.85 4.14998 11.2529 4.14998 11.75V12.05H10.85V11.75C10.85 11.2529 11.2529 10.85 11.75 10.85H12.05V4.14998H11.75C11.2529 4.14998 10.85 3.74703 10.85 3.24998V2.94998H4.14998V3.24998C4.14998 3.74703 3.74703 4.14998 3.24998 4.14998H2.94998ZM2.34998 1.74998H1.74998V2.34998V2.64998V3.24998H2.34998H2.64998H3.24998V2.64998V2.34998V1.74998H2.64998H2.34998ZM5.09998 5.99998C5.09998 5.50292 5.50292 5.09998 5.99998 5.09998H6.99998C7.49703 5.09998 7.89998 5.50292 7.89998 5.99998V6.99998C7.89998 7.03591 7.89787 7.07134 7.89378 7.10618C7.92861 7.10208 7.96405 7.09998 7.99998 7.09998H8.99998C9.49703 7.09998 9.89998 7.50292 9.89998 7.99998V8.99998C9.89998 9.49703 9.49703 9.89998 8.99998 9.89998H7.99998C7.50292 9.89998 7.09998 9.49703 7.09998 8.99998V7.99998C7.09998 7.96405 7.10208 7.92861 7.10618 7.89378C7.07134 7.89787 7.03591 7.89998 6.99998 7.89998H5.99998C5.50292 7.89998 5.09998 7.49703 5.09998 6.99998V5.99998ZM6.09998 5.99998H5.99998V6.09998V6.89998V6.99998H6.09998H6.89998H6.99998V6.89998V6.09998V5.99998H6.89998H6.09998ZM7.99998 7.99998H8.09998H8.89998H8.99998V8.09998V8.89998V8.99998H8.89998H8.09998H7.99998V8.89998V8.09998V7.99998ZM2.64998 11.75H2.34998H1.74998V12.35V12.65V13.25H2.34998H2.64998H3.24998V12.65V12.35V11.75H2.64998ZM11.75 1.74998H12.35H12.65H13.25V2.34998V2.64998V3.24998H12.65H12.35H11.75V2.64998V2.34998V1.74998ZM12.65 11.75H12.35H11.75V12.35V12.65V13.25H12.35H12.65H13.25V12.65V12.35V11.75H12.65Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/transparency-grid.svg+9−0
@@ -0,0 +1,9 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 opacity=".25"
4 fill-rule="evenodd"
5 clip-rule="evenodd"
6 d="M0 0H3V3H0V0ZM6 3H3V6H0V9H3V12H0V15H3V12H6V15H9V12H12V15H15V12H12V9H15V6H12V3H15V0H12V3H9V0H6V3ZM6 6V3H9V6H6ZM6 9H3V6H6V9ZM9 9V6H12V9H9ZM9 9H6V12H9V9Z"
7 fill="currentColor"
8 />
9</svg>
assets/icons/radix/trash.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.5 1C5.22386 1 5 1.22386 5 1.5C5 1.77614 5.22386 2 5.5 2H9.5C9.77614 2 10 1.77614 10 1.5C10 1.22386 9.77614 1 9.5 1H5.5ZM3 3.5C3 3.22386 3.22386 3 3.5 3H5H10H11.5C11.7761 3 12 3.22386 12 3.5C12 3.77614 11.7761 4 11.5 4H11V12C11 12.5523 10.5523 13 10 13H5C4.44772 13 4 12.5523 4 12V4L3.5 4C3.22386 4 3 3.77614 3 3.5ZM5 4H10V12H5V4Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/triangle-down.svg+3−0
@@ -0,0 +1,3 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path d="M4 6H11L7.5 10.5L4 6Z" fill="currentColor" />
3</svg>
assets/icons/radix/triangle-left.svg+3−0
@@ -0,0 +1,3 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path d="M9 4L9 11L4.5 7.5L9 4Z" fill="currentColor" />
3</svg>
assets/icons/radix/triangle-right.svg+3−0
@@ -0,0 +1,3 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path d="M6 11L6 4L10.5 7.5L6 11Z" fill="currentColor" />
3</svg>
assets/icons/radix/triangle-up.svg+3−0
@@ -0,0 +1,3 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path d="M4 9H11L7.5 4.5L4 9Z" fill="currentColor" />
3</svg>
assets/icons/radix/twitter-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.23336 4.69629C7.23336 2.96884 8.63335 1.56857 10.36 1.56857C11.3736 1.56857 12.183 2.04804 12.7254 2.74385C13.3079 2.62467 13.8557 2.40913 14.3513 2.11508C14.1559 2.72598 13.7424 3.2396 13.2033 3.56463C13.2038 3.56568 13.2042 3.56674 13.2047 3.56779C13.7334 3.50361 14.2364 3.36302 14.7048 3.15546L14.7037 3.15715C14.3667 3.66183 13.9431 4.10736 13.4561 4.47034C13.4823 4.64672 13.4956 4.82427 13.4956 5.00079C13.4956 8.6871 10.6873 12.9746 5.52122 12.9746C3.93906 12.9746 2.46544 12.511 1.22505 11.7152C0.992632 11.5661 0.925108 11.2568 1.07423 11.0244C1.0874 11.0038 1.10183 10.9846 1.11734 10.9666C1.20582 10.8202 1.37438 10.7309 1.5554 10.7522C2.47066 10.8601 3.38568 10.7485 4.19219 10.3962C3.39226 10.0434 2.77129 9.35975 2.50204 8.51974C2.45359 8.3686 2.48835 8.20311 2.59351 8.08422C2.59716 8.0801 2.60087 8.07606 2.60464 8.0721C1.96391 7.50819 1.55973 6.68208 1.55973 5.76143V5.72759C1.55973 5.56814 1.64411 5.42059 1.78155 5.33974C1.82671 5.31317 1.87537 5.29511 1.92532 5.28558C1.70549 4.86154 1.58116 4.37984 1.58116 3.86958C1.58116 3.40165 1.58384 2.81192 1.91332 2.28081C1.98718 2.16175 2.10758 2.08915 2.2364 2.07195C2.42588 2.01237 2.64087 2.06969 2.77406 2.23302C3.86536 3.57126 5.44066 4.49583 7.23366 4.73961L7.23336 4.69629ZM5.52122 11.9746C4.73387 11.9746 3.97781 11.8435 3.27248 11.6023C4.13012 11.4538 4.95307 11.1159 5.66218 10.5602C5.81211 10.4427 5.87182 10.2435 5.81126 10.0629C5.7507 9.88234 5.583 9.75943 5.39255 9.75607C4.68968 9.74366 4.06712 9.39716 3.67793 8.86845C3.86828 8.85306 4.05428 8.82039 4.23445 8.77167C4.43603 8.71716 4.57363 8.53114 4.56674 8.32243C4.55985 8.11372 4.41029 7.93718 4.20555 7.89607C3.42694 7.73977 2.79883 7.16764 2.56169 6.42174C2.76255 6.47025 2.97102 6.4991 3.18482 6.5061C3.38563 6.51267 3.56646 6.38533 3.62795 6.19405C3.68943 6.00277 3.61666 5.79391 3.44963 5.68224C2.86523 5.29155 2.48116 4.62464 2.48116 3.86958C2.48116 3.70213 2.48352 3.55268 2.49355 3.41719C3.85115 4.79913 5.70873 5.68931 7.77588 5.79338C7.93225 5.80126 8.08328 5.73543 8.18395 5.61553C8.28463 5.49562 8.32332 5.33548 8.28851 5.18284C8.25255 5.02517 8.23336 4.86284 8.23336 4.69629C8.23336 3.52085 9.18591 2.56857 10.36 2.56857C11.5943 2.56857 12.4956 3.71208 12.4956 5.00079C12.4956 8.25709 10.0202 11.9746 5.52122 11.9746Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/underline.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M5.00001 2.75C5.00001 2.47386 4.77615 2.25 4.50001 2.25C4.22387 2.25 4.00001 2.47386 4.00001 2.75V8.05C4.00001 9.983 5.56702 11.55 7.50001 11.55C9.43301 11.55 11 9.983 11 8.05V2.75C11 2.47386 10.7762 2.25 10.5 2.25C10.2239 2.25 10 2.47386 10 2.75V8.05C10 9.43071 8.88072 10.55 7.50001 10.55C6.1193 10.55 5.00001 9.43071 5.00001 8.05V2.75ZM3.49998 13.1001C3.27906 13.1001 3.09998 13.2791 3.09998 13.5001C3.09998 13.721 3.27906 13.9001 3.49998 13.9001H11.5C11.7209 13.9001 11.9 13.721 11.9 13.5001C11.9 13.2791 11.7209 13.1001 11.5 13.1001H3.49998Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/update.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.90321 7.29677C1.90321 10.341 4.11041 12.4147 6.58893 12.8439C6.87255 12.893 7.06266 13.1627 7.01355 13.4464C6.96444 13.73 6.69471 13.9201 6.41109 13.871C3.49942 13.3668 0.86084 10.9127 0.86084 7.29677C0.860839 5.76009 1.55996 4.55245 2.37639 3.63377C2.96124 2.97568 3.63034 2.44135 4.16846 2.03202L2.53205 2.03202C2.25591 2.03202 2.03205 1.80816 2.03205 1.53202C2.03205 1.25588 2.25591 1.03202 2.53205 1.03202L5.53205 1.03202C5.80819 1.03202 6.03205 1.25588 6.03205 1.53202L6.03205 4.53202C6.03205 4.80816 5.80819 5.03202 5.53205 5.03202C5.25591 5.03202 5.03205 4.80816 5.03205 4.53202L5.03205 2.68645L5.03054 2.68759L5.03045 2.68766L5.03044 2.68767L5.03043 2.68767C4.45896 3.11868 3.76059 3.64538 3.15554 4.3262C2.44102 5.13021 1.90321 6.10154 1.90321 7.29677ZM13.0109 7.70321C13.0109 4.69115 10.8505 2.6296 8.40384 2.17029C8.12093 2.11718 7.93465 1.84479 7.98776 1.56188C8.04087 1.27898 8.31326 1.0927 8.59616 1.14581C11.4704 1.68541 14.0532 4.12605 14.0532 7.70321C14.0532 9.23988 13.3541 10.4475 12.5377 11.3662C11.9528 12.0243 11.2837 12.5586 10.7456 12.968L12.3821 12.968C12.6582 12.968 12.8821 13.1918 12.8821 13.468C12.8821 13.7441 12.6582 13.968 12.3821 13.968L9.38205 13.968C9.10591 13.968 8.88205 13.7441 8.88205 13.468L8.88205 10.468C8.88205 10.1918 9.10591 9.96796 9.38205 9.96796C9.65819 9.96796 9.88205 10.1918 9.88205 10.468L9.88205 12.3135L9.88362 12.3123C10.4551 11.8813 11.1535 11.3546 11.7585 10.6738C12.4731 9.86976 13.0109 8.89844 13.0109 7.70321Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/upload.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.81825 1.18188C7.64251 1.00615 7.35759 1.00615 7.18185 1.18188L4.18185 4.18188C4.00611 4.35762 4.00611 4.64254 4.18185 4.81828C4.35759 4.99401 4.64251 4.99401 4.81825 4.81828L7.05005 2.58648V9.49996C7.05005 9.74849 7.25152 9.94996 7.50005 9.94996C7.74858 9.94996 7.95005 9.74849 7.95005 9.49996V2.58648L10.1819 4.81828C10.3576 4.99401 10.6425 4.99401 10.8182 4.81828C10.994 4.64254 10.994 4.35762 10.8182 4.18188L7.81825 1.18188ZM2.5 9.99997C2.77614 9.99997 3 10.2238 3 10.5V12C3 12.5538 3.44565 13 3.99635 13H11.0012C11.5529 13 12 12.5528 12 12V10.5C12 10.2238 12.2239 9.99997 12.5 9.99997C12.7761 9.99997 13 10.2238 13 10.5V12C13 13.104 12.1062 14 11.0012 14H3.99635C2.89019 14 2 13.103 2 12V10.5C2 10.2238 2.22386 9.99997 2.5 9.99997Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/value-none.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49985 0.877045C3.84216 0.877045 0.877014 3.84219 0.877014 7.49988C0.877014 9.1488 1.47963 10.657 2.47665 11.8162L1.64643 12.6464C1.45117 12.8417 1.45117 13.1583 1.64643 13.3535C1.8417 13.5488 2.15828 13.5488 2.35354 13.3535L3.18377 12.5233C4.34296 13.5202 5.85104 14.1227 7.49985 14.1227C11.1575 14.1227 14.1227 11.1575 14.1227 7.49988C14.1227 5.85107 13.5202 4.34299 12.5233 3.1838L13.3535 2.35354C13.5488 2.15827 13.5488 1.84169 13.3535 1.64643C13.1583 1.45117 12.8417 1.45117 12.6464 1.64643L11.8162 2.47668C10.657 1.47966 9.14877 0.877045 7.49985 0.877045ZM11.1422 3.15066C10.1567 2.32449 8.88639 1.82704 7.49985 1.82704C4.36683 1.82704 1.82701 4.36686 1.82701 7.49988C1.82701 8.88642 2.32446 10.1568 3.15063 11.1422L11.1422 3.15066ZM3.85776 11.8493C4.84317 12.6753 6.11343 13.1727 7.49985 13.1727C10.6328 13.1727 13.1727 10.6329 13.1727 7.49988C13.1727 6.11346 12.6753 4.8432 11.8493 3.85779L3.85776 11.8493Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/value.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M0.877075 7.49988C0.877075 3.84219 3.84222 0.877045 7.49991 0.877045C11.1576 0.877045 14.1227 3.84219 14.1227 7.49988C14.1227 11.1575 11.1576 14.1227 7.49991 14.1227C3.84222 14.1227 0.877075 11.1575 0.877075 7.49988ZM7.49991 1.82704C4.36689 1.82704 1.82708 4.36686 1.82708 7.49988C1.82708 10.6329 4.36689 13.1727 7.49991 13.1727C10.6329 13.1727 13.1727 10.6329 13.1727 7.49988C13.1727 4.36686 10.6329 1.82704 7.49991 1.82704Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/vercel-logo.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7.49998 1L6.92321 2.00307L1.17498 12L0.599976 13H1.7535H13.2464H14.4L13.825 12L8.07674 2.00307L7.49998 1ZM7.49998 3.00613L2.3285 12H12.6714L7.49998 3.00613Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/video.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.76447 3.12199C5.63151 3.04859 6.56082 3 7.5 3C8.43918 3 9.36849 3.04859 10.2355 3.12199C11.2796 3.21037 11.9553 3.27008 12.472 3.39203C12.9425 3.50304 13.2048 3.64976 13.4306 3.88086C13.4553 3.90618 13.4902 3.94414 13.5133 3.97092C13.7126 4.20149 13.8435 4.4887 13.918 5.03283C13.9978 5.6156 14 6.37644 14 7.52493C14 8.66026 13.9978 9.41019 13.9181 9.98538C13.8439 10.5206 13.7137 10.8061 13.5125 11.0387C13.4896 11.0651 13.4541 11.1038 13.4296 11.1287C13.2009 11.3625 12.9406 11.5076 12.4818 11.6164C11.9752 11.7365 11.3143 11.7942 10.2878 11.8797C9.41948 11.9521 8.47566 12 7.5 12C6.52434 12 5.58052 11.9521 4.7122 11.8797C3.68572 11.7942 3.02477 11.7365 2.51816 11.6164C2.05936 11.5076 1.7991 11.3625 1.57037 11.1287C1.54593 11.1038 1.51035 11.0651 1.48748 11.0387C1.28628 10.8061 1.15612 10.5206 1.08193 9.98538C1.00221 9.41019 1 8.66026 1 7.52493C1 6.37644 1.00216 5.6156 1.082 5.03283C1.15654 4.4887 1.28744 4.20149 1.48666 3.97092C1.5098 3.94414 1.54468 3.90618 1.56942 3.88086C1.7952 3.64976 2.05752 3.50304 2.52796 3.39203C3.04473 3.27008 3.7204 3.21037 4.76447 3.12199ZM0 7.52493C0 5.28296 0 4.16198 0.729985 3.31713C0.766457 3.27491 0.815139 3.22194 0.854123 3.18204C1.63439 2.38339 2.64963 2.29744 4.68012 2.12555C5.56923 2.05028 6.52724 2 7.5 2C8.47276 2 9.43077 2.05028 10.3199 2.12555C12.3504 2.29744 13.3656 2.38339 14.1459 3.18204C14.1849 3.22194 14.2335 3.27491 14.27 3.31713C15 4.16198 15 5.28296 15 7.52493C15 9.74012 15 10.8477 14.2688 11.6929C14.2326 11.7348 14.1832 11.7885 14.1444 11.8281C13.3629 12.6269 12.3655 12.71 10.3709 12.8763C9.47971 12.9505 8.50782 13 7.5 13C6.49218 13 5.52028 12.9505 4.62915 12.8763C2.63446 12.71 1.63712 12.6269 0.855558 11.8281C0.816844 11.7885 0.767442 11.7348 0.731221 11.6929C0 10.8477 0 9.74012 0 7.52493ZM5.25 5.38264C5.25 5.20225 5.43522 5.08124 5.60041 5.15369L10.428 7.27105C10.6274 7.35853 10.6274 7.64147 10.428 7.72895L5.60041 9.84631C5.43522 9.91876 5.25 9.79775 5.25 9.61736V5.38264Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/view-grid.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M7 2H1.5C1.22386 2 1 2.22386 1 2.5V7H7V2ZM8 2V7H14V2.5C14 2.22386 13.7761 2 13.5 2H8ZM7 8H1V12.5C1 12.7761 1.22386 13 1.5 13H7V8ZM8 13V8H14V12.5C14 12.7761 13.7761 13 13.5 13H8ZM1.5 1C0.671573 1 0 1.67157 0 2.5V12.5C0 13.3284 0.671573 14 1.5 14H13.5C14.3284 14 15 13.3284 15 12.5V2.5C15 1.67157 14.3284 1 13.5 1H1.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/view-horizontal.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M1.5 2H13.5C13.7761 2 14 2.22386 14 2.5V7H1V2.5C1 2.22386 1.22386 2 1.5 2ZM1 8V12.5C1 12.7761 1.22386 13 1.5 13H13.5C13.7761 13 14 12.7761 14 12.5V8H1ZM0 2.5C0 1.67157 0.671573 1 1.5 1H13.5C14.3284 1 15 1.67157 15 2.5V12.5C15 13.3284 14.3284 14 13.5 14H1.5C0.671573 14 0 13.3284 0 12.5V2.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/view-none.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M14 2.58711L1.85163 13H13.5C13.7761 13 14 12.7761 14 12.5V2.58711ZM0.762879 13.8067L0.825396 13.8796L0.854717 13.8545C1.05017 13.9478 1.26899 14 1.5 14H13.5C14.3284 14 15 13.3284 15 12.5V2.5C15 1.93949 14.6926 1.45078 14.2371 1.19331L14.1746 1.12037L14.1453 1.1455C13.9498 1.05222 13.731 1 13.5 1H1.5C0.671573 1 0 1.67157 0 2.5V12.5C0 13.0605 0.307435 13.5492 0.762879 13.8067ZM1 12.4129L13.1484 2H1.5C1.22386 2 1 2.22386 1 2.5V12.4129Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/view-vertical.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M8 2H13.5C13.7761 2 14 2.22386 14 2.5V12.5C14 12.7761 13.7761 13 13.5 13H8V2ZM7 2H1.5C1.22386 2 1 2.22386 1 2.5V12.5C1 12.7761 1.22386 13 1.5 13H7V2ZM0 2.5C0 1.67157 0.671573 1 1.5 1H13.5C14.3284 1 15 1.67157 15 2.5V12.5C15 13.3284 14.3284 14 13.5 14H1.5C0.671573 14 0 13.3284 0 12.5V2.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/width.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M4.81812 4.68161C4.99386 4.85734 4.99386 5.14227 4.81812 5.318L3.08632 7.0498H11.9135L10.1817 5.318C10.006 5.14227 10.006 4.85734 10.1817 4.68161C10.3575 4.50587 10.6424 4.50587 10.8181 4.68161L13.3181 7.18161C13.4939 7.35734 13.4939 7.64227 13.3181 7.818L10.8181 10.318C10.6424 10.4937 10.3575 10.4937 10.1817 10.318C10.006 10.1423 10.006 9.85734 10.1817 9.68161L11.9135 7.9498H3.08632L4.81812 9.68161C4.99386 9.85734 4.99386 10.1423 4.81812 10.318C4.64239 10.4937 4.35746 10.4937 4.18173 10.318L1.68173 7.818C1.50599 7.64227 1.50599 7.35734 1.68173 7.18161L4.18173 4.68161C4.35746 4.50587 4.64239 4.50587 4.81812 4.68161Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/zoom-in.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M10 6.5C10 8.433 8.433 10 6.5 10C4.567 10 3 8.433 3 6.5C3 4.567 4.567 3 6.5 3C8.433 3 10 4.567 10 6.5ZM9.30884 10.0159C8.53901 10.6318 7.56251 11 6.5 11C4.01472 11 2 8.98528 2 6.5C2 4.01472 4.01472 2 6.5 2C8.98528 2 11 4.01472 11 6.5C11 7.56251 10.6318 8.53901 10.0159 9.30884L12.8536 12.1464C13.0488 12.3417 13.0488 12.6583 12.8536 12.8536C12.6583 13.0488 12.3417 13.0488 12.1464 12.8536L9.30884 10.0159ZM4.25 6.5C4.25 6.22386 4.47386 6 4.75 6H6V4.75C6 4.47386 6.22386 4.25 6.5 4.25C6.77614 4.25 7 4.47386 7 4.75V6H8.25C8.52614 6 8.75 6.22386 8.75 6.5C8.75 6.77614 8.52614 7 8.25 7H7V8.25C7 8.52614 6.77614 8.75 6.5 8.75C6.22386 8.75 6 8.52614 6 8.25V7H4.75C4.47386 7 4.25 6.77614 4.25 6.5Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/radix/zoom-out.svg+8−0
@@ -0,0 +1,8 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
2 <path
3 fill-rule="evenodd"
4 clip-rule="evenodd"
5 d="M6.5 10C8.433 10 10 8.433 10 6.5C10 4.567 8.433 3 6.5 3C4.567 3 3 4.567 3 6.5C3 8.433 4.567 10 6.5 10ZM6.5 11C7.56251 11 8.53901 10.6318 9.30884 10.0159L12.1464 12.8536C12.3417 13.0488 12.6583 13.0488 12.8536 12.8536C13.0488 12.6583 13.0488 12.3417 12.8536 12.1464L10.0159 9.30884C10.6318 8.53901 11 7.56251 11 6.5C11 4.01472 8.98528 2 6.5 2C4.01472 2 2 4.01472 2 6.5C2 8.98528 4.01472 11 6.5 11ZM4.75 6C4.47386 6 4.25 6.22386 4.25 6.5C4.25 6.77614 4.47386 7 4.75 7H8.25C8.52614 7 8.75 6.77614 8.75 6.5C8.75 6.22386 8.52614 6 8.25 6H4.75Z"
6 fill="currentColor"
7 />
8</svg>
assets/icons/split_message_15.svg+1−0
@@ -0,0 +1 @@
1<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.81832 0.68179C7.64258 0.506054 7.35766 0.506054 7.18192 0.68179L5.18192 2.68179C5.00619 2.85753 5.00619 3.14245 5.18192 3.31819C5.35766 3.49392 5.64258 3.49392 5.81832 3.31819L7.05012 2.08638L7.05012 5.50023C7.05012 5.74876 7.25159 5.95023 7.50012 5.95023C7.74865 5.95023 7.95012 5.74876 7.95012 5.50023L7.95012 2.08638L9.18192 3.31819C9.35766 3.49392 9.64258 3.49392 9.81832 3.31819C9.99406 3.14245 9.99406 2.85753 9.81832 2.68179L7.81832 0.68179ZM7.95012 12.9136V9.50023C7.95012 9.2517 7.74865 9.05023 7.50012 9.05023C7.25159 9.05023 7.05012 9.2517 7.05012 9.50023V12.9136L5.81832 11.6818C5.64258 11.5061 5.35766 11.5061 5.18192 11.6818C5.00619 11.8575 5.00619 12.1424 5.18192 12.3182L7.18192 14.3182C7.26632 14.4026 7.38077 14.45 7.50012 14.45C7.61947 14.45 7.73393 14.4026 7.81832 14.3182L9.81832 12.3182C9.99406 12.1424 9.99406 11.8575 9.81832 11.6818C9.64258 11.5061 9.35766 11.5061 9.18192 11.6818L7.95012 12.9136ZM1.49994 7.00017C1.2238 7.00017 0.999939 7.22403 0.999939 7.50017C0.999939 7.77631 1.2238 8.00017 1.49994 8.00017L13.4999 8.00017C13.7761 8.00017 13.9999 7.77631 13.9999 7.50017C13.9999 7.22403 13.7761 7.00017 13.4999 7.00017L1.49994 7.00017Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
assets/keymaps/atom.json+35−4
@@ -24,9 +24,7 @@ · 23 unmodified lines
24 ],24 ],
25 "ctrl-shift-down": "editor::AddSelectionBelow",25 "ctrl-shift-down": "editor::AddSelectionBelow",
26 "ctrl-shift-up": "editor::AddSelectionAbove",26 "ctrl-shift-up": "editor::AddSelectionAbove",
27 "cmd-shift-backspace": "editor::DeleteToBeginningOfLine",27 "cmd-shift-backspace": "editor::DeleteToBeginningOfLine"
28 "cmd-shift-enter": "editor::NewlineAbove",
29 "cmd-enter": "editor::NewlineBelow"
30 }28 }
31 },29 },
32 {30 {
@@ -55,7 +53,40 @@ · 22 unmodified lines
55 "context": "Pane",53 "context": "Pane",
56 "bindings": {54 "bindings": {
57 "alt-cmd-/": "search::ToggleRegex",55 "alt-cmd-/": "search::ToggleRegex",
58 "ctrl-0": "project_panel::ToggleFocus"56 "ctrl-0": "project_panel::ToggleFocus",
57 "cmd-1": [
58 "pane::ActivateItem",
59 0
60 ],
61 "cmd-2": [
62 "pane::ActivateItem",
63 1
64 ],
65 "cmd-3": [
66 "pane::ActivateItem",
67 2
68 ],
69 "cmd-4": [
70 "pane::ActivateItem",
71 3
72 ],
73 "cmd-5": [
74 "pane::ActivateItem",
75 4
76 ],
77 "cmd-6": [
78 "pane::ActivateItem",
79 5
80 ],
81 "cmd-7": [
82 "pane::ActivateItem",
83 6
84 ],
85 "cmd-8": [
86 "pane::ActivateItem",
87 7
88 ],
89 "cmd-9": "pane::ActivateLastItem"
59 }90 }
60 },91 },
61 {92 {
assets/keymaps/default.json+17−5
@@ -40,7 +40,8 @@ · 39 unmodified lines
40 "cmd-o": "workspace::Open",40 "cmd-o": "workspace::Open",
41 "alt-cmd-o": "projects::OpenRecent",41 "alt-cmd-o": "projects::OpenRecent",
42 "ctrl-~": "workspace::NewTerminal",42 "ctrl-~": "workspace::NewTerminal",
43 "ctrl-`": "terminal_panel::ToggleFocus"43 "ctrl-`": "terminal_panel::ToggleFocus",
44 "shift-escape": "workspace::ToggleZoom"
44 }45 }
45 },46 },
46 {47 {
@@ -197,10 +198,20 @@ · 150 unmodified lines
197 }198 }
198 },199 },
199 {200 {
200 "context": "AssistantEditor > Editor",201 "context": "AssistantPanel",
202 "bindings": {
203 "cmd-g": "search::SelectNextMatch",
204 "cmd-shift-g": "search::SelectPrevMatch"
205 }
206 },
207 {
208 "context": "ConversationEditor > Editor",
201 "bindings": {209 "bindings": {
202 "cmd-enter": "assistant::Assist",210 "cmd-enter": "assistant::Assist",
203 "cmd->": "assistant::QuoteSelection"211 "cmd-s": "workspace::Save",
212 "cmd->": "assistant::QuoteSelection",
213 "shift-enter": "assistant::Split",
214 "ctrl-r": "assistant::CycleMessageRole"
204 }215 }
205 },216 },
206 {217 {
@@ -232,8 +243,7 @@ · 25 unmodified lines
232 "cmd-shift-g": "search::SelectPrevMatch",243 "cmd-shift-g": "search::SelectPrevMatch",
233 "alt-cmd-c": "search::ToggleCaseSensitive",244 "alt-cmd-c": "search::ToggleCaseSensitive",
234 "alt-cmd-w": "search::ToggleWholeWord",245 "alt-cmd-w": "search::ToggleWholeWord",
235 "alt-cmd-r": "search::ToggleRegex",246 "alt-cmd-r": "search::ToggleRegex"
236 "shift-escape": "workspace::ToggleZoom"
237 }247 }
238 },248 },
239 // Bindings from VS Code249 // Bindings from VS Code
@@ -398,6 +408,7 @@ · 158 unmodified lines
398 "cmd-shift-p": "command_palette::Toggle",408 "cmd-shift-p": "command_palette::Toggle",
399 "cmd-shift-m": "diagnostics::Deploy",409 "cmd-shift-m": "diagnostics::Deploy",
400 "cmd-shift-e": "project_panel::ToggleFocus",410 "cmd-shift-e": "project_panel::ToggleFocus",
411 "cmd-?": "assistant::ToggleFocus",
401 "cmd-alt-s": "workspace::SaveAll",412 "cmd-alt-s": "workspace::SaveAll",
402 "cmd-k m": "language_selector::Toggle"413 "cmd-k m": "language_selector::Toggle"
403 }414 }
@@ -409,6 +420,7 @@ · 5 unmodified lines
409 "ctrl-shift-k": "editor::DeleteLine",420 "ctrl-shift-k": "editor::DeleteLine",
410 "cmd-shift-d": "editor::DuplicateLine",421 "cmd-shift-d": "editor::DuplicateLine",
411 "cmd-shift-l": "editor::SplitSelectionIntoLines",422 "cmd-shift-l": "editor::SplitSelectionIntoLines",
423 "ctrl-j": "editor::JoinLines",
412 "ctrl-cmd-up": "editor::MoveLineUp",424 "ctrl-cmd-up": "editor::MoveLineUp",
413 "ctrl-cmd-down": "editor::MoveLineDown",425 "ctrl-cmd-down": "editor::MoveLineDown",
414 "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",426 "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
assets/keymaps/sublime_text.json+1−3
@@ -24,9 +24,7 @@ · 23 unmodified lines
24 "ctrl-.": "editor::GoToHunk",24 "ctrl-.": "editor::GoToHunk",
25 "ctrl-,": "editor::GoToPrevHunk",25 "ctrl-,": "editor::GoToPrevHunk",
26 "ctrl-backspace": "editor::DeleteToPreviousWordStart",26 "ctrl-backspace": "editor::DeleteToPreviousWordStart",
27 "ctrl-delete": "editor::DeleteToNextWordEnd",27 "ctrl-delete": "editor::DeleteToNextWordEnd"
28 "cmd-shift-enter": "editor::NewlineAbove",
29 "cmd-enter": "editor::NewlineBelow"
30 }28 }
31 },29 },
32 {30 {
assets/keymaps/textmate.json+3−3
@@ -12,8 +12,6 @@ · 11 unmodified lines
12 "ctrl-shift-d": "editor::DuplicateLine",12 "ctrl-shift-d": "editor::DuplicateLine",
13 "cmd-b": "editor::GoToDefinition",13 "cmd-b": "editor::GoToDefinition",
14 "cmd-j": "editor::ScrollCursorCenter",14 "cmd-j": "editor::ScrollCursorCenter",
15 "cmd-alt-enter": "editor::NewlineAbove",
16 "cmd-enter": "editor::NewlineBelow",
17 "cmd-shift-l": "editor::SelectLine",15 "cmd-shift-l": "editor::SelectLine",
18 "cmd-shift-t": "outline::Toggle",16 "cmd-shift-t": "outline::Toggle",
19 "alt-backspace": "editor::DeleteToPreviousWordStart",17 "alt-backspace": "editor::DeleteToPreviousWordStart",
@@ -56,7 +54,9 @@ · 36 unmodified lines
56 },54 },
57 {55 {
58 "context": "Editor && mode == full",56 "context": "Editor && mode == full",
59 "bindings": {}57 "bindings": {
58 "cmd-alt-enter": "editor::NewlineAbove"
59 }
60 },60 },
61 {61 {
62 "context": "BufferSearchBar",62 "context": "BufferSearchBar",
assets/keymaps/vim.json+31−29
@@ -1,6 +1,6 @@
1[1[
2 {2 {
3 "context": "Editor && VimControl && !VimWaiting",3 "context": "Editor && VimControl && !VimWaiting && !menu",
4 "bindings": {4 "bindings": {
5 "g": [5 "g": [
6 "vim::PushOperator",6 "vim::PushOperator",
@@ -25,11 +25,15 @@ · 18 unmodified lines
25 }25 }
26 ],26 ],
27 "h": "vim::Left",27 "h": "vim::Left",
28 "left": "vim::Left",
28 "backspace": "vim::Backspace",29 "backspace": "vim::Backspace",
29 "j": "vim::Down",30 "j": "vim::Down",
31 "down": "vim::Down",
30 "enter": "vim::NextLineStart",32 "enter": "vim::NextLineStart",
31 "k": "vim::Up",33 "k": "vim::Up",
34 "up": "vim::Up",
32 "l": "vim::Right",35 "l": "vim::Right",
36 "right": "vim::Right",
33 "$": "vim::EndOfLine",37 "$": "vim::EndOfLine",
34 "shift-g": "vim::EndOfDocument",38 "shift-g": "vim::EndOfDocument",
35 "w": "vim::NextWordStart",39 "w": "vim::NextWordStart",
@@ -54,10 +58,6 @@ · 18 unmodified lines
54 }58 }
55 ],59 ],
56 "%": "vim::Matching",60 "%": "vim::Matching",
57 "ctrl-y": [
58 "vim::Scroll",
59 "LineUp"
60 ],
61 "f": [61 "f": [
62 "vim::PushOperator",62 "vim::PushOperator",
63 {63 {
@@ -90,6 +90,8 @@ · 26 unmodified lines
90 }90 }
91 }91 }
92 ],92 ],
93 "ctrl-o": "pane::GoBack",
94 "ctrl-]": "editor::GoToDefinition",
93 "escape": "editor::Cancel",95 "escape": "editor::Cancel",
94 "0": "vim::StartOfLine", // When no number operator present, use start of line motion96 "0": "vim::StartOfLine", // When no number operator present, use start of line motion
95 "1": [97 "1": [
@@ -131,7 +133,7 @@ · 35 unmodified lines
131 }133 }
132 },134 },
133 {135 {
134 "context": "Editor && vim_mode == normal && vim_operator == none && !VimWaiting",136 "context": "Editor && vim_mode == normal && (vim_operator == none || vim_operator == n) && !VimWaiting",
135 "bindings": {137 "bindings": {
136 "c": [138 "c": [
137 "vim::PushOperator",139 "vim::PushOperator",
@@ -143,6 +145,7 @@ · 5 unmodified lines
143 "Delete"145 "Delete"
144 ],146 ],
145 "shift-d": "vim::DeleteToEndOfLine",147 "shift-d": "vim::DeleteToEndOfLine",
148 "shift-j": "editor::JoinLines",
146 "y": [149 "y": [
147 "vim::PushOperator",150 "vim::PushOperator",
148 "Yank"151 "Yank"
@@ -165,6 +168,7 @@ · 16 unmodified lines
165 "^": "vim::FirstNonWhitespace",168 "^": "vim::FirstNonWhitespace",
166 "o": "vim::InsertLineBelow",169 "o": "vim::InsertLineBelow",
167 "shift-o": "vim::InsertLineAbove",170 "shift-o": "vim::InsertLineAbove",
171 "~": "vim::ChangeCase",
168 "v": [172 "v": [
169 "vim::SwitchMode",173 "vim::SwitchMode",
170 {174 {
@@ -184,37 +188,29 @@ · 13 unmodified lines
184 "p": "vim::Paste",188 "p": "vim::Paste",
185 "u": "editor::Undo",189 "u": "editor::Undo",
186 "ctrl-r": "editor::Redo",190 "ctrl-r": "editor::Redo",
187 "ctrl-o": "pane::GoBack",
188 "/": [191 "/": [
189 "buffer_search::Deploy",192 "buffer_search::Deploy",
190 {193 {
191 "focus": true194 "focus": true
192 }195 }
193 ],196 ],
194 "ctrl-f": [197 "ctrl-f": "vim::PageDown",
195 "vim::Scroll",198 "pagedown": "vim::PageDown",
196 "PageDown"199 "ctrl-b": "vim::PageUp",
197 ],200 "pageup": "vim::PageUp",
198 "ctrl-b": [201 "ctrl-d": "vim::ScrollDown",
199 "vim::Scroll",202 "ctrl-u": "vim::ScrollUp",
200 "PageUp"203 "ctrl-e": "vim::LineDown",
201 ],204 "ctrl-y": "vim::LineUp",
202 "ctrl-d": [
203 "vim::Scroll",
204 "HalfPageDown"
205 ],
206 "ctrl-u": [
207 "vim::Scroll",
208 "HalfPageUp"
209 ],
210 "ctrl-e": [
211 "vim::Scroll",
212 "LineDown"
213 ],
214 "r": [205 "r": [
215 "vim::PushOperator",206 "vim::PushOperator",
216 "Replace"207 "Replace"
217 ]208 ],
209 "s": "vim::Substitute",
210 "> >": "editor::Indent",
211 "< <": "editor::Outdent",
212 "ctrl-pagedown": "pane::ActivateNextItem",
213 "ctrl-pageup": "pane::ActivatePrevItem"
218 }214 }
219 },215 },
220 {216 {
@@ -231,6 +227,8 @@ · 10 unmodified lines
231 "bindings": {227 "bindings": {
232 "g": "vim::StartOfDocument",228 "g": "vim::StartOfDocument",
233 "h": "editor::Hover",229 "h": "editor::Hover",
230 "t": "pane::ActivateNextItem",
231 "shift-t": "pane::ActivatePrevItem",
234 "escape": [232 "escape": [
235 "vim::SwitchMode",233 "vim::SwitchMode",
236 "Normal"234 "Normal"
@@ -301,10 +299,14 @@ · 64 unmodified lines
301 "x": "vim::VisualDelete",299 "x": "vim::VisualDelete",
302 "y": "vim::VisualYank",300 "y": "vim::VisualYank",
303 "p": "vim::VisualPaste",301 "p": "vim::VisualPaste",
302 "s": "vim::Substitute",
303 "~": "vim::ChangeCase",
304 "r": [304 "r": [
305 "vim::PushOperator",305 "vim::PushOperator",
306 "Replace"306 "Replace"
307 ]307 ],
308 "> >": "editor::Indent",
309 "< <": "editor::Outdent"
308 }310 }
309 },311 },
310 {312 {
assets/settings/default.json+39−29
@@ -57,39 +57,49 @@ · 56 unmodified lines
57 "show_whitespaces": "selection",57 "show_whitespaces": "selection",
58 // Scrollbar related settings58 // Scrollbar related settings
59 "scrollbar": {59 "scrollbar": {
60 // When to show the scrollbar in the editor.60 // When to show the scrollbar in the editor.
61 // This setting can take four values:61 // This setting can take four values:
62 //62 //
63 // 1. Show the scrollbar if there's important information or63 // 1. Show the scrollbar if there's important information or
64 // follow the system's configured behavior (default):64 // follow the system's configured behavior (default):
65 // "auto"65 // "auto"
66 // 2. Match the system's configured behavior:66 // 2. Match the system's configured behavior:
67 // "system"67 // "system"
68 // 3. Always show the scrollbar:68 // 3. Always show the scrollbar:
69 // "always"69 // "always"
70 // 4. Never show the scrollbar:70 // 4. Never show the scrollbar:
71 // "never"71 // "never"
72 "show": "auto",72 "show": "auto",
73 // Whether to show git diff indicators in the scrollbar.73 // Whether to show git diff indicators in the scrollbar.
74 "git_diff": true,74 "git_diff": true,
75 // Whether to show selections in the scrollbar.75 // Whether to show selections in the scrollbar.
76 "selections": true76 "selections": true
77 },
78 // Inlay hint related settings
79 "inlay_hints": {
80 // Global switch to toggle hints on and off, switched off by default.
81 "enabled": false,
82 // Toggle certain types of hints on and off, all switched on by default.
83 "show_type_hints": true,
84 "show_parameter_hints": true,
85 // Corresponds to null/None LSP hint type value.
86 "show_other_hints": true
77 },87 },
78 "project_panel": {88 "project_panel": {
79 // Whether to show the git status in the project panel.89 // Whether to show the git status in the project panel.
80 "git_status": true,90 "git_status": true,
81 // Where to dock project panel. Can be 'left' or 'right'.91 // Where to dock project panel. Can be 'left' or 'right'.
82 "dock": "left",92 "dock": "left",
83 // Default width of the project panel.93 // Default width of the project panel.
84 "default_width": 24094 "default_width": 240
85 },95 },
86 "assistant": {96 "assistant": {
87 // Where to dock the assistant. Can be 'left', 'right' or 'bottom'.97 // Where to dock the assistant. Can be 'left', 'right' or 'bottom'.
88 "dock": "right",98 "dock": "right",
89 // Default width when the assistant is docked to the left or right.99 // Default width when the assistant is docked to the left or right.
90 "default_width": 450,100 "default_width": 640,
91 // Default height when the assistant is docked to the bottom.101 // Default height when the assistant is docked to the bottom.
92 "default_height": 320102 "default_height": 320
93 },103 },
94 // Whether the screen sharing icon is shown in the os status bar.104 // Whether the screen sharing icon is shown in the os status bar.
95 "show_call_status_icon": true,105 "show_call_status_icon": true,
assets/sounds/joined_call.wav+0−0

Binary file not shown.

assets/sounds/leave_call.wav+0−0

Binary file not shown.

assets/sounds/mute.wav+0−0

Binary file not shown.

assets/sounds/start_screenshare.wav+0−0

Binary file not shown.

assets/sounds/stop_screenshare.wav+0−0

Binary file not shown.

assets/sounds/unmute.wav+0−0

Binary file not shown.

crates/activity_indicator/src/activity_indicator.rs+5−10
@@ -207,16 +207,11 @@ impl ActivityIndicator { · 206 unmodified lines
207 let mut checking_for_update = SmallVec::<[_; 3]>::new();207 let mut checking_for_update = SmallVec::<[_; 3]>::new();
208 let mut failed = SmallVec::<[_; 3]>::new();208 let mut failed = SmallVec::<[_; 3]>::new();
209 for status in &self.statuses {209 for status in &self.statuses {
210 let name = status.name.clone();
210 match status.status {211 match status.status {
211 LanguageServerBinaryStatus::CheckingForUpdate => {212 LanguageServerBinaryStatus::CheckingForUpdate => checking_for_update.push(name),
212 checking_for_update.push(status.name.clone());213 LanguageServerBinaryStatus::Downloading => downloading.push(name),
213 }214 LanguageServerBinaryStatus::Failed { .. } => failed.push(name),
214 LanguageServerBinaryStatus::Downloading => {
215 downloading.push(status.name.clone());
216 }
217 LanguageServerBinaryStatus::Failed { .. } => {
218 failed.push(status.name.clone());
219 }
220 LanguageServerBinaryStatus::Downloaded | LanguageServerBinaryStatus::Cached => {}215 LanguageServerBinaryStatus::Downloaded | LanguageServerBinaryStatus::Cached => {}
221 }216 }
222 }217 }
@@ -326,7 +321,7 @@ impl View for ActivityIndicator { · 103 unmodified lines
326 let mut element = MouseEventHandler::<Self, _>::new(0, cx, |state, cx| {321 let mut element = MouseEventHandler::<Self, _>::new(0, cx, |state, cx| {
327 let theme = &theme::current(cx).workspace.status_bar.lsp_status;322 let theme = &theme::current(cx).workspace.status_bar.lsp_status;
328 let style = if state.hovered() && on_click.is_some() {323 let style = if state.hovered() && on_click.is_some() {
329 theme.hover.as_ref().unwrap_or(&theme.default)324 theme.hovered.as_ref().unwrap_or(&theme.default)
330 } else {325 } else {
331 &theme.default326 &theme.default
332 };327 };
crates/ai/Cargo.toml+4−1
@@ -22,13 +22,16 @@ util = { path = "../util" } · 21 unmodified lines
22workspace = { path = "../workspace" }22workspace = { path = "../workspace" }
23 23
24anyhow.workspace = true24anyhow.workspace = true
25chrono = "0.4"25chrono = { version = "0.4", features = ["serde"] }
26futures.workspace = true26futures.workspace = true
27isahc.workspace = true27isahc.workspace = true
28regex.workspace = true
28schemars.workspace = true29schemars.workspace = true
29serde.workspace = true30serde.workspace = true
30serde_json.workspace = true31serde_json.workspace = true
32smol.workspace = true
31tiktoken-rs = "0.4"33tiktoken-rs = "0.4"
32 34
33[dev-dependencies]35[dev-dependencies]
34editor = { path = "../editor", features = ["test-support"] }36editor = { path = "../editor", features = ["test-support"] }
37project = { path = "../project", features = ["test-support"] }
crates/ai/src/ai.rs+92−2
@@ -1,19 +1,109 @@
1pub mod assistant;1pub mod assistant;
2mod assistant_settings;2mod assistant_settings;
3 3
4use anyhow::Result;
4pub use assistant::AssistantPanel;5pub use assistant::AssistantPanel;
6use chrono::{DateTime, Local};
7use collections::HashMap;
8use fs::Fs;
9use futures::StreamExt;
5use gpui::AppContext;10use gpui::AppContext;
11use regex::Regex;
6use serde::{Deserialize, Serialize};12use serde::{Deserialize, Serialize};
7use std::fmt::{self, Display};13use std::{
14 cmp::Reverse,
15 fmt::{self, Display},
16 path::PathBuf,
17 sync::Arc,
18};
19use util::paths::CONVERSATIONS_DIR;
8 20
9// Data types for chat completion requests21// Data types for chat completion requests
10#[derive(Serialize)]22#[derive(Debug, Serialize)]
11struct OpenAIRequest {23struct OpenAIRequest {
12 model: String,24 model: String,
13 messages: Vec<RequestMessage>,25 messages: Vec<RequestMessage>,
14 stream: bool,26 stream: bool,
15}27}
16 28
29#[derive(
30 Copy, Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord, Hash, Serialize, Deserialize,
31)]
32struct MessageId(usize);
33
34#[derive(Clone, Debug, Serialize, Deserialize)]
35struct MessageMetadata {
36 role: Role,
37 sent_at: DateTime<Local>,
38 status: MessageStatus,
39}
40
41#[derive(Clone, Debug, Serialize, Deserialize)]
42enum MessageStatus {
43 Pending,
44 Done,
45 Error(Arc<str>),
46}
47
48#[derive(Serialize, Deserialize)]
49struct SavedMessage {
50 id: MessageId,
51 start: usize,
52}
53
54#[derive(Serialize, Deserialize)]
55struct SavedConversation {
56 zed: String,
57 version: String,
58 text: String,
59 messages: Vec<SavedMessage>,
60 message_metadata: HashMap<MessageId, MessageMetadata>,
61 summary: String,
62 model: String,
63}
64
65impl SavedConversation {
66 const VERSION: &'static str = "0.1.0";
67}
68
69struct SavedConversationMetadata {
70 title: String,
71 path: PathBuf,
72 mtime: chrono::DateTime<chrono::Local>,
73}
74
75impl SavedConversationMetadata {
76 pub async fn list(fs: Arc<dyn Fs>) -> Result<Vec<Self>> {
77 fs.create_dir(&CONVERSATIONS_DIR).await?;
78
79 let mut paths = fs.read_dir(&CONVERSATIONS_DIR).await?;
80 let mut conversations = Vec::<SavedConversationMetadata>::new();
81 while let Some(path) = paths.next().await {
82 let path = path?;
83
84 let pattern = r" - \d+.zed.json$";
85 let re = Regex::new(pattern).unwrap();
86
87 let metadata = fs.metadata(&path).await?;
88 if let Some((file_name, metadata)) = path
89 .file_name()
90 .and_then(|name| name.to_str())
91 .zip(metadata)
92 {
93 let title = re.replace(file_name, "");
94 conversations.push(Self {
95 title: title.into_owned(),
96 path,
97 mtime: metadata.mtime.into(),
98 });
99 }
100 }
101 conversations.sort_unstable_by_key(|conversation| Reverse(conversation.mtime));
102
103 Ok(conversations)
104 }
105}
106
17#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]107#[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
18struct RequestMessage {108struct RequestMessage {
19 role: Role,109 role: Role,
crates/ai/src/assistant.rs+1533−457
@@ -1,6 +1,7 @@
1use crate::{1use crate::{
2 assistant_settings::{AssistantDockPosition, AssistantSettings},2 assistant_settings::{AssistantDockPosition, AssistantSettings},
3 OpenAIRequest, OpenAIResponseStreamEvent, RequestMessage, Role,3 MessageId, MessageMetadata, MessageStatus, OpenAIRequest, OpenAIResponseStreamEvent,
4 RequestMessage, Role, SavedConversation, SavedConversationMetadata, SavedMessage,
4};5};
5use anyhow::{anyhow, Result};6use anyhow::{anyhow, Result};
6use chrono::{DateTime, Local};7use chrono::{DateTime, Local};
@@ -8,7 +9,7 @@ use collections::{HashMap, HashSet}; · 1 unmodified line
8use editor::{9use editor::{
9 display_map::{BlockDisposition, BlockId, BlockProperties, BlockStyle, ToDisplayPoint},10 display_map::{BlockDisposition, BlockId, BlockProperties, BlockStyle, ToDisplayPoint},
10 scroll::autoscroll::{Autoscroll, AutoscrollStrategy},11 scroll::autoscroll::{Autoscroll, AutoscrollStrategy},
11 Anchor, Editor, ToOffset as _,12 Anchor, Editor, ToOffset,
12};13};
13use fs::Fs;14use fs::Fs;
14use futures::{io::BufReader, AsyncBufReadExt, AsyncReadExt, Stream, StreamExt};15use futures::{io::BufReader, AsyncBufReadExt, AsyncReadExt, Stream, StreamExt};
@@ -23,49 +24,66 @@ use gpui::{ · 8 unmodified lines
23};24};
24use isahc::{http::StatusCode, Request, RequestExt};25use isahc::{http::StatusCode, Request, RequestExt};
25use language::{language_settings::SoftWrap, Buffer, LanguageRegistry, ToOffset as _};26use language::{language_settings::SoftWrap, Buffer, LanguageRegistry, ToOffset as _};
27use search::BufferSearchBar;
26use serde::Deserialize;28use serde::Deserialize;
27use settings::SettingsStore;29use settings::SettingsStore;
28use std::{30use std::{
29 borrow::Cow, cell::RefCell, cmp, fmt::Write, io, iter, ops::Range, rc::Rc, sync::Arc,31 cell::RefCell,
32 cmp, env,
33 fmt::Write,
34 io, iter,
35 ops::Range,
36 path::{Path, PathBuf},
37 rc::Rc,
38 sync::Arc,
30 time::Duration,39 time::Duration,
31};40};
32use util::{channel::ReleaseChannel, post_inc, truncate_and_trailoff, ResultExt, TryFutureExt};41use theme::AssistantStyle;
42use util::{paths::CONVERSATIONS_DIR, post_inc, ResultExt, TryFutureExt};
33use workspace::{43use workspace::{
34 dock::{DockPosition, Panel},44 dock::{DockPosition, Panel},
35 item::Item,45 searchable::Direction,
36 pane, Pane, Workspace,46 Save, ToggleZoom, Toolbar, Workspace,
37};47};
38 48
39const OPENAI_API_URL: &'static str = "https://api.openai.com/v1";49const OPENAI_API_URL: &'static str = "https://api.openai.com/v1";
40 50
41actions!(51actions!(
42 assistant,52 assistant,
43 [NewContext, Assist, QuoteSelection, ToggleFocus, ResetKey]53 [
54 NewConversation,
55 Assist,
56 Split,
57 CycleMessageRole,
58 QuoteSelection,
59 ToggleFocus,
60 ResetKey,
61 ]
44);62);
45 63
46pub fn init(cx: &mut AppContext) {64pub fn init(cx: &mut AppContext) {
47 if *util::channel::RELEASE_CHANNEL == ReleaseChannel::Stable {
48 cx.update_default_global::<collections::CommandPaletteFilter, _, _>(move |filter, _cx| {
49 filter.filtered_namespaces.insert("assistant");
50 });
51 }
52
53 settings::register::<AssistantSettings>(cx);65 settings::register::<AssistantSettings>(cx);
54 cx.add_action(66 cx.add_action(
55 |workspace: &mut Workspace, _: &NewContext, cx: &mut ViewContext<Workspace>| {67 |this: &mut AssistantPanel,
56 if let Some(this) = workspace.panel::<AssistantPanel>(cx) {68 _: &workspace::NewFile,
57 this.update(cx, |this, cx| this.add_context(cx))69 cx: &mut ViewContext<AssistantPanel>| {
58 }70 this.new_conversation(cx);
59
60 workspace.focus_panel::<AssistantPanel>(cx);
61 },71 },
62 );72 );
63 cx.add_action(AssistantEditor::assist);73 cx.add_action(ConversationEditor::assist);
64 cx.capture_action(AssistantEditor::cancel_last_assist);74 cx.capture_action(ConversationEditor::cancel_last_assist);
65 cx.add_action(AssistantEditor::quote_selection);75 cx.capture_action(ConversationEditor::save);
66 cx.capture_action(AssistantEditor::copy);76 cx.add_action(ConversationEditor::quote_selection);
77 cx.capture_action(ConversationEditor::copy);
78 cx.add_action(ConversationEditor::split);
79 cx.capture_action(ConversationEditor::cycle_message_role);
67 cx.add_action(AssistantPanel::save_api_key);80 cx.add_action(AssistantPanel::save_api_key);
68 cx.add_action(AssistantPanel::reset_api_key);81 cx.add_action(AssistantPanel::reset_api_key);
82 cx.add_action(AssistantPanel::toggle_zoom);
83 cx.add_action(AssistantPanel::deploy);
84 cx.add_action(AssistantPanel::select_next_match);
85 cx.add_action(AssistantPanel::select_prev_match);
86 cx.add_action(AssistantPanel::handle_editor_cancel);
69 cx.add_action(87 cx.add_action(
70 |workspace: &mut Workspace, _: &ToggleFocus, cx: &mut ViewContext<Workspace>| {88 |workspace: &mut Workspace, _: &ToggleFocus, cx: &mut ViewContext<Workspace>| {
71 workspace.toggle_panel_focus::<AssistantPanel>(cx);89 workspace.toggle_panel_focus::<AssistantPanel>(cx);
@@ -73,6 +91,7 @@ pub fn init(cx: &mut AppContext) { · 1 unmodified line
73 );91 );
74}92}
75 93
94#[derive(Debug)]
76pub enum AssistantPanelEvent {95pub enum AssistantPanelEvent {
77 ZoomIn,96 ZoomIn,
78 ZoomOut,97 ZoomOut,
@@ -82,15 +101,24 @@ pub enum AssistantPanelEvent { · 3 unmodified lines
82}101}
83 102
84pub struct AssistantPanel {103pub struct AssistantPanel {
104 workspace: WeakViewHandle<Workspace>,
85 width: Option<f32>,105 width: Option<f32>,
86 height: Option<f32>,106 height: Option<f32>,
87 pane: ViewHandle<Pane>,107 active_editor_index: Option<usize>,
108 prev_active_editor_index: Option<usize>,
109 editors: Vec<ViewHandle<ConversationEditor>>,
110 saved_conversations: Vec<SavedConversationMetadata>,
111 saved_conversations_list_state: UniformListState,
112 zoomed: bool,
113 has_focus: bool,
114 toolbar: ViewHandle<Toolbar>,
88 api_key: Rc<RefCell<Option<String>>>,115 api_key: Rc<RefCell<Option<String>>>,
89 api_key_editor: Option<ViewHandle<Editor>>,116 api_key_editor: Option<ViewHandle<Editor>>,
90 has_read_credentials: bool,117 has_read_credentials: bool,
91 languages: Arc<LanguageRegistry>,118 languages: Arc<LanguageRegistry>,
92 fs: Arc<dyn Fs>,119 fs: Arc<dyn Fs>,
93 subscriptions: Vec<Subscription>,120 subscriptions: Vec<Subscription>,
121 _watch_saved_conversations: Task<Result<()>>,
94}122}
95 123
96impl AssistantPanel {124impl AssistantPanel {
@@ -99,66 +127,52 @@ impl AssistantPanel { · 2 unmodified lines
99 cx: AsyncAppContext,127 cx: AsyncAppContext,
100 ) -> Task<Result<ViewHandle<Self>>> {128 ) -> Task<Result<ViewHandle<Self>>> {
101 cx.spawn(|mut cx| async move {129 cx.spawn(|mut cx| async move {
130 let fs = workspace.read_with(&cx, |workspace, _| workspace.app_state().fs.clone())?;
131 let saved_conversations = SavedConversationMetadata::list(fs.clone())
132 .await
133 .log_err()
134 .unwrap_or_default();
135
102 // TODO: deserialize state.136 // TODO: deserialize state.
137 let workspace_handle = workspace.clone();
103 workspace.update(&mut cx, |workspace, cx| {138 workspace.update(&mut cx, |workspace, cx| {
104 cx.add_view::<Self, _>(|cx| {139 cx.add_view::<Self, _>(|cx| {
105 let weak_self = cx.weak_handle();140 const CONVERSATION_WATCH_DURATION: Duration = Duration::from_millis(100);
106 let pane = cx.add_view(|cx| {141 let _watch_saved_conversations = cx.spawn(move |this, mut cx| async move {
107 let mut pane = Pane::new(142 let mut events = fs
108 workspace.weak_handle(),143 .watch(&CONVERSATIONS_DIR, CONVERSATION_WATCH_DURATION)
109 workspace.project().clone(),144 .await;
110 workspace.app_state().background_actions,145 while events.next().await.is_some() {
111 Default::default(),146 let saved_conversations = SavedConversationMetadata::list(fs.clone())
112 cx,147 .await
113 );148 .log_err()
114 pane.set_can_split(false, cx);149 .unwrap_or_default();
115 pane.set_can_navigate(false, cx);150 this.update(&mut cx, |this, cx| {
116 pane.on_can_drop(move |_, _| false);151 this.saved_conversations = saved_conversations;
117 pane.set_render_tab_bar_buttons(cx, move |pane, cx| {152 cx.notify();
118 let weak_self = weak_self.clone();153 })
119 Flex::row()154 .ok();
120 .with_child(Pane::render_tab_bar_button(155 }
121 0,156
122 "icons/plus_12.svg",157 anyhow::Ok(())
123 false,
124 Some(("New Context".into(), Some(Box::new(NewContext)))),
125 cx,
126 move |_, cx| {
127 let weak_self = weak_self.clone();
128 cx.window_context().defer(move |cx| {
129 if let Some(this) = weak_self.upgrade(cx) {
130 this.update(cx, |this, cx| this.add_context(cx));
131 }
132 })
133 },
134 None,
135 ))
136 .with_child(Pane::render_tab_bar_button(
137 1,
138 if pane.is_zoomed() {
139 "icons/minimize_8.svg"
140 } else {
141 "icons/maximize_8.svg"
142 },
143 pane.is_zoomed(),
144 Some((
145 "Toggle Zoom".into(),
146 Some(Box::new(workspace::ToggleZoom)),
147 )),
148 cx,
149 move |pane, cx| pane.toggle_zoom(&Default::default(), cx),
150 None,
151 ))
152 .into_any()
153 });
154 let buffer_search_bar = cx.add_view(search::BufferSearchBar::new);
155 pane.toolbar()
156 .update(cx, |toolbar, cx| toolbar.add_item(buffer_search_bar, cx));
157 pane
158 });158 });
159 159
160 let toolbar = cx.add_view(|cx| {
161 let mut toolbar = Toolbar::new(None);
162 toolbar.set_can_navigate(false, cx);
163 toolbar.add_item(cx.add_view(|cx| BufferSearchBar::new(cx)), cx);
164 toolbar
165 });
160 let mut this = Self {166 let mut this = Self {
161 pane,167 workspace: workspace_handle,
168 active_editor_index: Default::default(),
169 prev_active_editor_index: Default::default(),
170 editors: Default::default(),
171 saved_conversations,
172 saved_conversations_list_state: Default::default(),
173 zoomed: false,
174 has_focus: false,
175 toolbar,
162 api_key: Rc::new(RefCell::new(None)),176 api_key: Rc::new(RefCell::new(None)),
163 api_key_editor: None,177 api_key_editor: None,
164 has_read_credentials: false,178 has_read_credentials: false,
@@ -167,20 +181,18 @@ impl AssistantPanel { · 2 unmodified lines
167 width: None,181 width: None,
168 height: None,182 height: None,
169 subscriptions: Default::default(),183 subscriptions: Default::default(),
184 _watch_saved_conversations,
170 };185 };
171 186
172 let mut old_dock_position = this.position(cx);187 let mut old_dock_position = this.position(cx);
173 this.subscriptions = vec![188 this.subscriptions =
174 cx.observe(&this.pane, |_, _, cx| cx.notify()),189 vec![cx.observe_global::<SettingsStore, _>(move |this, cx| {
175 cx.subscribe(&this.pane, Self::handle_pane_event),
176 cx.observe_global::<SettingsStore, _>(move |this, cx| {
177 let new_dock_position = this.position(cx);190 let new_dock_position = this.position(cx);
178 if new_dock_position != old_dock_position {191 if new_dock_position != old_dock_position {
179 old_dock_position = new_dock_position;192 old_dock_position = new_dock_position;
180 cx.emit(AssistantPanelEvent::DockPositionChanged);193 cx.emit(AssistantPanelEvent::DockPositionChanged);
181 }194 }
182 }),195 })];
183 ];
184 196
185 this197 this
186 })198 })
@@ -188,40 +200,64 @@ impl AssistantPanel { · 1 unmodified line
188 })200 })
189 }201 }
190 202
191 fn handle_pane_event(203 fn new_conversation(&mut self, cx: &mut ViewContext<Self>) -> ViewHandle<ConversationEditor> {
204 let editor = cx.add_view(|cx| {
205 ConversationEditor::new(
206 self.api_key.clone(),
207 self.languages.clone(),
208 self.fs.clone(),
209 cx,
210 )
211 });
212 self.add_conversation(editor.clone(), cx);
213 editor
214 }
215
216 fn add_conversation(
192 &mut self,217 &mut self,
193 _pane: ViewHandle<Pane>,218 editor: ViewHandle<ConversationEditor>,
194 event: &pane::Event,
195 cx: &mut ViewContext<Self>,219 cx: &mut ViewContext<Self>,
196 ) {220 ) {
197 match event {221 self.subscriptions
198 pane::Event::ZoomIn => cx.emit(AssistantPanelEvent::ZoomIn),222 .push(cx.subscribe(&editor, Self::handle_conversation_editor_event));
199 pane::Event::ZoomOut => cx.emit(AssistantPanelEvent::ZoomOut),
200 pane::Event::Focus => cx.emit(AssistantPanelEvent::Focus),
201 pane::Event::Remove => cx.emit(AssistantPanelEvent::Close),
202 _ => {}
203 }
204 }
205 223
206 fn add_context(&mut self, cx: &mut ViewContext<Self>) {224 let conversation = editor.read(cx).conversation.clone();
207 let focus = self.has_focus(cx);
208 let editor = cx
209 .add_view(|cx| AssistantEditor::new(self.api_key.clone(), self.languages.clone(), cx));
210 self.subscriptions225 self.subscriptions
211 .push(cx.subscribe(&editor, Self::handle_assistant_editor_event));226 .push(cx.observe(&conversation, |_, _, cx| cx.notify()));
212 self.pane.update(cx, |pane, cx| {227
213 pane.add_item(Box::new(editor), true, focus, None, cx)228 let index = self.editors.len();
214 });229 self.editors.push(editor);
230 self.set_active_editor_index(Some(index), cx);
215 }231 }
216 232
217 fn handle_assistant_editor_event(233 fn set_active_editor_index(&mut self, index: Option<usize>, cx: &mut ViewContext<Self>) {
234 self.prev_active_editor_index = self.active_editor_index;
235 self.active_editor_index = index;
236 if let Some(editor) = self.active_editor() {
237 let editor = editor.read(cx).editor.clone();
238 self.toolbar.update(cx, |toolbar, cx| {
239 toolbar.set_active_item(Some(&editor), cx);
240 });
241 if self.has_focus(cx) {
242 cx.focus(&editor);
243 }
244 } else {
245 self.toolbar.update(cx, |toolbar, cx| {
246 toolbar.set_active_item(None, cx);
247 });
248 }
249
250 cx.notify();
251 }
252
253 fn handle_conversation_editor_event(
218 &mut self,254 &mut self,
219 _: ViewHandle<AssistantEditor>,255 _: ViewHandle<ConversationEditor>,
220 event: &AssistantEditorEvent,256 event: &ConversationEditorEvent,
221 cx: &mut ViewContext<Self>,257 cx: &mut ViewContext<Self>,
222 ) {258 ) {
223 match event {259 match event {
224 AssistantEditorEvent::TabContentChanged => self.pane.update(cx, |_, cx| cx.notify()),260 ConversationEditorEvent::TabContentChanged => cx.notify(),
225 }261 }
226 }262 }
227 263
@@ -252,6 +288,287 @@ impl AssistantPanel { · 24 unmodified lines
252 cx.focus_self();288 cx.focus_self();
253 cx.notify();289 cx.notify();
254 }290 }
291
292 fn toggle_zoom(&mut self, _: &workspace::ToggleZoom, cx: &mut ViewContext<Self>) {
293 if self.zoomed {
294 cx.emit(AssistantPanelEvent::ZoomOut)
295 } else {
296 cx.emit(AssistantPanelEvent::ZoomIn)
297 }
298 }
299
300 fn deploy(&mut self, action: &search::buffer_search::Deploy, cx: &mut ViewContext<Self>) {
301 if let Some(search_bar) = self.toolbar.read(cx).item_of_type::<BufferSearchBar>() {
302 if search_bar.update(cx, |search_bar, cx| search_bar.show(action.focus, true, cx)) {
303 return;
304 }
305 }
306 cx.propagate_action();
307 }
308
309 fn handle_editor_cancel(&mut self, _: &editor::Cancel, cx: &mut ViewContext<Self>) {
310 if let Some(search_bar) = self.toolbar.read(cx).item_of_type::<BufferSearchBar>() {
311 if !search_bar.read(cx).is_dismissed() {
312 search_bar.update(cx, |search_bar, cx| {
313 search_bar.dismiss(&Default::default(), cx)
314 });
315 return;
316 }
317 }
318 cx.propagate_action();
319 }
320
321 fn select_next_match(&mut self, _: &search::SelectNextMatch, cx: &mut ViewContext<Self>) {
322 if let Some(search_bar) = self.toolbar.read(cx).item_of_type::<BufferSearchBar>() {
323 search_bar.update(cx, |bar, cx| bar.select_match(Direction::Next, cx));
324 }
325 }
326
327 fn select_prev_match(&mut self, _: &search::SelectPrevMatch, cx: &mut ViewContext<Self>) {
328 if let Some(search_bar) = self.toolbar.read(cx).item_of_type::<BufferSearchBar>() {
329 search_bar.update(cx, |bar, cx| bar.select_match(Direction::Prev, cx));
330 }
331 }
332
333 fn active_editor(&self) -> Option<&ViewHandle<ConversationEditor>> {
334 self.editors.get(self.active_editor_index?)
335 }
336
337 fn render_hamburger_button(cx: &mut ViewContext<Self>) -> impl Element<Self> {
338 enum History {}
339 let theme = theme::current(cx);
340 let tooltip_style = theme::current(cx).tooltip.clone();
341 MouseEventHandler::<History, _>::new(0, cx, |state, _| {
342 let style = theme.assistant.hamburger_button.style_for(state);
343 Svg::for_style(style.icon.clone())
344 .contained()
345 .with_style(style.container)
346 })
347 .with_cursor_style(CursorStyle::PointingHand)
348 .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
349 if this.active_editor().is_some() {
350 this.set_active_editor_index(None, cx);
351 } else {
352 this.set_active_editor_index(this.prev_active_editor_index, cx);
353 }
354 })
355 .with_tooltip::<History>(1, "History".into(), None, tooltip_style, cx)
356 }
357
358 fn render_editor_tools(&self, cx: &mut ViewContext<Self>) -> Vec<AnyElement<Self>> {
359 if self.active_editor().is_some() {
360 vec![
361 Self::render_split_button(cx).into_any(),
362 Self::render_quote_button(cx).into_any(),
363 Self::render_assist_button(cx).into_any(),
364 ]
365 } else {
366 Default::default()
367 }
368 }
369
370 fn render_split_button(cx: &mut ViewContext<Self>) -> impl Element<Self> {
371 let theme = theme::current(cx);
372 let tooltip_style = theme::current(cx).tooltip.clone();
373 MouseEventHandler::<Split, _>::new(0, cx, |state, _| {
374 let style = theme.assistant.split_button.style_for(state);
375 Svg::for_style(style.icon.clone())
376 .contained()
377 .with_style(style.container)
378 })
379 .with_cursor_style(CursorStyle::PointingHand)
380 .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
381 if let Some(active_editor) = this.active_editor() {
382 active_editor.update(cx, |editor, cx| editor.split(&Default::default(), cx));
383 }
384 })
385 .with_tooltip::<Split>(
386 1,
387 "Split Message".into(),
388 Some(Box::new(Split)),
389 tooltip_style,
390 cx,
391 )
392 }
393
394 fn render_assist_button(cx: &mut ViewContext<Self>) -> impl Element<Self> {
395 let theme = theme::current(cx);
396 let tooltip_style = theme::current(cx).tooltip.clone();
397 MouseEventHandler::<Assist, _>::new(0, cx, |state, _| {
398 let style = theme.assistant.assist_button.style_for(state);
399 Svg::for_style(style.icon.clone())
400 .contained()
401 .with_style(style.container)
402 })
403 .with_cursor_style(CursorStyle::PointingHand)
404 .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
405 if let Some(active_editor) = this.active_editor() {
406 active_editor.update(cx, |editor, cx| editor.assist(&Default::default(), cx));
407 }
408 })
409 .with_tooltip::<Assist>(
410 1,
411 "Assist".into(),
412 Some(Box::new(Assist)),
413 tooltip_style,
414 cx,
415 )
416 }
417
418 fn render_quote_button(cx: &mut ViewContext<Self>) -> impl Element<Self> {
419 let theme = theme::current(cx);
420 let tooltip_style = theme::current(cx).tooltip.clone();
421 MouseEventHandler::<QuoteSelection, _>::new(0, cx, |state, _| {
422 let style = theme.assistant.quote_button.style_for(state);
423 Svg::for_style(style.icon.clone())
424 .contained()
425 .with_style(style.container)
426 })
427 .with_cursor_style(CursorStyle::PointingHand)
428 .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
429 if let Some(workspace) = this.workspace.upgrade(cx) {
430 cx.window_context().defer(move |cx| {
431 workspace.update(cx, |workspace, cx| {
432 ConversationEditor::quote_selection(workspace, &Default::default(), cx)
433 });
434 });
435 }
436 })
437 .with_tooltip::<QuoteSelection>(
438 1,
439 "Quote Selection".into(),
440 Some(Box::new(QuoteSelection)),
441 tooltip_style,
442 cx,
443 )
444 }
445
446 fn render_plus_button(cx: &mut ViewContext<Self>) -> impl Element<Self> {
447 let theme = theme::current(cx);
448 let tooltip_style = theme::current(cx).tooltip.clone();
449 MouseEventHandler::<NewConversation, _>::new(0, cx, |state, _| {
450 let style = theme.assistant.plus_button.style_for(state);
451 Svg::for_style(style.icon.clone())
452 .contained()
453 .with_style(style.container)
454 })
455 .with_cursor_style(CursorStyle::PointingHand)
456 .on_click(MouseButton::Left, |_, this: &mut Self, cx| {
457 this.new_conversation(cx);
458 })
459 .with_tooltip::<NewConversation>(
460 1,
461 "New Conversation".into(),
462 Some(Box::new(NewConversation)),
463 tooltip_style,
464 cx,
465 )
466 }
467
468 fn render_zoom_button(&self, cx: &mut ViewContext<Self>) -> impl Element<Self> {
469 enum ToggleZoomButton {}
470
471 let theme = theme::current(cx);
472 let tooltip_style = theme::current(cx).tooltip.clone();
473 let style = if self.zoomed {
474 &theme.assistant.zoom_out_button
475 } else {
476 &theme.assistant.zoom_in_button
477 };
478
479 MouseEventHandler::<ToggleZoomButton, _>::new(0, cx, |state, _| {
480 let style = style.style_for(state);
481 Svg::for_style(style.icon.clone())
482 .contained()
483 .with_style(style.container)
484 })
485 .with_cursor_style(CursorStyle::PointingHand)
486 .on_click(MouseButton::Left, |_, this, cx| {
487 this.toggle_zoom(&ToggleZoom, cx);
488 })
489 .with_tooltip::<ToggleZoom>(
490 0,
491 if self.zoomed {
492 "Zoom Out".into()
493 } else {
494 "Zoom In".into()
495 },
496 Some(Box::new(ToggleZoom)),
497 tooltip_style,
498 cx,
499 )
500 }
501
502 fn render_saved_conversation(
503 &mut self,
504 index: usize,
505 cx: &mut ViewContext<Self>,
506 ) -> impl Element<Self> {
507 let conversation = &self.saved_conversations[index];
508 let path = conversation.path.clone();
509 MouseEventHandler::<SavedConversationMetadata, _>::new(index, cx, move |state, cx| {
510 let style = &theme::current(cx).assistant.saved_conversation;
511 Flex::row()
512 .with_child(
513 Label::new(
514 conversation.mtime.format("%F %I:%M%p").to_string(),
515 style.saved_at.text.clone(),
516 )
517 .aligned()
518 .contained()
519 .with_style(style.saved_at.container),
520 )
521 .with_child(
522 Label::new(conversation.title.clone(), style.title.text.clone())
523 .aligned()
524 .contained()
525 .with_style(style.title.container),
526 )
527 .contained()
528 .with_style(*style.container.style_for(state))
529 })
530 .with_cursor_style(CursorStyle::PointingHand)
531 .on_click(MouseButton::Left, move |_, this, cx| {
532 this.open_conversation(path.clone(), cx)
533 .detach_and_log_err(cx)
534 })
535 }
536
537 fn open_conversation(&mut self, path: PathBuf, cx: &mut ViewContext<Self>) -> Task<Result<()>> {
538 if let Some(ix) = self.editor_index_for_path(&path, cx) {
539 self.set_active_editor_index(Some(ix), cx);
540 return Task::ready(Ok(()));
541 }
542
543 let fs = self.fs.clone();
544 let api_key = self.api_key.clone();
545 let languages = self.languages.clone();
546 cx.spawn(|this, mut cx| async move {
547 let saved_conversation = fs.load(&path).await?;
548 let saved_conversation = serde_json::from_str(&saved_conversation)?;
549 let conversation = cx.add_model(|cx| {
550 Conversation::deserialize(saved_conversation, path.clone(), api_key, languages, cx)
551 });
552 this.update(&mut cx, |this, cx| {
553 // If, by the time we've loaded the conversation, the user has already opened
554 // the same conversation, we don't want to open it again.
555 if let Some(ix) = this.editor_index_for_path(&path, cx) {
556 this.set_active_editor_index(Some(ix), cx);
557 } else {
558 let editor = cx
559 .add_view(|cx| ConversationEditor::for_conversation(conversation, fs, cx));
560 this.add_conversation(editor, cx);
561 }
562 })?;
563 Ok(())
564 })
565 }
566
567 fn editor_index_for_path(&self, path: &Path, cx: &AppContext) -> Option<usize> {
568 self.editors
569 .iter()
570 .position(|editor| editor.read(cx).conversation.read(cx).path.as_deref() == Some(path))
571 }
255}572}
256 573
257fn build_api_key_editor(cx: &mut ViewContext<AssistantPanel>) -> ViewHandle<Editor> {574fn build_api_key_editor(cx: &mut ViewContext<AssistantPanel>) -> ViewHandle<Editor> {
@@ -275,7 +592,8 @@ impl View for AssistantPanel { · 17 unmodified lines
275 }592 }
276 593
277 fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {594 fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
278 let style = &theme::current(cx).assistant;595 let theme = &theme::current(cx);
596 let style = &theme.assistant;
279 if let Some(api_key_editor) = self.api_key_editor.as_ref() {597 if let Some(api_key_editor) = self.api_key_editor.as_ref() {
280 Flex::column()598 Flex::column()
281 .with_child(599 .with_child(
@@ -296,19 +614,81 @@ impl View for AssistantPanel { · 14 unmodified lines
296 .aligned()614 .aligned()
297 .into_any()615 .into_any()
298 } else {616 } else {
299 ChildView::new(&self.pane, cx).into_any()617 let title = self.active_editor().map(|editor| {
618 Label::new(editor.read(cx).title(cx), style.title.text.clone())
619 .contained()
620 .with_style(style.title.container)
621 .aligned()
622 .left()
623 .flex(1., false)
624 });
625 let mut header = Flex::row()
626 .with_child(Self::render_hamburger_button(cx).aligned())
627 .with_children(title);
628 if self.has_focus {
629 header.add_children(
630 self.render_editor_tools(cx)
631 .into_iter()
632 .map(|tool| tool.aligned().flex_float()),
633 );
634 header.add_child(Self::render_plus_button(cx).aligned().flex_float());
635 header.add_child(self.render_zoom_button(cx).aligned());
636 }
637
638 Flex::column()
639 .with_child(
640 header
641 .contained()
642 .with_style(theme.workspace.tab_bar.container)
643 .expanded()
644 .constrained()
645 .with_height(theme.workspace.tab_bar.height),
646 )
647 .with_children(if self.toolbar.read(cx).hidden() {
648 None
649 } else {
650 Some(ChildView::new(&self.toolbar, cx).expanded())
651 })
652 .with_child(if let Some(editor) = self.active_editor() {
653 ChildView::new(editor, cx).flex(1., true).into_any()
654 } else {
655 UniformList::new(
656 self.saved_conversations_list_state.clone(),
657 self.saved_conversations.len(),
658 cx,
659 |this, range, items, cx| {
660 for ix in range {
661 items.push(this.render_saved_conversation(ix, cx).into_any());
662 }
663 },
664 )
665 .flex(1., true)
666 .into_any()
667 })
668 .into_any()
300 }669 }
301 }670 }
302 671
303 fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext<Self>) {672 fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext<Self>) {
673 self.has_focus = true;
674 self.toolbar
675 .update(cx, |toolbar, cx| toolbar.focus_changed(true, cx));
676 cx.notify();
304 if cx.is_self_focused() {677 if cx.is_self_focused() {
305 if let Some(api_key_editor) = self.api_key_editor.as_ref() {678 if let Some(editor) = self.active_editor() {
679 cx.focus(editor);
680 } else if let Some(api_key_editor) = self.api_key_editor.as_ref() {
306 cx.focus(api_key_editor);681 cx.focus(api_key_editor);
307 } else {
308 cx.focus(&self.pane);
309 }682 }
310 }683 }
311 }684 }
685
686 fn focus_out(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext<Self>) {
687 self.has_focus = false;
688 self.toolbar
689 .update(cx, |toolbar, cx| toolbar.focus_changed(false, cx));
690 cx.notify();
691 }
312}692}
313 693
314impl Panel for AssistantPanel {694impl Panel for AssistantPanel {
@@ -361,19 +741,22 @@ impl Panel for AssistantPanel { · 46 unmodified lines
361 matches!(event, AssistantPanelEvent::ZoomOut)741 matches!(event, AssistantPanelEvent::ZoomOut)
362 }742 }
363 743
364 fn is_zoomed(&self, cx: &WindowContext) -> bool {744 fn is_zoomed(&self, _: &WindowContext) -> bool {
365 self.pane.read(cx).is_zoomed()745 self.zoomed
366 }746 }
367 747
368 fn set_zoomed(&mut self, zoomed: bool, cx: &mut ViewContext<Self>) {748 fn set_zoomed(&mut self, zoomed: bool, cx: &mut ViewContext<Self>) {
369 self.pane.update(cx, |pane, cx| pane.set_zoomed(zoomed, cx));749 self.zoomed = zoomed;
750 cx.notify();
370 }751 }
371 752
372 fn set_active(&mut self, active: bool, cx: &mut ViewContext<Self>) {753 fn set_active(&mut self, active: bool, cx: &mut ViewContext<Self>) {
373 if active {754 if active {
374 if self.api_key.borrow().is_none() && !self.has_read_credentials {755 if self.api_key.borrow().is_none() && !self.has_read_credentials {
375 self.has_read_credentials = true;756 self.has_read_credentials = true;
376 let api_key = if let Some((_, api_key)) = cx757 let api_key = if let Ok(api_key) = env::var("OPENAI_API_KEY") {
758 Some(api_key)
759 } else if let Some((_, api_key)) = cx
377 .platform()760 .platform()
378 .read_credentials(OPENAI_API_URL)761 .read_credentials(OPENAI_API_URL)
379 .log_err()762 .log_err()
@@ -391,8 +774,8 @@ impl Panel for AssistantPanel { · 11 unmodified lines
391 }774 }
392 }775 }
393 776
394 if self.pane.read(cx).items_len() == 0 {777 if self.editors.is_empty() {
395 self.add_context(cx);778 self.new_conversation(cx);
396 }779 }
397 }780 }
398 }781 }
@@ -417,12 +800,8 @@ impl Panel for AssistantPanel { · 18 unmodified lines
417 matches!(event, AssistantPanelEvent::Close)800 matches!(event, AssistantPanelEvent::Close)
418 }801 }
419 802
420 fn has_focus(&self, cx: &WindowContext) -> bool {803 fn has_focus(&self, _: &WindowContext) -> bool {
421 self.pane.read(cx).has_focus()804 self.has_focus
422 || self
423 .api_key_editor
424 .as_ref()
425 .map_or(false, |editor| editor.is_focused(cx))
426 }805 }
427 806
428 fn is_focus_event(event: &Self::Event) -> bool {807 fn is_focus_event(event: &Self::Event) -> bool {
@@ -430,18 +809,24 @@ impl Panel for AssistantPanel { · 1 unmodified line
430 }809 }
431}810}
432 811
433enum AssistantEvent {812enum ConversationEvent {
434 MessagesEdited,813 MessagesEdited,
435 SummaryChanged,814 SummaryChanged,
436 StreamedCompletion,815 StreamedCompletion,
437}816}
438 817
439struct Assistant {818#[derive(Default)]
819struct Summary {
820 text: String,
821 done: bool,
822}
823
824struct Conversation {
440 buffer: ModelHandle<Buffer>,825 buffer: ModelHandle<Buffer>,
441 messages: Vec<Message>,826 message_anchors: Vec<MessageAnchor>,
442 messages_metadata: HashMap<MessageId, MessageMetadata>,827 messages_metadata: HashMap<MessageId, MessageMetadata>,
443 next_message_id: MessageId,828 next_message_id: MessageId,
444 summary: Option<String>,829 summary: Option<Summary>,
445 pending_summary: Task<Option<()>>,830 pending_summary: Task<Option<()>>,
446 completion_count: usize,831 completion_count: usize,
447 pending_completions: Vec<PendingCompletion>,832 pending_completions: Vec<PendingCompletion>,
@@ -450,20 +835,22 @@ struct Assistant { · 2 unmodified lines
450 max_token_count: usize,835 max_token_count: usize,
451 pending_token_count: Task<Option<()>>,836 pending_token_count: Task<Option<()>>,
452 api_key: Rc<RefCell<Option<String>>>,837 api_key: Rc<RefCell<Option<String>>>,
838 pending_save: Task<Result<()>>,
839 path: Option<PathBuf>,
453 _subscriptions: Vec<Subscription>,840 _subscriptions: Vec<Subscription>,
454}841}
455 842
456impl Entity for Assistant {843impl Entity for Conversation {
457 type Event = AssistantEvent;844 type Event = ConversationEvent;
458}845}
459 846
460impl Assistant {847impl Conversation {
461 fn new(848 fn new(
462 api_key: Rc<RefCell<Option<String>>>,849 api_key: Rc<RefCell<Option<String>>>,
463 language_registry: Arc<LanguageRegistry>,850 language_registry: Arc<LanguageRegistry>,
464 cx: &mut ModelContext<Self>,851 cx: &mut ModelContext<Self>,
465 ) -> Self {852 ) -> Self {
466 let model = "gpt-3.5-turbo";853 let model = "gpt-3.5-turbo-0613";
467 let markdown = language_registry.language_for_name("Markdown");854 let markdown = language_registry.language_for_name("Markdown");
468 let buffer = cx.add_model(|cx| {855 let buffer = cx.add_model(|cx| {
469 let mut buffer = Buffer::new(0, "", cx);856 let mut buffer = Buffer::new(0, "", cx);
@@ -483,7 +870,7 @@ impl Assistant { · 13 unmodified lines
483 });870 });
484 871
485 let mut this = Self {872 let mut this = Self {
486 messages: Default::default(),873 message_anchors: Default::default(),
487 messages_metadata: Default::default(),874 messages_metadata: Default::default(),
488 next_message_id: Default::default(),875 next_message_id: Default::default(),
489 summary: None,876 summary: None,
@@ -495,20 +882,22 @@ impl Assistant { · 5 unmodified lines
495 pending_token_count: Task::ready(None),882 pending_token_count: Task::ready(None),
496 model: model.into(),883 model: model.into(),
497 _subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],884 _subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
885 pending_save: Task::ready(Ok(())),
886 path: None,
498 api_key,887 api_key,
499 buffer,888 buffer,
500 };889 };
501 let message = Message {890 let message = MessageAnchor {
502 id: MessageId(post_inc(&mut this.next_message_id.0)),891 id: MessageId(post_inc(&mut this.next_message_id.0)),
503 start: language::Anchor::MIN,892 start: language::Anchor::MIN,
504 };893 };
505 this.messages.push(message.clone());894 this.message_anchors.push(message.clone());
506 this.messages_metadata.insert(895 this.messages_metadata.insert(
507 message.id,896 message.id,
508 MessageMetadata {897 MessageMetadata {
509 role: Role::User,898 role: Role::User,
510 sent_at: Local::now(),899 sent_at: Local::now(),
511 error: None,900 status: MessageStatus::Done,
512 },901 },
513 );902 );
514 903
@@ -516,6 +905,88 @@ impl Assistant { · 1 unmodified line
516 this905 this
517 }906 }
518 907
908 fn serialize(&self, cx: &AppContext) -> SavedConversation {
909 SavedConversation {
910 zed: "conversation".into(),
911 version: SavedConversation::VERSION.into(),
912 text: self.buffer.read(cx).text(),
913 message_metadata: self.messages_metadata.clone(),
914 messages: self
915 .messages(cx)
916 .map(|message| SavedMessage {
917 id: message.id,
918 start: message.offset_range.start,
919 })
920 .collect(),
921 summary: self
922 .summary
923 .as_ref()
924 .map(|summary| summary.text.clone())
925 .unwrap_or_default(),
926 model: self.model.clone(),
927 }
928 }
929
930 fn deserialize(
931 saved_conversation: SavedConversation,
932 path: PathBuf,
933 api_key: Rc<RefCell<Option<String>>>,
934 language_registry: Arc<LanguageRegistry>,
935 cx: &mut ModelContext<Self>,
936 ) -> Self {
937 let model = saved_conversation.model;
938 let markdown = language_registry.language_for_name("Markdown");
939 let mut message_anchors = Vec::new();
940 let mut next_message_id = MessageId(0);
941 let buffer = cx.add_model(|cx| {
942 let mut buffer = Buffer::new(0, saved_conversation.text, cx);
943 for message in saved_conversation.messages {
944 message_anchors.push(MessageAnchor {
945 id: message.id,
946 start: buffer.anchor_before(message.start),
947 });
948 next_message_id = cmp::max(next_message_id, MessageId(message.id.0 + 1));
949 }
950 buffer.set_language_registry(language_registry);
951 cx.spawn_weak(|buffer, mut cx| async move {
952 let markdown = markdown.await?;
953 let buffer = buffer
954 .upgrade(&cx)
955 .ok_or_else(|| anyhow!("buffer was dropped"))?;
956 buffer.update(&mut cx, |buffer, cx| {
957 buffer.set_language(Some(markdown), cx)
958 });
959 anyhow::Ok(())
960 })
961 .detach_and_log_err(cx);
962 buffer
963 });
964
965 let mut this = Self {
966 message_anchors,
967 messages_metadata: saved_conversation.message_metadata,
968 next_message_id,
969 summary: Some(Summary {
970 text: saved_conversation.summary,
971 done: true,
972 }),
973 pending_summary: Task::ready(None),
974 completion_count: Default::default(),
975 pending_completions: Default::default(),
976 token_count: None,
977 max_token_count: tiktoken_rs::model::get_context_size(&model),
978 pending_token_count: Task::ready(None),
979 model,
980 _subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
981 pending_save: Task::ready(Ok(())),
982 path: Some(path),
983 api_key,
984 buffer,
985 };
986 this.count_remaining_tokens(cx);
987 this
988 }
989
519 fn handle_buffer_event(990 fn handle_buffer_event(
520 &mut self,991 &mut self,
521 _: ModelHandle<Buffer>,992 _: ModelHandle<Buffer>,
@@ -525,7 +996,7 @@ impl Assistant { · 3 unmodified lines
525 match event {996 match event {
526 language::Event::Edited => {997 language::Event::Edited => {
527 self.count_remaining_tokens(cx);998 self.count_remaining_tokens(cx);
528 cx.emit(AssistantEvent::MessagesEdited);999 cx.emit(ConversationEvent::MessagesEdited);
529 }1000 }
530 _ => {}1001 _ => {}
531 }1002 }
@@ -533,7 +1004,7 @@ impl Assistant { · 1 unmodified line
533 1004
534 fn count_remaining_tokens(&mut self, cx: &mut ModelContext<Self>) {1005 fn count_remaining_tokens(&mut self, cx: &mut ModelContext<Self>) {
535 let messages = self1006 let messages = self
536 .open_ai_request_messages(cx)1007 .messages(cx)
537 .into_iter()1008 .into_iter()
538 .filter_map(|message| {1009 .filter_map(|message| {
539 Some(tiktoken_rs::ChatCompletionRequestMessage {1010 Some(tiktoken_rs::ChatCompletionRequestMessage {
@@ -542,7 +1013,11 @@ impl Assistant { · 2 unmodified lines
542 Role::Assistant => "assistant".into(),1013 Role::Assistant => "assistant".into(),
543 Role::System => "system".into(),1014 Role::System => "system".into(),
544 },1015 },
545 content: message.content,1016 content: self
1017 .buffer
1018 .read(cx)
1019 .text_for_range(message.offset_range)
1020 .collect(),
546 name: None,1021 name: None,
547 })1022 })
548 })1023 })
@@ -557,7 +1032,7 @@ impl Assistant { · 8 unmodified lines
557 .await?;1032 .await?;
558 1033
559 this.upgrade(&cx)1034 this.upgrade(&cx)
560 .ok_or_else(|| anyhow!("assistant was dropped"))?1035 .ok_or_else(|| anyhow!("conversation was dropped"))?
561 .update(&mut cx, |this, cx| {1036 .update(&mut cx, |this, cx| {
562 this.max_token_count = tiktoken_rs::model::get_context_size(&this.model);1037 this.max_token_count = tiktoken_rs::model::get_context_size(&this.model);
563 this.token_count = Some(token_count);1038 this.token_count = Some(token_count);
@@ -579,96 +1054,190 @@ impl Assistant { · 15 unmodified lines
579 cx.notify();1054 cx.notify();
580 }1055 }
581 1056
582 fn assist(&mut self, cx: &mut ModelContext<Self>) -> Option<(Message, Message)> {1057 fn assist(
583 let request = OpenAIRequest {1058 &mut self,
584 model: self.model.clone(),1059 selected_messages: HashSet<MessageId>,
585 messages: self.open_ai_request_messages(cx),1060 cx: &mut ModelContext<Self>,
586 stream: true,1061 ) -> Vec<MessageAnchor> {
587 };1062 let mut user_messages = Vec::new();
1063 let mut tasks = Vec::new();
588 1064
589 let api_key = self.api_key.borrow().clone()?;1065 let last_message_id = self.message_anchors.iter().rev().find_map(|message| {
590 let stream = stream_completion(api_key, cx.background().clone(), request);1066 message
591 let assistant_message =1067 .start
592 self.insert_message_after(self.messages.last()?.id, Role::Assistant, cx)?;1068 .is_valid(self.buffer.read(cx))
593 let user_message = self.insert_message_after(assistant_message.id, Role::User, cx)?;1069 .then_some(message.id)
594 let task = cx.spawn_weak({1070 });
595 |this, mut cx| async move {
596 let assistant_message_id = assistant_message.id;
597 let stream_completion = async {
598 let mut messages = stream.await?;
599
600 while let Some(message) = messages.next().await {
601 let mut message = message?;
602 if let Some(choice) = message.choices.pop() {
603 this.upgrade(&cx)
604 .ok_or_else(|| anyhow!("assistant was dropped"))?
605 .update(&mut cx, |this, cx| {
606 let text: Arc<str> = choice.delta.content?.into();
607 let message_ix = this
608 .messages
609 .iter()
610 .position(|message| message.id == assistant_message_id)?;
611 this.buffer.update(cx, |buffer, cx| {
612 let offset = if message_ix + 1 == this.messages.len() {
613 buffer.len()
614 } else {
615 this.messages[message_ix + 1]
616 .start
617 .to_offset(buffer)
618 .saturating_sub(1)
619 };
620 buffer.edit([(offset..offset, text)], None, cx);
621 });
622 cx.emit(AssistantEvent::StreamedCompletion);
623 1071
624 Some(())1072 for selected_message_id in selected_messages {
625 });1073 let selected_message_role =
626 }1074 if let Some(metadata) = self.messages_metadata.get(&selected_message_id) {
627 }1075 metadata.role
1076 } else {
1077 continue;
1078 };
628 1079
629 this.upgrade(&cx)1080 if selected_message_role == Role::Assistant {
630 .ok_or_else(|| anyhow!("assistant was dropped"))?1081 if let Some(user_message) = self.insert_message_after(
631 .update(&mut cx, |this, cx| {1082 selected_message_id,
632 this.pending_completions1083 Role::User,
633 .retain(|completion| completion.id != this.completion_count);1084 MessageStatus::Done,
634 this.summarize(cx);1085 cx,
635 });1086 ) {
1087 user_messages.push(user_message);
1088 } else {
1089 continue;
1090 }
1091 } else {
1092 let request = OpenAIRequest {
1093 model: self.model.clone(),
1094 messages: self
1095 .messages(cx)
1096 .filter(|message| matches!(message.status, MessageStatus::Done))
1097 .flat_map(|message| {
1098 let mut system_message = None;
1099 if message.id == selected_message_id {
1100 system_message = Some(RequestMessage {
1101 role: Role::System,
1102 content: concat!(
1103 "Treat the following messages as additional knowledge you have learned about, ",
1104 "but act as if they were not part of this conversation. That is, treat them ",
1105 "as if the user didn't see them and couldn't possibly inquire about them."
1106 ).into()
1107 });
1108 }
636 1109
637 anyhow::Ok(())1110 Some(message.to_open_ai_message(self.buffer.read(cx))).into_iter().chain(system_message)
1111 })
1112 .chain(Some(RequestMessage {
1113 role: Role::System,
1114 content: format!(
1115 "Direct your reply to message with id {}. Do not include a [Message X] header.",
1116 selected_message_id.0
1117 ),
1118 }))
1119 .collect(),
1120 stream: true,
638 };1121 };
639 1122
640 let result = stream_completion.await;1123 let Some(api_key) = self.api_key.borrow().clone() else { continue };
641 if let Some(this) = this.upgrade(&cx) {1124 let stream = stream_completion(api_key, cx.background().clone(), request);
642 this.update(&mut cx, |this, cx| {1125 let assistant_message = self
643 if let Err(error) = result {1126 .insert_message_after(
644 if let Some(metadata) =1127 selected_message_id,
645 this.messages_metadata.get_mut(&assistant_message.id)1128 Role::Assistant,
646 {1129 MessageStatus::Pending,
647 metadata.error = Some(error.to_string().trim().into());1130 cx,
648 cx.notify();1131 )
1132 .unwrap();
1133
1134 // Queue up the user's next reply
1135 if Some(selected_message_id) == last_message_id {
1136 let user_message = self
1137 .insert_message_after(
1138 assistant_message.id,
1139 Role::User,
1140 MessageStatus::Done,
1141 cx,
1142 )
1143 .unwrap();
1144 user_messages.push(user_message);
1145 }
1146
1147 tasks.push(cx.spawn_weak({
1148 |this, mut cx| async move {
1149 let assistant_message_id = assistant_message.id;
1150 let stream_completion = async {
1151 let mut messages = stream.await?;
1152
1153 while let Some(message) = messages.next().await {
1154 let mut message = message?;
1155 if let Some(choice) = message.choices.pop() {
1156 this.upgrade(&cx)
1157 .ok_or_else(|| anyhow!("conversation was dropped"))?
1158 .update(&mut cx, |this, cx| {
1159 let text: Arc<str> = choice.delta.content?.into();
1160 let message_ix = this.message_anchors.iter().position(
1161 |message| message.id == assistant_message_id,
1162 )?;
1163 this.buffer.update(cx, |buffer, cx| {
1164 let offset = this.message_anchors[message_ix + 1..]
1165 .iter()
1166 .find(|message| message.start.is_valid(buffer))
1167 .map_or(buffer.len(), |message| {
1168 message
1169 .start
1170 .to_offset(buffer)
1171 .saturating_sub(1)
1172 });
1173 buffer.edit([(offset..offset, text)], None, cx);
1174 });
1175 cx.emit(ConversationEvent::StreamedCompletion);
1176
1177 Some(())
1178 });
1179 }
1180 smol::future::yield_now().await;
649 }1181 }
1182
1183 this.upgrade(&cx)
1184 .ok_or_else(|| anyhow!("conversation was dropped"))?
1185 .update(&mut cx, |this, cx| {
1186 this.pending_completions.retain(|completion| {
1187 completion.id != this.completion_count
1188 });
1189 this.summarize(cx);
1190 });
1191
1192 anyhow::Ok(())
1193 };
1194
1195 let result = stream_completion.await;
1196 if let Some(this) = this.upgrade(&cx) {
1197 this.update(&mut cx, |this, cx| {
1198 if let Some(metadata) =
1199 this.messages_metadata.get_mut(&assistant_message.id)
1200 {
1201 match result {
1202 Ok(_) => {
1203 metadata.status = MessageStatus::Done;
1204 }
1205 Err(error) => {
1206 metadata.status = MessageStatus::Error(
1207 error.to_string().trim().into(),
1208 );
1209 }
1210 }
1211 cx.notify();
1212 }
1213 });
650 }1214 }
651 });1215 }
652 }1216 }));
653 }1217 }
654 });1218 }
655 1219
656 self.pending_completions.push(PendingCompletion {1220 if !tasks.is_empty() {
657 id: post_inc(&mut self.completion_count),1221 self.pending_completions.push(PendingCompletion {
658 _task: task,1222 id: post_inc(&mut self.completion_count),
659 });1223 _tasks: tasks,
660 Some((assistant_message, user_message))1224 });
1225 }
1226
1227 user_messages
661 }1228 }
662 1229
663 fn cancel_last_assist(&mut self) -> bool {1230 fn cancel_last_assist(&mut self) -> bool {
664 self.pending_completions.pop().is_some()1231 self.pending_completions.pop().is_some()
665 }1232 }
666 1233
667 fn cycle_message_role(&mut self, id: MessageId, cx: &mut ModelContext<Self>) {1234 fn cycle_message_roles(&mut self, ids: HashSet<MessageId>, cx: &mut ModelContext<Self>) {
668 if let Some(metadata) = self.messages_metadata.get_mut(&id) {1235 for id in ids {
669 metadata.role.cycle();1236 if let Some(metadata) = self.messages_metadata.get_mut(&id) {
670 cx.emit(AssistantEvent::MessagesEdited);1237 metadata.role.cycle();
671 cx.notify();1238 cx.emit(ConversationEvent::MessagesEdited);
1239 cx.notify();
1240 }
672 }1241 }
673 }1242 }
674 1243
@@ -676,55 +1245,179 @@ impl Assistant { · 1 unmodified line
676 &mut self,1245 &mut self,
677 message_id: MessageId,1246 message_id: MessageId,
678 role: Role,1247 role: Role,
1248 status: MessageStatus,
679 cx: &mut ModelContext<Self>,1249 cx: &mut ModelContext<Self>,
680 ) -> Option<Message> {1250 ) -> Option<MessageAnchor> {
681 if let Some(prev_message_ix) = self1251 if let Some(prev_message_ix) = self
682 .messages1252 .message_anchors
683 .iter()1253 .iter()
684 .position(|message| message.id == message_id)1254 .position(|message| message.id == message_id)
685 {1255 {
1256 // Find the next valid message after the one we were given.
1257 let mut next_message_ix = prev_message_ix + 1;
1258 while let Some(next_message) = self.message_anchors.get(next_message_ix) {
1259 if next_message.start.is_valid(self.buffer.read(cx)) {
1260 break;
1261 }
1262 next_message_ix += 1;
1263 }
1264
686 let start = self.buffer.update(cx, |buffer, cx| {1265 let start = self.buffer.update(cx, |buffer, cx| {
687 let offset = self.messages[prev_message_ix + 1..]1266 let offset = self
688 .iter()1267 .message_anchors
689 .find(|message| message.start.is_valid(buffer))1268 .get(next_message_ix)
690 .map_or(buffer.len(), |message| message.start.to_offset(buffer) - 1);1269 .map_or(buffer.len(), |message| message.start.to_offset(buffer) - 1);
691 buffer.edit([(offset..offset, "\n")], None, cx);1270 buffer.edit([(offset..offset, "\n")], None, cx);
692 buffer.anchor_before(offset + 1)1271 buffer.anchor_before(offset + 1)
693 });1272 });
694 let message = Message {1273 let message = MessageAnchor {
695 id: MessageId(post_inc(&mut self.next_message_id.0)),1274 id: MessageId(post_inc(&mut self.next_message_id.0)),
696 start,1275 start,
697 };1276 };
698 self.messages.insert(prev_message_ix + 1, message.clone());1277 self.message_anchors
1278 .insert(next_message_ix, message.clone());
1279 self.messages_metadata.insert(
1280 message.id,
1281 MessageMetadata {
1282 role,
1283 sent_at: Local::now(),
1284 status,
1285 },
1286 );
1287 cx.emit(ConversationEvent::MessagesEdited);
1288 Some(message)
1289 } else {
1290 None
1291 }
1292 }
1293
1294 fn split_message(
1295 &mut self,
1296 range: Range<usize>,
1297 cx: &mut ModelContext<Self>,
1298 ) -> (Option<MessageAnchor>, Option<MessageAnchor>) {
1299 let start_message = self.message_for_offset(range.start, cx);
1300 let end_message = self.message_for_offset(range.end, cx);
1301 if let Some((start_message, end_message)) = start_message.zip(end_message) {
1302 // Prevent splitting when range spans multiple messages.
1303 if start_message.id != end_message.id {
1304 return (None, None);
1305 }
1306
1307 let message = start_message;
1308 let role = message.role;
1309 let mut edited_buffer = false;
1310
1311 let mut suffix_start = None;
1312 if range.start > message.offset_range.start && range.end < message.offset_range.end - 1
1313 {
1314 if self.buffer.read(cx).chars_at(range.end).next() == Some('\n') {
1315 suffix_start = Some(range.end + 1);
1316 } else if self.buffer.read(cx).reversed_chars_at(range.end).next() == Some('\n') {
1317 suffix_start = Some(range.end);
1318 }
1319 }
1320
1321 let suffix = if let Some(suffix_start) = suffix_start {
1322 MessageAnchor {
1323 id: MessageId(post_inc(&mut self.next_message_id.0)),
1324 start: self.buffer.read(cx).anchor_before(suffix_start),
1325 }
1326 } else {
1327 self.buffer.update(cx, |buffer, cx| {
1328 buffer.edit([(range.end..range.end, "\n")], None, cx);
1329 });
1330 edited_buffer = true;
1331 MessageAnchor {
1332 id: MessageId(post_inc(&mut self.next_message_id.0)),
1333 start: self.buffer.read(cx).anchor_before(range.end + 1),
1334 }
1335 };
1336
1337 self.message_anchors
1338 .insert(message.index_range.end + 1, suffix.clone());
699 self.messages_metadata.insert(1339 self.messages_metadata.insert(
700 message.id,1340 suffix.id,
701 MessageMetadata {1341 MessageMetadata {
702 role,1342 role,
703 sent_at: Local::now(),1343 sent_at: Local::now(),
704 error: None,1344 status: MessageStatus::Done,
705 },1345 },
706 );1346 );
707 cx.emit(AssistantEvent::MessagesEdited);1347
708 Some(message)1348 let new_messages =
1349 if range.start == range.end || range.start == message.offset_range.start {
1350 (None, Some(suffix))
1351 } else {
1352 let mut prefix_end = None;
1353 if range.start > message.offset_range.start
1354 && range.end < message.offset_range.end - 1
1355 {
1356 if self.buffer.read(cx).chars_at(range.start).next() == Some('\n') {
1357 prefix_end = Some(range.start + 1);
1358 } else if self.buffer.read(cx).reversed_chars_at(range.start).next()
1359 == Some('\n')
1360 {
1361 prefix_end = Some(range.start);
1362 }
1363 }
1364
1365 let selection = if let Some(prefix_end) = prefix_end {
1366 cx.emit(ConversationEvent::MessagesEdited);
1367 MessageAnchor {
1368 id: MessageId(post_inc(&mut self.next_message_id.0)),
1369 start: self.buffer.read(cx).anchor_before(prefix_end),
1370 }
1371 } else {
1372 self.buffer.update(cx, |buffer, cx| {
1373 buffer.edit([(range.start..range.start, "\n")], None, cx)
1374 });
1375 edited_buffer = true;
1376 MessageAnchor {
1377 id: MessageId(post_inc(&mut self.next_message_id.0)),
1378 start: self.buffer.read(cx).anchor_before(range.end + 1),
1379 }
1380 };
1381
1382 self.message_anchors
1383 .insert(message.index_range.end + 1, selection.clone());
1384 self.messages_metadata.insert(
1385 selection.id,
1386 MessageMetadata {
1387 role,
1388 sent_at: Local::now(),
1389 status: MessageStatus::Done,
1390 },
1391 );
1392 (Some(selection), Some(suffix))
1393 };
1394
1395 if !edited_buffer {
1396 cx.emit(ConversationEvent::MessagesEdited);
1397 }
1398 new_messages
709 } else {1399 } else {
710 None1400 (None, None)
711 }1401 }
712 }1402 }
713 1403
714 fn summarize(&mut self, cx: &mut ModelContext<Self>) {1404 fn summarize(&mut self, cx: &mut ModelContext<Self>) {
715 if self.messages.len() >= 2 && self.summary.is_none() {1405 if self.message_anchors.len() >= 2 && self.summary.is_none() {
716 let api_key = self.api_key.borrow().clone();1406 let api_key = self.api_key.borrow().clone();
717 if let Some(api_key) = api_key {1407 if let Some(api_key) = api_key {
718 let mut messages = self.open_ai_request_messages(cx);1408 let messages = self
719 messages.truncate(2);1409 .messages(cx)
720 messages.push(RequestMessage {1410 .take(2)
721 role: Role::User,1411 .map(|message| message.to_open_ai_message(self.buffer.read(cx)))
722 content: "Summarize the conversation into a short title without punctuation"1412 .chain(Some(RequestMessage {
723 .into(),1413 role: Role::User,
724 });1414 content:
1415 "Summarize the conversation into a short title without punctuation"
1416 .into(),
1417 }));
725 let request = OpenAIRequest {1418 let request = OpenAIRequest {
726 model: self.model.clone(),1419 model: self.model.clone(),
727 messages,1420 messages: messages.collect(),
728 stream: true,1421 stream: true,
729 };1422 };
730 1423
@@ -738,12 +1431,22 @@ impl Assistant { · 7 unmodified lines
738 if let Some(choice) = message.choices.pop() {1431 if let Some(choice) = message.choices.pop() {
739 let text = choice.delta.content.unwrap_or_default();1432 let text = choice.delta.content.unwrap_or_default();
740 this.update(&mut cx, |this, cx| {1433 this.update(&mut cx, |this, cx| {
741 this.summary.get_or_insert(String::new()).push_str(&text);1434 this.summary
742 cx.emit(AssistantEvent::SummaryChanged);1435 .get_or_insert(Default::default())
1436 .text
1437 .push_str(&text);
1438 cx.emit(ConversationEvent::SummaryChanged);
743 });1439 });
744 }1440 }
745 }1441 }
746 1442
1443 this.update(&mut cx, |this, cx| {
1444 if let Some(summary) = this.summary.as_mut() {
1445 summary.done = true;
1446 cx.emit(ConversationEvent::SummaryChanged);
1447 }
1448 });
1449
747 anyhow::Ok(())1450 anyhow::Ok(())
748 }1451 }
749 .log_err()1452 .log_err()
@@ -752,61 +1455,140 @@ impl Assistant { · 2 unmodified lines
752 }1455 }
753 }1456 }
754 1457
755 fn open_ai_request_messages(&self, cx: &AppContext) -> Vec<RequestMessage> {1458 fn message_for_offset(&self, offset: usize, cx: &AppContext) -> Option<Message> {
756 let buffer = self.buffer.read(cx);1459 self.messages_for_offsets([offset], cx).pop()
757 self.messages(cx)
758 .map(|(_message, metadata, range)| RequestMessage {
759 role: metadata.role,
760 content: buffer.text_for_range(range).collect(),
761 })
762 .collect()
763 }1460 }
764 1461
765 fn message_id_for_offset(&self, offset: usize, cx: &AppContext) -> Option<MessageId> {1462 fn messages_for_offsets(
766 Some(1463 &self,
767 self.messages(cx)1464 offsets: impl IntoIterator<Item = usize>,
768 .find(|(_, _, range)| range.contains(&offset))1465 cx: &AppContext,
769 .map(|(message, _, _)| message)1466 ) -> Vec<Message> {
770 .or(self.messages.last())?1467 let mut result = Vec::new();
771 .id,1468
772 )1469 let mut messages = self.messages(cx).peekable();
1470 let mut offsets = offsets.into_iter().peekable();
1471 let mut current_message = messages.next();
1472 while let Some(offset) = offsets.next() {
1473 // Locate the message that contains the offset.
1474 while current_message.as_ref().map_or(false, |message| {
1475 !message.offset_range.contains(&offset) && messages.peek().is_some()
1476 }) {
1477 current_message = messages.next();
1478 }
1479 let Some(message) = current_message.as_ref() else { break };
1480
1481 // Skip offsets that are in the same message.
1482 while offsets.peek().map_or(false, |offset| {
1483 message.offset_range.contains(offset) || messages.peek().is_none()
1484 }) {
1485 offsets.next();
1486 }
1487
1488 result.push(message.clone());
1489 }
1490 result
773 }1491 }
774 1492
775 fn messages<'a>(1493 fn messages<'a>(&'a self, cx: &'a AppContext) -> impl 'a + Iterator<Item = Message> {
776 &'a self,
777 cx: &'a AppContext,
778 ) -> impl 'a + Iterator<Item = (&Message, &MessageMetadata, Range<usize>)> {
779 let buffer = self.buffer.read(cx);1494 let buffer = self.buffer.read(cx);
780 let mut messages = self.messages.iter().peekable();1495 let mut message_anchors = self.message_anchors.iter().enumerate().peekable();
781 iter::from_fn(move || {1496 iter::from_fn(move || {
782 while let Some(message) = messages.next() {1497 while let Some((start_ix, message_anchor)) = message_anchors.next() {
783 let metadata = self.messages_metadata.get(&message.id)?;1498 let metadata = self.messages_metadata.get(&message_anchor.id)?;
784 let message_start = message.start.to_offset(buffer);1499 let message_start = message_anchor.start.to_offset(buffer);
785 let mut message_end = None;1500 let mut message_end = None;
786 while let Some(next_message) = messages.peek() {1501 let mut end_ix = start_ix;
1502 while let Some((_, next_message)) = message_anchors.peek() {
787 if next_message.start.is_valid(buffer) {1503 if next_message.start.is_valid(buffer) {
788 message_end = Some(next_message.start);1504 message_end = Some(next_message.start);
789 break;1505 break;
790 } else {1506 } else {
791 messages.next();1507 end_ix += 1;
1508 message_anchors.next();
792 }1509 }
793 }1510 }
794 let message_end = message_end1511 let message_end = message_end
795 .unwrap_or(language::Anchor::MAX)1512 .unwrap_or(language::Anchor::MAX)
796 .to_offset(buffer);1513 .to_offset(buffer);
797 return Some((message, metadata, message_start..message_end));1514 return Some(Message {
1515 index_range: start_ix..end_ix,
1516 offset_range: message_start..message_end,
1517 id: message_anchor.id,
1518 anchor: message_anchor.start,
1519 role: metadata.role,
1520 sent_at: metadata.sent_at,
1521 status: metadata.status.clone(),
1522 });
798 }1523 }
799 None1524 None
800 })1525 })
801 }1526 }
1527
1528 fn save(
1529 &mut self,
1530 debounce: Option<Duration>,
1531 fs: Arc<dyn Fs>,
1532 cx: &mut ModelContext<Conversation>,
1533 ) {
1534 self.pending_save = cx.spawn(|this, mut cx| async move {
1535 if let Some(debounce) = debounce {
1536 cx.background().timer(debounce).await;
1537 }
1538
1539 let (old_path, summary) = this.read_with(&cx, |this, _| {
1540 let path = this.path.clone();
1541 let summary = if let Some(summary) = this.summary.as_ref() {
1542 if summary.done {
1543 Some(summary.text.clone())
1544 } else {
1545 None
1546 }
1547 } else {
1548 None
1549 };
1550 (path, summary)
1551 });
1552
1553 if let Some(summary) = summary {
1554 let conversation = this.read_with(&cx, |this, cx| this.serialize(cx));
1555 let path = if let Some(old_path) = old_path {
1556 old_path
1557 } else {
1558 let mut discriminant = 1;
1559 let mut new_path;
1560 loop {
1561 new_path = CONVERSATIONS_DIR.join(&format!(
1562 "{} - {}.zed.json",
1563 summary.trim(),
1564 discriminant
1565 ));
1566 if fs.is_file(&new_path).await {
1567 discriminant += 1;
1568 } else {
1569 break;
1570 }
1571 }
1572 new_path
1573 };
1574
1575 fs.create_dir(CONVERSATIONS_DIR.as_ref()).await?;
1576 fs.atomic_write(path.clone(), serde_json::to_string(&conversation).unwrap())
1577 .await?;
1578 this.update(&mut cx, |this, _| this.path = Some(path));
1579 }
1580
1581 Ok(())
1582 });
1583 }
802}1584}
803 1585
804struct PendingCompletion {1586struct PendingCompletion {
805 id: usize,1587 id: usize,
806 _task: Task<()>,1588 _tasks: Vec<Task<()>>,
807}1589}
808 1590
809enum AssistantEditorEvent {1591enum ConversationEditorEvent {
810 TabContentChanged,1592 TabContentChanged,
811}1593}
812 1594
@@ -816,39 +1598,50 @@ struct ScrollPosition { · 3 unmodified lines
816 cursor: Anchor,1598 cursor: Anchor,
817}1599}
818 1600
819struct AssistantEditor {1601struct ConversationEditor {
820 assistant: ModelHandle<Assistant>,1602 conversation: ModelHandle<Conversation>,
1603 fs: Arc<dyn Fs>,
821 editor: ViewHandle<Editor>,1604 editor: ViewHandle<Editor>,
822 blocks: HashSet<BlockId>,1605 blocks: HashSet<BlockId>,
823 scroll_position: Option<ScrollPosition>,1606 scroll_position: Option<ScrollPosition>,
824 _subscriptions: Vec<Subscription>,1607 _subscriptions: Vec<Subscription>,
825}1608}
826 1609
827impl AssistantEditor {1610impl ConversationEditor {
828 fn new(1611 fn new(
829 api_key: Rc<RefCell<Option<String>>>,1612 api_key: Rc<RefCell<Option<String>>>,
830 language_registry: Arc<LanguageRegistry>,1613 language_registry: Arc<LanguageRegistry>,
1614 fs: Arc<dyn Fs>,
1615 cx: &mut ViewContext<Self>,
1616 ) -> Self {
1617 let conversation = cx.add_model(|cx| Conversation::new(api_key, language_registry, cx));
1618 Self::for_conversation(conversation, fs, cx)
1619 }
1620
1621 fn for_conversation(
1622 conversation: ModelHandle<Conversation>,
1623 fs: Arc<dyn Fs>,
831 cx: &mut ViewContext<Self>,1624 cx: &mut ViewContext<Self>,
832 ) -> Self {1625 ) -> Self {
833 let assistant = cx.add_model(|cx| Assistant::new(api_key, language_registry, cx));
834 let editor = cx.add_view(|cx| {1626 let editor = cx.add_view(|cx| {
835 let mut editor = Editor::for_buffer(assistant.read(cx).buffer.clone(), None, cx);1627 let mut editor = Editor::for_buffer(conversation.read(cx).buffer.clone(), None, cx);
836 editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);1628 editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
837 editor.set_show_gutter(false, cx);1629 editor.set_show_gutter(false, cx);
838 editor1630 editor
839 });1631 });
840 1632
841 let _subscriptions = vec![1633 let _subscriptions = vec![
842 cx.observe(&assistant, |_, _, cx| cx.notify()),1634 cx.observe(&conversation, |_, _, cx| cx.notify()),
843 cx.subscribe(&assistant, Self::handle_assistant_event),1635 cx.subscribe(&conversation, Self::handle_conversation_event),
844 cx.subscribe(&editor, Self::handle_editor_event),1636 cx.subscribe(&editor, Self::handle_editor_event),
845 ];1637 ];
846 1638
847 let mut this = Self {1639 let mut this = Self {
848 assistant,1640 conversation,
849 editor,1641 editor,
850 blocks: Default::default(),1642 blocks: Default::default(),
851 scroll_position: None,1643 scroll_position: None,
1644 fs,
852 _subscriptions,1645 _subscriptions,
853 };1646 };
854 this.update_message_headers(cx);1647 this.update_message_headers(cx);
@@ -856,60 +1649,87 @@ impl AssistantEditor { · 1 unmodified line
856 }1649 }
857 1650
858 fn assist(&mut self, _: &Assist, cx: &mut ViewContext<Self>) {1651 fn assist(&mut self, _: &Assist, cx: &mut ViewContext<Self>) {
859 let user_message = self.assistant.update(cx, |assistant, cx| {1652 let cursors = self.cursors(cx);
860 let editor = self.editor.read(cx);1653
861 let newest_selection = editor1654 let user_messages = self.conversation.update(cx, |conversation, cx| {
862 .selections1655 let selected_messages = conversation
863 .newest_anchor()1656 .messages_for_offsets(cursors, cx)
864 .head()1657 .into_iter()
865 .to_offset(&editor.buffer().read(cx).snapshot(cx));1658 .map(|message| message.id)
866 let message_id = assistant.message_id_for_offset(newest_selection, cx)?;1659 .collect();
867 let metadata = assistant.messages_metadata.get(&message_id)?;1660 conversation.assist(selected_messages, cx)
868 let user_message = if metadata.role == Role::User {
869 let (_, user_message) = assistant.assist(cx)?;
870 user_message
871 } else {
872 let user_message = assistant.insert_message_after(message_id, Role::User, cx)?;
873 user_message
874 };
875 Some(user_message)
876 });1661 });
877 1662 let new_selections = user_messages
878 if let Some(user_message) = user_message {1663 .iter()
879 let cursor = user_message1664 .map(|message| {
880 .start1665 let cursor = message
881 .to_offset(&self.assistant.read(cx).buffer.read(cx));1666 .start
1667 .to_offset(self.conversation.read(cx).buffer.read(cx));
1668 cursor..cursor
1669 })
1670 .collect::<Vec<_>>();
1671 if !new_selections.is_empty() {
882 self.editor.update(cx, |editor, cx| {1672 self.editor.update(cx, |editor, cx| {
883 editor.change_selections(1673 editor.change_selections(
884 Some(Autoscroll::Strategy(AutoscrollStrategy::Fit)),1674 Some(Autoscroll::Strategy(AutoscrollStrategy::Fit)),
885 cx,1675 cx,
886 |selections| selections.select_ranges([cursor..cursor]),1676 |selections| selections.select_ranges(new_selections),
887 );1677 );
888 });1678 });
1679 // Avoid scrolling to the new cursor position so the assistant's output is stable.
1680 cx.defer(|this, _| this.scroll_position = None);
889 }1681 }
890 }1682 }
891 1683
892 fn cancel_last_assist(&mut self, _: &editor::Cancel, cx: &mut ViewContext<Self>) {1684 fn cancel_last_assist(&mut self, _: &editor::Cancel, cx: &mut ViewContext<Self>) {
893 if !self1685 if !self
894 .assistant1686 .conversation
895 .update(cx, |assistant, _| assistant.cancel_last_assist())1687 .update(cx, |conversation, _| conversation.cancel_last_assist())
896 {1688 {
897 cx.propagate_action();1689 cx.propagate_action();
898 }1690 }
899 }1691 }
900 1692
901 fn handle_assistant_event(1693 fn cycle_message_role(&mut self, _: &CycleMessageRole, cx: &mut ViewContext<Self>) {
1694 let cursors = self.cursors(cx);
1695 self.conversation.update(cx, |conversation, cx| {
1696 let messages = conversation
1697 .messages_for_offsets(cursors, cx)
1698 .into_iter()
1699 .map(|message| message.id)
1700 .collect();
1701 conversation.cycle_message_roles(messages, cx)
1702 });
1703 }
1704
1705 fn cursors(&self, cx: &AppContext) -> Vec<usize> {
1706 let selections = self.editor.read(cx).selections.all::<usize>(cx);
1707 selections
1708 .into_iter()
1709 .map(|selection| selection.head())
1710 .collect()
1711 }
1712
1713 fn handle_conversation_event(
902 &mut self,1714 &mut self,
903 _: ModelHandle<Assistant>,1715 _: ModelHandle<Conversation>,
904 event: &AssistantEvent,1716 event: &ConversationEvent,
905 cx: &mut ViewContext<Self>,1717 cx: &mut ViewContext<Self>,
906 ) {1718 ) {
907 match event {1719 match event {
908 AssistantEvent::MessagesEdited => self.update_message_headers(cx),1720 ConversationEvent::MessagesEdited => {
909 AssistantEvent::SummaryChanged => {1721 self.update_message_headers(cx);
910 cx.emit(AssistantEditorEvent::TabContentChanged);1722 self.conversation.update(cx, |conversation, cx| {
1723 conversation.save(Some(Duration::from_millis(500)), self.fs.clone(), cx);
1724 });
1725 }
1726 ConversationEvent::SummaryChanged => {
1727 cx.emit(ConversationEditorEvent::TabContentChanged);
1728 self.conversation.update(cx, |conversation, cx| {
1729 conversation.save(None, self.fs.clone(), cx);
1730 });
911 }1731 }
912 AssistantEvent::StreamedCompletion => {1732 ConversationEvent::StreamedCompletion => {
913 self.editor.update(cx, |editor, cx| {1733 self.editor.update(cx, |editor, cx| {
914 if let Some(scroll_position) = self.scroll_position {1734 if let Some(scroll_position) = self.scroll_position {
915 let snapshot = editor.snapshot(cx);1735 let snapshot = editor.snapshot(cx);
@@ -979,17 +1799,17 @@ impl AssistantEditor { · 63 unmodified lines
979 let excerpt_id = *buffer.as_singleton().unwrap().0;1799 let excerpt_id = *buffer.as_singleton().unwrap().0;
980 let old_blocks = std::mem::take(&mut self.blocks);1800 let old_blocks = std::mem::take(&mut self.blocks);
981 let new_blocks = self1801 let new_blocks = self
982 .assistant1802 .conversation
983 .read(cx)1803 .read(cx)
984 .messages(cx)1804 .messages(cx)
985 .map(|(message, metadata, _)| BlockProperties {1805 .map(|message| BlockProperties {
986 position: buffer.anchor_in_excerpt(excerpt_id, message.start),1806 position: buffer.anchor_in_excerpt(excerpt_id, message.anchor),
987 height: 2,1807 height: 2,
988 style: BlockStyle::Sticky,1808 style: BlockStyle::Sticky,
989 render: Arc::new({1809 render: Arc::new({
990 let assistant = self.assistant.clone();1810 let conversation = self.conversation.clone();
991 let metadata = metadata.clone();1811 // let metadata = message.metadata.clone();
992 let message = message.clone();1812 // let message = message.clone();
993 move |cx| {1813 move |cx| {
994 enum Sender {}1814 enum Sender {}
995 enum ErrorTooltip {}1815 enum ErrorTooltip {}
@@ -1000,21 +1820,21 @@ impl AssistantEditor { · 4 unmodified lines
1000 let sender = MouseEventHandler::<Sender, _>::new(1820 let sender = MouseEventHandler::<Sender, _>::new(
1001 message_id.0,1821 message_id.0,
1002 cx,1822 cx,
1003 |state, _| match metadata.role {1823 |state, _| match message.role {
1004 Role::User => {1824 Role::User => {
1005 let style = style.user_sender.style_for(state, false);1825 let style = style.user_sender.style_for(state);
1006 Label::new("You", style.text.clone())1826 Label::new("You", style.text.clone())
1007 .contained()1827 .contained()
1008 .with_style(style.container)1828 .with_style(style.container)
1009 }1829 }
1010 Role::Assistant => {1830 Role::Assistant => {
1011 let style = style.assistant_sender.style_for(state, false);1831 let style = style.assistant_sender.style_for(state);
1012 Label::new("Assistant", style.text.clone())1832 Label::new("Assistant", style.text.clone())
1013 .contained()1833 .contained()
1014 .with_style(style.container)1834 .with_style(style.container)
1015 }1835 }
1016 Role::System => {1836 Role::System => {
1017 let style = style.system_sender.style_for(state, false);1837 let style = style.system_sender.style_for(state);
1018 Label::new("System", style.text.clone())1838 Label::new("System", style.text.clone())
1019 .contained()1839 .contained()
1020 .with_style(style.container)1840 .with_style(style.container)
@@ -1023,10 +1843,13 @@ impl AssistantEditor { · 2 unmodified lines
1023 )1843 )
1024 .with_cursor_style(CursorStyle::PointingHand)1844 .with_cursor_style(CursorStyle::PointingHand)
1025 .on_down(MouseButton::Left, {1845 .on_down(MouseButton::Left, {
1026 let assistant = assistant.clone();1846 let conversation = conversation.clone();
1027 move |_, _, cx| {1847 move |_, _, cx| {
1028 assistant.update(cx, |assistant, cx| {1848 conversation.update(cx, |conversation, cx| {
1029 assistant.cycle_message_role(message_id, cx)1849 conversation.cycle_message_roles(
1850 HashSet::from_iter(Some(message_id)),
1851 cx,
1852 )
1030 })1853 })
1031 }1854 }
1032 });1855 });
@@ -1035,33 +1858,39 @@ impl AssistantEditor { · 2 unmodified lines
1035 .with_child(sender.aligned())1858 .with_child(sender.aligned())
1036 .with_child(1859 .with_child(
1037 Label::new(1860 Label::new(
1038 metadata.sent_at.format("%I:%M%P").to_string(),1861 message.sent_at.format("%I:%M%P").to_string(),
1039 style.sent_at.text.clone(),1862 style.sent_at.text.clone(),
1040 )1863 )
1041 .contained()1864 .contained()
1042 .with_style(style.sent_at.container)1865 .with_style(style.sent_at.container)
1043 .aligned(),1866 .aligned(),
1044 )1867 )
1045 .with_children(metadata.error.clone().map(|error| {1868 .with_children(
1046 Svg::new("icons/circle_x_mark_12.svg")1869 if let MessageStatus::Error(error) = &message.status {
1047 .with_color(style.error_icon.color)1870 Some(
1048 .constrained()1871 Svg::new("icons/circle_x_mark_12.svg")
1049 .with_width(style.error_icon.width)1872 .with_color(style.error_icon.color)
1050 .contained()1873 .constrained()
1051 .with_style(style.error_icon.container)1874 .with_width(style.error_icon.width)
1052 .with_tooltip::<ErrorTooltip>(1875 .contained()
1053 message_id.0,1876 .with_style(style.error_icon.container)
1054 error,1877 .with_tooltip::<ErrorTooltip>(
1055 None,1878 message_id.0,
1056 theme.tooltip.clone(),1879 error.to_string(),
1057 cx,1880 None,
1881 theme.tooltip.clone(),
1882 cx,
1883 )
1884 .aligned(),
1058 )1885 )
1059 .aligned()1886 } else {
1060 }))1887 None
1888 },
1889 )
1061 .aligned()1890 .aligned()
1062 .left()1891 .left()
1063 .contained()1892 .contained()
1064 .with_style(style.header)1893 .with_style(style.message_header)
1065 .into_any()1894 .into_any()
1066 }1895 }
1067 }),1896 }),
@@ -1083,7 +1912,7 @@ impl AssistantEditor { · 15 unmodified lines
1083 let Some(panel) = workspace.panel::<AssistantPanel>(cx) else {1912 let Some(panel) = workspace.panel::<AssistantPanel>(cx) else {
1084 return;1913 return;
1085 };1914 };
1086 let Some(editor) = workspace.active_item(cx).and_then(|item| item.downcast::<Editor>()) else {1915 let Some(editor) = workspace.active_item(cx).and_then(|item| item.act_as::<Editor>(cx)) else {
1087 return;1916 return;
1088 };1917 };
1089 1918
@@ -1122,41 +1951,36 @@ impl AssistantEditor { · 32 unmodified lines
1122 1951
1123 if let Some(text) = text {1952 if let Some(text) = text {
1124 panel.update(cx, |panel, cx| {1953 panel.update(cx, |panel, cx| {
1125 if let Some(assistant) = panel1954 let conversation = panel
1126 .pane1955 .active_editor()
1127 .read(cx)1956 .cloned()
1128 .active_item()1957 .unwrap_or_else(|| panel.new_conversation(cx));
1129 .and_then(|item| item.downcast::<AssistantEditor>())1958 conversation.update(cx, |conversation, cx| {
1130 .ok_or_else(|| anyhow!("no active context"))1959 conversation
1131 .log_err()1960 .editor
1132 {1961 .update(cx, |editor, cx| editor.insert(&text, cx))
1133 assistant.update(cx, |assistant, cx| {1962 });
1134 assistant
1135 .editor
1136 .update(cx, |editor, cx| editor.insert(&text, cx))
1137 });
1138 }
1139 });1963 });
1140 }1964 }
1141 }1965 }
1142 1966
1143 fn copy(&mut self, _: &editor::Copy, cx: &mut ViewContext<Self>) {1967 fn copy(&mut self, _: &editor::Copy, cx: &mut ViewContext<Self>) {
1144 let editor = self.editor.read(cx);1968 let editor = self.editor.read(cx);
1145 let assistant = self.assistant.read(cx);1969 let conversation = self.conversation.read(cx);
1146 if editor.selections.count() == 1 {1970 if editor.selections.count() == 1 {
1147 let selection = editor.selections.newest::<usize>(cx);1971 let selection = editor.selections.newest::<usize>(cx);
1148 let mut copied_text = String::new();1972 let mut copied_text = String::new();
1149 let mut spanned_messages = 0;1973 let mut spanned_messages = 0;
1150 for (_message, metadata, message_range) in assistant.messages(cx) {1974 for message in conversation.messages(cx) {
1151 if message_range.start >= selection.range().end {1975 if message.offset_range.start >= selection.range().end {
1152 break;1976 break;
1153 } else if message_range.end >= selection.range().start {1977 } else if message.offset_range.end >= selection.range().start {
1154 let range = cmp::max(message_range.start, selection.range().start)1978 let range = cmp::max(message.offset_range.start, selection.range().start)
1155 ..cmp::min(message_range.end, selection.range().end);1979 ..cmp::min(message.offset_range.end, selection.range().end);
1156 if !range.is_empty() {1980 if !range.is_empty() {
1157 spanned_messages += 1;1981 spanned_messages += 1;
1158 write!(&mut copied_text, "## {}\n\n", metadata.role).unwrap();1982 write!(&mut copied_text, "## {}\n\n", message.role).unwrap();
1159 for chunk in assistant.buffer.read(cx).text_for_range(range) {1983 for chunk in conversation.buffer.read(cx).text_for_range(range) {
1160 copied_text.push_str(&chunk);1984 copied_text.push_str(&chunk);
1161 }1985 }
1162 copied_text.push('\n');1986 copied_text.push('\n');
@@ -1174,53 +1998,94 @@ impl AssistantEditor { · 11 unmodified lines
1174 cx.propagate_action();1998 cx.propagate_action();
1175 }1999 }
1176 2000
2001 fn split(&mut self, _: &Split, cx: &mut ViewContext<Self>) {
2002 self.conversation.update(cx, |conversation, cx| {
2003 let selections = self.editor.read(cx).selections.disjoint_anchors();
2004 for selection in selections.into_iter() {
2005 let buffer = self.editor.read(cx).buffer().read(cx).snapshot(cx);
2006 let range = selection
2007 .map(|endpoint| endpoint.to_offset(&buffer))
2008 .range();
2009 conversation.split_message(range, cx);
2010 }
2011 });
2012 }
2013
2014 fn save(&mut self, _: &Save, cx: &mut ViewContext<Self>) {
2015 self.conversation.update(cx, |conversation, cx| {
2016 conversation.save(None, self.fs.clone(), cx)
2017 });
2018 }
2019
1177 fn cycle_model(&mut self, cx: &mut ViewContext<Self>) {2020 fn cycle_model(&mut self, cx: &mut ViewContext<Self>) {
1178 self.assistant.update(cx, |assistant, cx| {2021 self.conversation.update(cx, |conversation, cx| {
1179 let new_model = match assistant.model.as_str() {2022 let new_model = match conversation.model.as_str() {
1180 "gpt-4" => "gpt-3.5-turbo",2023 "gpt-4-0613" => "gpt-3.5-turbo-0613",
1181 _ => "gpt-4",2024 _ => "gpt-4-0613",
1182 };2025 };
1183 assistant.set_model(new_model.into(), cx);2026 conversation.set_model(new_model.into(), cx);
1184 });2027 });
1185 }2028 }
1186 2029
1187 fn title(&self, cx: &AppContext) -> String {2030 fn title(&self, cx: &AppContext) -> String {
1188 self.assistant2031 self.conversation
1189 .read(cx)2032 .read(cx)
1190 .summary2033 .summary
1191 .clone()2034 .as_ref()
1192 .unwrap_or_else(|| "New Context".into())2035 .map(|summary| summary.text.clone())
2036 .unwrap_or_else(|| "New Conversation".into())
1193 }2037 }
1194}
1195 2038
1196impl Entity for AssistantEditor {2039 fn render_current_model(
1197 type Event = AssistantEditorEvent;2040 &self,
1198}2041 style: &AssistantStyle,
2042 cx: &mut ViewContext<Self>,
2043 ) -> impl Element<Self> {
2044 enum Model {}
1199 2045
1200impl View for AssistantEditor {2046 MouseEventHandler::<Model, _>::new(0, cx, |state, cx| {
1201 fn ui_name() -> &'static str {2047 let style = style.model.style_for(state);
1202 "AssistantEditor"2048 Label::new(self.conversation.read(cx).model.clone(), style.text.clone())
2049 .contained()
2050 .with_style(style.container)
2051 })
2052 .with_cursor_style(CursorStyle::PointingHand)
2053 .on_click(MouseButton::Left, |_, this, cx| this.cycle_model(cx))
1203 }2054 }
1204 2055
1205 fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {2056 fn render_remaining_tokens(
1206 enum Model {}2057 &self,
1207 let theme = &theme::current(cx).assistant;2058 style: &AssistantStyle,
1208 let assistant = &self.assistant.read(cx);2059 cx: &mut ViewContext<Self>,
1209 let model = assistant.model.clone();2060 ) -> Option<impl Element<Self>> {
1210 let remaining_tokens = assistant.remaining_tokens().map(|remaining_tokens| {2061 let remaining_tokens = self.conversation.read(cx).remaining_tokens()?;
1211 let remaining_tokens_style = if remaining_tokens <= 0 {2062 let remaining_tokens_style = if remaining_tokens <= 0 {
1212 &theme.no_remaining_tokens2063 &style.no_remaining_tokens
1213 } else {2064 } else {
1214 &theme.remaining_tokens2065 &style.remaining_tokens
1215 };2066 };
2067 Some(
1216 Label::new(2068 Label::new(
1217 remaining_tokens.to_string(),2069 remaining_tokens.to_string(),
1218 remaining_tokens_style.text.clone(),2070 remaining_tokens_style.text.clone(),
1219 )2071 )
1220 .contained()2072 .contained()
1221 .with_style(remaining_tokens_style.container)2073 .with_style(remaining_tokens_style.container),
1222 });2074 )
2075 }
2076}
1223 2077
2078impl Entity for ConversationEditor {
2079 type Event = ConversationEditorEvent;
2080}
2081
2082impl View for ConversationEditor {
2083 fn ui_name() -> &'static str {
2084 "ConversationEditor"
2085 }
2086
2087 fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
2088 let theme = &theme::current(cx).assistant;
1224 Stack::new()2089 Stack::new()
1225 .with_child(2090 .with_child(
1226 ChildView::new(&self.editor, cx)2091 ChildView::new(&self.editor, cx)
@@ -1229,19 +2094,8 @@ impl View for AssistantEditor { · 2 unmodified lines
1229 )2094 )
1230 .with_child(2095 .with_child(
1231 Flex::row()2096 Flex::row()
1232 .with_child(2097 .with_child(self.render_current_model(theme, cx))
1233 MouseEventHandler::<Model, _>::new(0, cx, |state, _| {2098 .with_children(self.render_remaining_tokens(theme, cx))
1234 let style = theme.model.style_for(state, false);
1235 Label::new(model, style.text.clone())
1236 .contained()
1237 .with_style(style.container)
1238 })
1239 .with_cursor_style(CursorStyle::PointingHand)
1240 .on_click(MouseButton::Left, |_, this, cx| this.cycle_model(cx)),
1241 )
1242 .with_children(remaining_tokens)
1243 .contained()
1244 .with_style(theme.model_info_container)
1245 .aligned()2099 .aligned()
1246 .top()2100 .top()
1247 .right(),2101 .right(),
@@ -1256,43 +2110,32 @@ impl View for AssistantEditor { · 8 unmodified lines
1256 }2110 }
1257}2111}
1258 2112
1259impl Item for AssistantEditor {
1260 fn tab_content<V: View>(
1261 &self,
1262 _: Option<usize>,
1263 style: &theme::Tab,
1264 cx: &gpui::AppContext,
1265 ) -> AnyElement<V> {
1266 let title = truncate_and_trailoff(&self.title(cx), editor::MAX_TAB_TITLE_LEN);
1267 Label::new(title, style.label.clone()).into_any()
1268 }
1269
1270 fn tab_tooltip_text(&self, cx: &AppContext) -> Option<Cow<str>> {
1271 Some(self.title(cx).into())
1272 }
1273
1274 fn as_searchable(
1275 &self,
1276 _: &ViewHandle<Self>,
1277 ) -> Option<Box<dyn workspace::searchable::SearchableItemHandle>> {
1278 Some(Box::new(self.editor.clone()))
1279 }
1280}
1281
1282#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Hash)]
1283struct MessageId(usize);
1284
1285#[derive(Clone, Debug)]2113#[derive(Clone, Debug)]
1286struct Message {2114struct MessageAnchor {
1287 id: MessageId,2115 id: MessageId,
1288 start: language::Anchor,2116 start: language::Anchor,
1289}2117}
1290 2118
1291#[derive(Clone, Debug)]2119#[derive(Clone, Debug)]
1292struct MessageMetadata {2120pub struct Message {
2121 offset_range: Range<usize>,
2122 index_range: Range<usize>,
2123 id: MessageId,
2124 anchor: language::Anchor,
1293 role: Role,2125 role: Role,
1294 sent_at: DateTime<Local>,2126 sent_at: DateTime<Local>,
1295 error: Option<String>,2127 status: MessageStatus,
2128}
2129
2130impl Message {
2131 fn to_open_ai_message(&self, buffer: &Buffer) -> RequestMessage {
2132 let mut content = format!("[Message {}]\n", self.id.0).to_string();
2133 content.extend(buffer.text_for_range(self.offset_range.clone()));
2134 RequestMessage {
2135 role: self.role,
2136 content: content.trim_end().into(),
2137 }
2138 }
1296}2139}
1297 2140
1298async fn stream_completion(2141async fn stream_completion(
@@ -1384,27 +2227,28 @@ async fn stream_completion( · 85 unmodified lines
1384#[cfg(test)]2227#[cfg(test)]
1385mod tests {2228mod tests {
1386 use super::*;2229 use super::*;
2230 use crate::MessageId;
1387 use gpui::AppContext;2231 use gpui::AppContext;
1388 2232
1389 #[gpui::test]2233 #[gpui::test]
1390 fn test_inserting_and_removing_messages(cx: &mut AppContext) {2234 fn test_inserting_and_removing_messages(cx: &mut AppContext) {
1391 let registry = Arc::new(LanguageRegistry::test());2235 let registry = Arc::new(LanguageRegistry::test());
1392 let assistant = cx.add_model(|cx| Assistant::new(Default::default(), registry, cx));2236 let conversation = cx.add_model(|cx| Conversation::new(Default::default(), registry, cx));
1393 let buffer = assistant.read(cx).buffer.clone();2237 let buffer = conversation.read(cx).buffer.clone();
1394 2238
1395 let message_1 = assistant.read(cx).messages[0].clone();2239 let message_1 = conversation.read(cx).message_anchors[0].clone();
1396 assert_eq!(2240 assert_eq!(
1397 messages(&assistant, cx),2241 messages(&conversation, cx),
1398 vec![(message_1.id, Role::User, 0..0)]2242 vec![(message_1.id, Role::User, 0..0)]
1399 );2243 );
1400 2244
1401 let message_2 = assistant.update(cx, |assistant, cx| {2245 let message_2 = conversation.update(cx, |conversation, cx| {
1402 assistant2246 conversation
1403 .insert_message_after(message_1.id, Role::Assistant, cx)2247 .insert_message_after(message_1.id, Role::Assistant, MessageStatus::Done, cx)
1404 .unwrap()2248 .unwrap()
1405 });2249 });
1406 assert_eq!(2250 assert_eq!(
1407 messages(&assistant, cx),2251 messages(&conversation, cx),
1408 vec![2252 vec![
1409 (message_1.id, Role::User, 0..1),2253 (message_1.id, Role::User, 0..1),
1410 (message_2.id, Role::Assistant, 1..1)2254 (message_2.id, Role::Assistant, 1..1)
@@ -1415,20 +2259,20 @@ mod tests { · 4 unmodified lines
1415 buffer.edit([(0..0, "1"), (1..1, "2")], None, cx)2259 buffer.edit([(0..0, "1"), (1..1, "2")], None, cx)
1416 });2260 });
1417 assert_eq!(2261 assert_eq!(
1418 messages(&assistant, cx),2262 messages(&conversation, cx),
1419 vec![2263 vec![
1420 (message_1.id, Role::User, 0..2),2264 (message_1.id, Role::User, 0..2),
1421 (message_2.id, Role::Assistant, 2..3)2265 (message_2.id, Role::Assistant, 2..3)
1422 ]2266 ]
1423 );2267 );
1424 2268
1425 let message_3 = assistant.update(cx, |assistant, cx| {2269 let message_3 = conversation.update(cx, |conversation, cx| {
1426 assistant2270 conversation
1427 .insert_message_after(message_2.id, Role::User, cx)2271 .insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
1428 .unwrap()2272 .unwrap()
1429 });2273 });
1430 assert_eq!(2274 assert_eq!(
1431 messages(&assistant, cx),2275 messages(&conversation, cx),
1432 vec![2276 vec![
1433 (message_1.id, Role::User, 0..2),2277 (message_1.id, Role::User, 0..2),
1434 (message_2.id, Role::Assistant, 2..4),2278 (message_2.id, Role::Assistant, 2..4),
@@ -1436,13 +2280,13 @@ mod tests { · 1 unmodified line
1436 ]2280 ]
1437 );2281 );
1438 2282
1439 let message_4 = assistant.update(cx, |assistant, cx| {2283 let message_4 = conversation.update(cx, |conversation, cx| {
1440 assistant2284 conversation
1441 .insert_message_after(message_2.id, Role::User, cx)2285 .insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
1442 .unwrap()2286 .unwrap()
1443 });2287 });
1444 assert_eq!(2288 assert_eq!(
1445 messages(&assistant, cx),2289 messages(&conversation, cx),
1446 vec![2290 vec![
1447 (message_1.id, Role::User, 0..2),2291 (message_1.id, Role::User, 0..2),
1448 (message_2.id, Role::Assistant, 2..4),2292 (message_2.id, Role::Assistant, 2..4),
@@ -1455,7 +2299,7 @@ mod tests { · 6 unmodified lines
1455 buffer.edit([(4..4, "C"), (5..5, "D")], None, cx)2299 buffer.edit([(4..4, "C"), (5..5, "D")], None, cx)
1456 });2300 });
1457 assert_eq!(2301 assert_eq!(
1458 messages(&assistant, cx),2302 messages(&conversation, cx),
1459 vec![2303 vec![
1460 (message_1.id, Role::User, 0..2),2304 (message_1.id, Role::User, 0..2),
1461 (message_2.id, Role::Assistant, 2..4),2305 (message_2.id, Role::Assistant, 2..4),
@@ -1467,7 +2311,7 @@ mod tests { · 5 unmodified lines
1467 // Deleting across message boundaries merges the messages.2311 // Deleting across message boundaries merges the messages.
1468 buffer.update(cx, |buffer, cx| buffer.edit([(1..4, "")], None, cx));2312 buffer.update(cx, |buffer, cx| buffer.edit([(1..4, "")], None, cx));
1469 assert_eq!(2313 assert_eq!(
1470 messages(&assistant, cx),2314 messages(&conversation, cx),
1471 vec![2315 vec![
1472 (message_1.id, Role::User, 0..3),2316 (message_1.id, Role::User, 0..3),
1473 (message_3.id, Role::User, 3..4),2317 (message_3.id, Role::User, 3..4),
@@ -1477,7 +2321,7 @@ mod tests { · 3 unmodified lines
1477 // Undoing the deletion should also undo the merge.2321 // Undoing the deletion should also undo the merge.
1478 buffer.update(cx, |buffer, cx| buffer.undo(cx));2322 buffer.update(cx, |buffer, cx| buffer.undo(cx));
1479 assert_eq!(2323 assert_eq!(
1480 messages(&assistant, cx),2324 messages(&conversation, cx),
1481 vec![2325 vec![
1482 (message_1.id, Role::User, 0..2),2326 (message_1.id, Role::User, 0..2),
1483 (message_2.id, Role::Assistant, 2..4),2327 (message_2.id, Role::Assistant, 2..4),
@@ -1489,7 +2333,7 @@ mod tests { · 5 unmodified lines
1489 // Redoing the deletion should also redo the merge.2333 // Redoing the deletion should also redo the merge.
1490 buffer.update(cx, |buffer, cx| buffer.redo(cx));2334 buffer.update(cx, |buffer, cx| buffer.redo(cx));
1491 assert_eq!(2335 assert_eq!(
1492 messages(&assistant, cx),2336 messages(&conversation, cx),
1493 vec![2337 vec![
1494 (message_1.id, Role::User, 0..3),2338 (message_1.id, Role::User, 0..3),
1495 (message_3.id, Role::User, 3..4),2339 (message_3.id, Role::User, 3..4),
@@ -1497,13 +2341,13 @@ mod tests { · 1 unmodified line
1497 );2341 );
1498 2342
1499 // Ensure we can still insert after a merged message.2343 // Ensure we can still insert after a merged message.
1500 let message_5 = assistant.update(cx, |assistant, cx| {2344 let message_5 = conversation.update(cx, |conversation, cx| {
1501 assistant2345 conversation
1502 .insert_message_after(message_1.id, Role::System, cx)2346 .insert_message_after(message_1.id, Role::System, MessageStatus::Done, cx)
1503 .unwrap()2347 .unwrap()
1504 });2348 });
1505 assert_eq!(2349 assert_eq!(
1506 messages(&assistant, cx),2350 messages(&conversation, cx),
1507 vec![2351 vec![
1508 (message_1.id, Role::User, 0..3),2352 (message_1.id, Role::User, 0..3),
1509 (message_5.id, Role::System, 3..4),2353 (message_5.id, Role::System, 3..4),
@@ -1512,14 +2356,246 @@ mod tests { · 2 unmodified lines
1512 );2356 );
1513 }2357 }
1514 2358
2359 #[gpui::test]
2360 fn test_message_splitting(cx: &mut AppContext) {
2361 let registry = Arc::new(LanguageRegistry::test());
2362 let conversation = cx.add_model(|cx| Conversation::new(Default::default(), registry, cx));
2363 let buffer = conversation.read(cx).buffer.clone();
2364
2365 let message_1 = conversation.read(cx).message_anchors[0].clone();
2366 assert_eq!(
2367 messages(&conversation, cx),
2368 vec![(message_1.id, Role::User, 0..0)]
2369 );
2370
2371 buffer.update(cx, |buffer, cx| {
2372 buffer.edit([(0..0, "aaa\nbbb\nccc\nddd\n")], None, cx)
2373 });
2374
2375 let (_, message_2) =
2376 conversation.update(cx, |conversation, cx| conversation.split_message(3..3, cx));
2377 let message_2 = message_2.unwrap();
2378
2379 // We recycle newlines in the middle of a split message
2380 assert_eq!(buffer.read(cx).text(), "aaa\nbbb\nccc\nddd\n");
2381 assert_eq!(
2382 messages(&conversation, cx),
2383 vec![
2384 (message_1.id, Role::User, 0..4),
2385 (message_2.id, Role::User, 4..16),
2386 ]
2387 );
2388
2389 let (_, message_3) =
2390 conversation.update(cx, |conversation, cx| conversation.split_message(3..3, cx));
2391 let message_3 = message_3.unwrap();
2392
2393 // We don't recycle newlines at the end of a split message
2394 assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\nccc\nddd\n");
2395 assert_eq!(
2396 messages(&conversation, cx),
2397 vec![
2398 (message_1.id, Role::User, 0..4),
2399 (message_3.id, Role::User, 4..5),
2400 (message_2.id, Role::User, 5..17),
2401 ]
2402 );
2403
2404 let (_, message_4) =
2405 conversation.update(cx, |conversation, cx| conversation.split_message(9..9, cx));
2406 let message_4 = message_4.unwrap();
2407 assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\nccc\nddd\n");
2408 assert_eq!(
2409 messages(&conversation, cx),
2410 vec![
2411 (message_1.id, Role::User, 0..4),
2412 (message_3.id, Role::User, 4..5),
2413 (message_2.id, Role::User, 5..9),
2414 (message_4.id, Role::User, 9..17),
2415 ]
2416 );
2417
2418 let (_, message_5) =
2419 conversation.update(cx, |conversation, cx| conversation.split_message(9..9, cx));
2420 let message_5 = message_5.unwrap();
2421 assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\n\nccc\nddd\n");
2422 assert_eq!(
2423 messages(&conversation, cx),
2424 vec![
2425 (message_1.id, Role::User, 0..4),
2426 (message_3.id, Role::User, 4..5),
2427 (message_2.id, Role::User, 5..9),
2428 (message_4.id, Role::User, 9..10),
2429 (message_5.id, Role::User, 10..18),
2430 ]
2431 );
2432
2433 let (message_6, message_7) = conversation.update(cx, |conversation, cx| {
2434 conversation.split_message(14..16, cx)
2435 });
2436 let message_6 = message_6.unwrap();
2437 let message_7 = message_7.unwrap();
2438 assert_eq!(buffer.read(cx).text(), "aaa\n\nbbb\n\nccc\ndd\nd\n");
2439 assert_eq!(
2440 messages(&conversation, cx),
2441 vec![
2442 (message_1.id, Role::User, 0..4),
2443 (message_3.id, Role::User, 4..5),
2444 (message_2.id, Role::User, 5..9),
2445 (message_4.id, Role::User, 9..10),
2446 (message_5.id, Role::User, 10..14),
2447 (message_6.id, Role::User, 14..17),
2448 (message_7.id, Role::User, 17..19),
2449 ]
2450 );
2451 }
2452
2453 #[gpui::test]
2454 fn test_messages_for_offsets(cx: &mut AppContext) {
2455 let registry = Arc::new(LanguageRegistry::test());
2456 let conversation = cx.add_model(|cx| Conversation::new(Default::default(), registry, cx));
2457 let buffer = conversation.read(cx).buffer.clone();
2458
2459 let message_1 = conversation.read(cx).message_anchors[0].clone();
2460 assert_eq!(
2461 messages(&conversation, cx),
2462 vec![(message_1.id, Role::User, 0..0)]
2463 );
2464
2465 buffer.update(cx, |buffer, cx| buffer.edit([(0..0, "aaa")], None, cx));
2466 let message_2 = conversation
2467 .update(cx, |conversation, cx| {
2468 conversation.insert_message_after(message_1.id, Role::User, MessageStatus::Done, cx)
2469 })
2470 .unwrap();
2471 buffer.update(cx, |buffer, cx| buffer.edit([(4..4, "bbb")], None, cx));
2472
2473 let message_3 = conversation
2474 .update(cx, |conversation, cx| {
2475 conversation.insert_message_after(message_2.id, Role::User, MessageStatus::Done, cx)
2476 })
2477 .unwrap();
2478 buffer.update(cx, |buffer, cx| buffer.edit([(8..8, "ccc")], None, cx));
2479
2480 assert_eq!(buffer.read(cx).text(), "aaa\nbbb\nccc");
2481 assert_eq!(
2482 messages(&conversation, cx),
2483 vec![
2484 (message_1.id, Role::User, 0..4),
2485 (message_2.id, Role::User, 4..8),
2486 (message_3.id, Role::User, 8..11)
2487 ]
2488 );
2489
2490 assert_eq!(
2491 message_ids_for_offsets(&conversation, &[0, 4, 9], cx),
2492 [message_1.id, message_2.id, message_3.id]
2493 );
2494 assert_eq!(
2495 message_ids_for_offsets(&conversation, &[0, 1, 11], cx),
2496 [message_1.id, message_3.id]
2497 );
2498
2499 let message_4 = conversation
2500 .update(cx, |conversation, cx| {
2501 conversation.insert_message_after(message_3.id, Role::User, MessageStatus::Done, cx)
2502 })
2503 .unwrap();
2504 assert_eq!(buffer.read(cx).text(), "aaa\nbbb\nccc\n");
2505 assert_eq!(
2506 messages(&conversation, cx),
2507 vec![
2508 (message_1.id, Role::User, 0..4),
2509 (message_2.id, Role::User, 4..8),
2510 (message_3.id, Role::User, 8..12),
2511 (message_4.id, Role::User, 12..12)
2512 ]
2513 );
2514 assert_eq!(
2515 message_ids_for_offsets(&conversation, &[0, 4, 8, 12], cx),
2516 [message_1.id, message_2.id, message_3.id, message_4.id]
2517 );
2518
2519 fn message_ids_for_offsets(
2520 conversation: &ModelHandle<Conversation>,
2521 offsets: &[usize],
2522 cx: &AppContext,
2523 ) -> Vec<MessageId> {
2524 conversation
2525 .read(cx)
2526 .messages_for_offsets(offsets.iter().copied(), cx)
2527 .into_iter()
2528 .map(|message| message.id)
2529 .collect()
2530 }
2531 }
2532
2533 #[gpui::test]
2534 fn test_serialization(cx: &mut AppContext) {
2535 let registry = Arc::new(LanguageRegistry::test());
2536 let conversation =
2537 cx.add_model(|cx| Conversation::new(Default::default(), registry.clone(), cx));
2538 let buffer = conversation.read(cx).buffer.clone();
2539 let message_0 = conversation.read(cx).message_anchors[0].id;
2540 let message_1 = conversation.update(cx, |conversation, cx| {
2541 conversation
2542 .insert_message_after(message_0, Role::Assistant, MessageStatus::Done, cx)
2543 .unwrap()
2544 });
2545 let message_2 = conversation.update(cx, |conversation, cx| {
2546 conversation
2547 .insert_message_after(message_1.id, Role::System, MessageStatus::Done, cx)
2548 .unwrap()
2549 });
2550 buffer.update(cx, |buffer, cx| {
2551 buffer.edit([(0..0, "a"), (1..1, "b\nc")], None, cx);
2552 buffer.finalize_last_transaction();
2553 });
2554 let _message_3 = conversation.update(cx, |conversation, cx| {
2555 conversation
2556 .insert_message_after(message_2.id, Role::System, MessageStatus::Done, cx)
2557 .unwrap()
2558 });
2559 buffer.update(cx, |buffer, cx| buffer.undo(cx));
2560 assert_eq!(buffer.read(cx).text(), "a\nb\nc\n");
2561 assert_eq!(
2562 messages(&conversation, cx),
2563 [
2564 (message_0, Role::User, 0..2),
2565 (message_1.id, Role::Assistant, 2..6),
2566 (message_2.id, Role::System, 6..6),
2567 ]
2568 );
2569
2570 let deserialized_conversation = cx.add_model(|cx| {
2571 Conversation::deserialize(
2572 conversation.read(cx).serialize(cx),
2573 Default::default(),
2574 Default::default(),
2575 registry.clone(),
2576 cx,
2577 )
2578 });
2579 let deserialized_buffer = deserialized_conversation.read(cx).buffer.clone();
2580 assert_eq!(deserialized_buffer.read(cx).text(), "a\nb\nc\n");
2581 assert_eq!(
2582 messages(&deserialized_conversation, cx),
2583 [
2584 (message_0, Role::User, 0..2),
2585 (message_1.id, Role::Assistant, 2..6),
2586 (message_2.id, Role::System, 6..6),
2587 ]
2588 );
2589 }
2590
1515 fn messages(2591 fn messages(
1516 assistant: &ModelHandle<Assistant>,2592 conversation: &ModelHandle<Conversation>,
1517 cx: &AppContext,2593 cx: &AppContext,
1518 ) -> Vec<(MessageId, Role, Range<usize>)> {2594 ) -> Vec<(MessageId, Role, Range<usize>)> {
1519 assistant2595 conversation
1520 .read(cx)2596 .read(cx)
1521 .messages(cx)2597 .messages(cx)
1522 .map(|(message, metadata, range)| (message.id, metadata.role, range))2598 .map(|message| (message.id, message.role, message.offset_range))
1523 .collect()2599 .collect()
1524 }2600 }
1525}2601}
crates/audio/Cargo.toml+23−0
@@ -0,0 +1,23 @@
1[package]
2name = "audio"
3version = "0.1.0"
4edition = "2021"
5publish = false
6
7[lib]
8path = "src/audio.rs"
9doctest = false
10
11[dependencies]
12gpui = { path = "../gpui" }
13collections = { path = "../collections" }
14util = { path = "../util" }
15
16rodio = "0.17.1"
17
18log.workspace = true
19
20anyhow.workspace = true
21parking_lot.workspace = true
22
23[dev-dependencies]
crates/audio/src/assets.rs+44−0
@@ -0,0 +1,44 @@
1use std::{io::Cursor, sync::Arc};
2
3use anyhow::Result;
4use collections::HashMap;
5use gpui::{AppContext, AssetSource};
6use rodio::{
7 source::{Buffered, SamplesConverter},
8 Decoder, Source,
9};
10
11type Sound = Buffered<SamplesConverter<Decoder<Cursor<Vec<u8>>>, f32>>;
12
13pub struct SoundRegistry {
14 cache: Arc<parking_lot::Mutex<HashMap<String, Sound>>>,
15 assets: Box<dyn AssetSource>,
16}
17
18impl SoundRegistry {
19 pub fn new(source: impl AssetSource) -> Arc<Self> {
20 Arc::new(Self {
21 cache: Default::default(),
22 assets: Box::new(source),
23 })
24 }
25
26 pub fn global(cx: &AppContext) -> Arc<Self> {
27 cx.global::<Arc<Self>>().clone()
28 }
29
30 pub fn get(&self, name: &str) -> Result<impl Source<Item = f32>> {
31 if let Some(wav) = self.cache.lock().get(name) {
32 return Ok(wav.clone());
33 }
34
35 let path = format!("sounds/{}.wav", name);
36 let bytes = self.assets.load(&path)?.into_owned();
37 let cursor = Cursor::new(bytes);
38 let source = Decoder::new(cursor)?.convert_samples::<f32>().buffered();
39
40 self.cache.lock().insert(name.to_string(), source.clone());
41
42 Ok(source)
43 }
44}
crates/audio/src/audio.rs+67−0
@@ -0,0 +1,67 @@
1use assets::SoundRegistry;
2use gpui::{AppContext, AssetSource};
3use rodio::{OutputStream, OutputStreamHandle};
4use util::ResultExt;
5
6mod assets;
7
8pub fn init(source: impl AssetSource, cx: &mut AppContext) {
9 cx.set_global(SoundRegistry::new(source));
10 cx.set_global(Audio::new());
11}
12
13pub enum Sound {
14 Joined,
15 Leave,
16 Mute,
17 Unmute,
18 StartScreenshare,
19 StopScreenshare,
20}
21
22impl Sound {
23 fn file(&self) -> &'static str {
24 match self {
25 Self::Joined => "joined_call",
26 Self::Leave => "leave_call",
27 Self::Mute => "mute",
28 Self::Unmute => "unmute",
29 Self::StartScreenshare => "start_screenshare",
30 Self::StopScreenshare => "stop_screenshare",
31 }
32 }
33}
34
35pub struct Audio {
36 _output_stream: Option<OutputStream>,
37 output_handle: Option<OutputStreamHandle>,
38}
39
40impl Audio {
41 pub fn new() -> Self {
42 let (_output_stream, output_handle) = OutputStream::try_default().log_err().unzip();
43
44 Self {
45 _output_stream,
46 output_handle,
47 }
48 }
49
50 pub fn play_sound(sound: Sound, cx: &AppContext) {
51 if !cx.has_global::<Self>() {
52 return;
53 }
54
55 let this = cx.global::<Self>();
56
57 let Some(output_handle) = this.output_handle.as_ref() else {
58 return;
59 };
60
61 let Some(source) = SoundRegistry::global(cx).get(sound.file()).log_err() else {
62 return;
63 };
64
65 output_handle.play_raw(source).log_err();
66 }
67}
crates/auto_update/src/update_notification.rs+2−2
@@ -49,7 +49,7 @@ impl View for UpdateNotification { · 48 unmodified lines
49 )49 )
50 .with_child(50 .with_child(
51 MouseEventHandler::<Cancel, _>::new(0, cx, |state, _| {51 MouseEventHandler::<Cancel, _>::new(0, cx, |state, _| {
52 let style = theme.dismiss_button.style_for(state, false);52 let style = theme.dismiss_button.style_for(state);
53 Svg::new("icons/x_mark_8.svg")53 Svg::new("icons/x_mark_8.svg")
54 .with_color(style.color)54 .with_color(style.color)
55 .constrained()55 .constrained()
@@ -74,7 +74,7 @@ impl View for UpdateNotification { · 18 unmodified lines
74 ),74 ),
75 )75 )
76 .with_child({76 .with_child({
77 let style = theme.action_message.style_for(state, false);77 let style = theme.action_message.style_for(state);
78 Text::new("View the release notes", style.text.clone())78 Text::new("View the release notes", style.text.clone())
79 .contained()79 .contained()
80 .with_style(style.container)80 .with_style(style.container)
crates/breadcrumbs/src/breadcrumbs.rs+1−1
@@ -83,7 +83,7 @@ impl View for Breadcrumbs { · 82 unmodified lines
83 }83 }
84 84
85 MouseEventHandler::<Breadcrumbs, Breadcrumbs>::new(0, cx, |state, _| {85 MouseEventHandler::<Breadcrumbs, Breadcrumbs>::new(0, cx, |state, _| {
86 let style = style.style_for(state, false);86 let style = style.style_for(state);
87 crumbs.with_style(style.container)87 crumbs.with_style(style.container)
88 })88 })
89 .on_click(MouseButton::Left, |_, this, cx| {89 .on_click(MouseButton::Left, |_, this, cx| {
crates/call/Cargo.toml+1−0
@@ -19,6 +19,7 @@ test-support = [ · 18 unmodified lines
19]19]
20 20
21[dependencies]21[dependencies]
22audio = { path = "../audio" }
22client = { path = "../client" }23client = { path = "../client" }
23collections = { path = "../collections" }24collections = { path = "../collections" }
24gpui = { path = "../gpui" }25gpui = { path = "../gpui" }
crates/call/src/participant.rs+5−1
@@ -3,6 +3,7 @@ use client::{proto, User}; · 2 unmodified lines
3use collections::HashMap;3use collections::HashMap;
4use gpui::WeakModelHandle;4use gpui::WeakModelHandle;
5pub use live_kit_client::Frame;5pub use live_kit_client::Frame;
6use live_kit_client::RemoteAudioTrack;
6use project::Project;7use project::Project;
7use std::{fmt, sync::Arc};8use std::{fmt, sync::Arc};
8 9
@@ -42,7 +43,10 @@ pub struct RemoteParticipant { · 33 unmodified lines
42 pub peer_id: proto::PeerId,43 pub peer_id: proto::PeerId,
43 pub projects: Vec<proto::ParticipantProject>,44 pub projects: Vec<proto::ParticipantProject>,
44 pub location: ParticipantLocation,45 pub location: ParticipantLocation,
45 pub tracks: HashMap<live_kit_client::Sid, Arc<RemoteVideoTrack>>,46 pub muted: bool,
47 pub speaking: bool,
48 pub video_tracks: HashMap<live_kit_client::Sid, Arc<RemoteVideoTrack>>,
49 pub audio_tracks: HashMap<live_kit_client::Sid, Arc<RemoteAudioTrack>>,
46}50}
47 51
48#[derive(Clone)]52#[derive(Clone)]
crates/call/src/room.rs+397−31
@@ -3,6 +3,7 @@ use crate::{ · 2 unmodified lines
3 IncomingCall,3 IncomingCall,
4};4};
5use anyhow::{anyhow, Result};5use anyhow::{anyhow, Result};
6use audio::{Audio, Sound};
6use client::{7use client::{
7 proto::{self, PeerId},8 proto::{self, PeerId},
8 Client, TypedEnvelope, User, UserStore,9 Client, TypedEnvelope, User, UserStore,
@@ -12,7 +13,10 @@ use fs::Fs; · 3 unmodified lines
12use futures::{FutureExt, StreamExt};13use futures::{FutureExt, StreamExt};
13use gpui::{AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, Task, WeakModelHandle};14use gpui::{AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, Task, WeakModelHandle};
14use language::LanguageRegistry;15use language::LanguageRegistry;
15use live_kit_client::{LocalTrackPublication, LocalVideoTrack, RemoteVideoTrackUpdate};16use live_kit_client::{
17 LocalAudioTrack, LocalTrackPublication, LocalVideoTrack, RemoteAudioTrackUpdate,
18 RemoteVideoTrackUpdate,
19};
16use postage::stream::Stream;20use postage::stream::Stream;
17use project::Project;21use project::Project;
18use std::{future::Future, mem, pin::Pin, sync::Arc, time::Duration};22use std::{future::Future, mem, pin::Pin, sync::Arc, time::Duration};
@@ -28,6 +32,9 @@ pub enum Event { · 9 unmodified lines
28 RemoteVideoTracksChanged {32 RemoteVideoTracksChanged {
29 participant_id: proto::PeerId,33 participant_id: proto::PeerId,
30 },34 },
35 RemoteAudioTracksChanged {
36 participant_id: proto::PeerId,
37 },
31 RemoteProjectShared {38 RemoteProjectShared {
32 owner: Arc<User>,39 owner: Arc<User>,
33 project_id: u64,40 project_id: u64,
@@ -112,9 +119,9 @@ impl Room { · 78 unmodified lines
112 }119 }
113 });120 });
114 121
115 let mut track_changes = room.remote_video_track_updates();122 let mut track_video_changes = room.remote_video_track_updates();
116 let _maintain_tracks = cx.spawn_weak(|this, mut cx| async move {123 let _maintain_video_tracks = cx.spawn_weak(|this, mut cx| async move {
117 while let Some(track_change) = track_changes.next().await {124 while let Some(track_change) = track_video_changes.next().await {
118 let this = if let Some(this) = this.upgrade(&cx) {125 let this = if let Some(this) = this.upgrade(&cx) {
119 this126 this
120 } else {127 } else {
@@ -127,16 +134,42 @@ impl Room { · 6 unmodified lines
127 }134 }
128 });135 });
129 136
130 cx.foreground()137 let mut track_audio_changes = room.remote_audio_track_updates();
131 .spawn(room.connect(&connection_info.server_url, &connection_info.token))138 let _maintain_audio_tracks = cx.spawn_weak(|this, mut cx| async move {
132 .detach_and_log_err(cx);139 while let Some(track_change) = track_audio_changes.next().await {
140 let this = if let Some(this) = this.upgrade(&cx) {
141 this
142 } else {
143 break;
144 };
145
146 this.update(&mut cx, |this, cx| {
147 this.remote_audio_track_updated(track_change, cx).log_err()
148 });
149 }
150 });
151
152 let connect = room.connect(&connection_info.server_url, &connection_info.token);
153 cx.spawn(|this, mut cx| async move {
154 connect.await?;
155
156 this.update(&mut cx, |this, cx| this.share_microphone(cx))
157 .await?;
158
159 anyhow::Ok(())
160 })
161 .detach_and_log_err(cx);
133 162
134 Some(LiveKitRoom {163 Some(LiveKitRoom {
135 room,164 room,
136 screen_track: ScreenTrack::None,165 screen_track: LocalTrack::None,
166 microphone_track: LocalTrack::None,
137 next_publish_id: 0,167 next_publish_id: 0,
168 muted_by_user: false,
169 deafened: false,
170 speaking: false,
138 _maintain_room,171 _maintain_room,
139 _maintain_tracks,172 _maintain_tracks: [_maintain_video_tracks, _maintain_audio_tracks],
140 })173 })
141 } else {174 } else {
142 None175 None
@@ -145,6 +178,8 @@ impl Room { · 2 unmodified lines
145 let maintain_connection =178 let maintain_connection =
146 cx.spawn_weak(|this, cx| Self::maintain_connection(this, client.clone(), cx).log_err());179 cx.spawn_weak(|this, cx| Self::maintain_connection(this, client.clone(), cx).log_err());
147 180
181 Audio::play_sound(Sound::Joined, cx);
182
148 Self {183 Self {
149 id,184 id,
150 live_kit: live_kit_room,185 live_kit: live_kit_room,
@@ -234,6 +269,7 @@ impl Room { · 83 unmodified lines
234 room.apply_room_update(room_proto, cx)?;269 room.apply_room_update(room_proto, cx)?;
235 anyhow::Ok(())270 anyhow::Ok(())
236 })?;271 })?;
272
237 Ok(room)273 Ok(room)
238 })274 })
239 }275 }
@@ -275,6 +311,8 @@ impl Room { · 35 unmodified lines
275 }311 }
276 }312 }
277 313
314 Audio::play_sound(Sound::Leave, cx);
315
278 self.status = RoomStatus::Offline;316 self.status = RoomStatus::Offline;
279 self.remote_participants.clear();317 self.remote_participants.clear();
280 self.pending_participants.clear();318 self.pending_participants.clear();
@@ -618,20 +656,34 @@ impl Room { · 337 unmodified lines
618 peer_id,656 peer_id,
619 projects: participant.projects,657 projects: participant.projects,
620 location,658 location,
621 tracks: Default::default(),659 muted: false,
660 speaking: false,
661 video_tracks: Default::default(),
662 audio_tracks: Default::default(),
622 },663 },
623 );664 );
624 665
666 Audio::play_sound(Sound::Joined, cx);
667
625 if let Some(live_kit) = this.live_kit.as_ref() {668 if let Some(live_kit) = this.live_kit.as_ref() {
626 let tracks =669 let video_tracks =
627 live_kit.room.remote_video_tracks(&user.id.to_string());670 live_kit.room.remote_video_tracks(&user.id.to_string());
628 for track in tracks {671 let audio_tracks =
672 live_kit.room.remote_audio_tracks(&user.id.to_string());
673 for track in video_tracks {
629 this.remote_video_track_updated(674 this.remote_video_track_updated(
630 RemoteVideoTrackUpdate::Subscribed(track),675 RemoteVideoTrackUpdate::Subscribed(track),
631 cx,676 cx,
632 )677 )
633 .log_err();678 .log_err();
634 }679 }
680 for track in audio_tracks {
681 this.remote_audio_track_updated(
682 RemoteAudioTrackUpdate::Subscribed(track),
683 cx,
684 )
685 .log_err();
686 }
635 }687 }
636 }688 }
637 }689 }
@@ -706,7 +758,7 @@ impl Room { · 68 unmodified lines
706 .remote_participants758 .remote_participants
707 .get_mut(&user_id)759 .get_mut(&user_id)
708 .ok_or_else(|| anyhow!("subscribed to track by unknown participant"))?;760 .ok_or_else(|| anyhow!("subscribed to track by unknown participant"))?;
709 participant.tracks.insert(761 participant.video_tracks.insert(
710 track_id.clone(),762 track_id.clone(),
711 Arc::new(RemoteVideoTrack {763 Arc::new(RemoteVideoTrack {
712 live_kit_track: track,764 live_kit_track: track,
@@ -725,7 +777,7 @@ impl Room { · 12 unmodified lines
725 .remote_participants777 .remote_participants
726 .get_mut(&user_id)778 .get_mut(&user_id)
727 .ok_or_else(|| anyhow!("unsubscribed from track by unknown participant"))?;779 .ok_or_else(|| anyhow!("unsubscribed from track by unknown participant"))?;
728 participant.tracks.remove(&track_id);780 participant.video_tracks.remove(&track_id);
729 cx.emit(Event::RemoteVideoTracksChanged {781 cx.emit(Event::RemoteVideoTracksChanged {
730 participant_id: participant.peer_id,782 participant_id: participant.peer_id,
731 });783 });
@@ -736,6 +788,84 @@ impl Room { · 4 unmodified lines
736 Ok(())788 Ok(())
737 }789 }
738 790
791 fn remote_audio_track_updated(
792 &mut self,
793 change: RemoteAudioTrackUpdate,
794 cx: &mut ModelContext<Self>,
795 ) -> Result<()> {
796 match change {
797 RemoteAudioTrackUpdate::ActiveSpeakersChanged { speakers } => {
798 let mut speaker_ids = speakers
799 .into_iter()
800 .filter_map(|speaker_sid| speaker_sid.parse().ok())
801 .collect::<Vec<u64>>();
802 speaker_ids.sort_unstable();
803 for (sid, participant) in &mut self.remote_participants {
804 if let Ok(_) = speaker_ids.binary_search(sid) {
805 participant.speaking = true;
806 } else {
807 participant.speaking = false;
808 }
809 }
810 if let Some(id) = self.client.user_id() {
811 if let Some(room) = &mut self.live_kit {
812 if let Ok(_) = speaker_ids.binary_search(&id) {
813 room.speaking = true;
814 } else {
815 room.speaking = false;
816 }
817 }
818 }
819 cx.notify();
820 }
821 RemoteAudioTrackUpdate::MuteChanged { track_id, muted } => {
822 for participant in &mut self.remote_participants.values_mut() {
823 let mut found = false;
824 for track in participant.audio_tracks.values() {
825 if track.sid() == track_id {
826 found = true;
827 break;
828 }
829 }
830 if found {
831 participant.muted = muted;
832 break;
833 }
834 }
835 cx.notify();
836 }
837 RemoteAudioTrackUpdate::Subscribed(track) => {
838 let user_id = track.publisher_id().parse()?;
839 let track_id = track.sid().to_string();
840 let participant = self
841 .remote_participants
842 .get_mut(&user_id)
843 .ok_or_else(|| anyhow!("subscribed to track by unknown participant"))?;
844 participant.audio_tracks.insert(track_id.clone(), track);
845 cx.emit(Event::RemoteAudioTracksChanged {
846 participant_id: participant.peer_id,
847 });
848 }
849 RemoteAudioTrackUpdate::Unsubscribed {
850 publisher_id,
851 track_id,
852 } => {
853 let user_id = publisher_id.parse()?;
854 let participant = self
855 .remote_participants
856 .get_mut(&user_id)
857 .ok_or_else(|| anyhow!("unsubscribed from track by unknown participant"))?;
858 participant.audio_tracks.remove(&track_id);
859 cx.emit(Event::RemoteAudioTracksChanged {
860 participant_id: participant.peer_id,
861 });
862 }
863 }
864
865 cx.notify();
866 Ok(())
867 }
868
739 fn check_invariants(&self) {869 fn check_invariants(&self) {
740 #[cfg(any(test, feature = "test-support"))]870 #[cfg(any(test, feature = "test-support"))]
741 {871 {
@@ -801,6 +931,7 @@ impl Room { · 59 unmodified lines
801 cx.spawn(|this, mut cx| async move {931 cx.spawn(|this, mut cx| async move {
802 let project =932 let project =
803 Project::remote(id, client, user_store, language_registry, fs, cx.clone()).await?;933 Project::remote(id, client, user_store, language_registry, fs, cx.clone()).await?;
934
804 this.update(&mut cx, |this, cx| {935 this.update(&mut cx, |this, cx| {
805 this.joined_projects.retain(|project| {936 this.joined_projects.retain(|project| {
806 if let Some(project) = project.upgrade(cx) {937 if let Some(project) = project.upgrade(cx) {
@@ -908,7 +1039,116 @@ impl Room { · 101 unmodified lines
908 1039
909 pub fn is_screen_sharing(&self) -> bool {1040 pub fn is_screen_sharing(&self) -> bool {
910 self.live_kit.as_ref().map_or(false, |live_kit| {1041 self.live_kit.as_ref().map_or(false, |live_kit| {
911 !matches!(live_kit.screen_track, ScreenTrack::None)1042 !matches!(live_kit.screen_track, LocalTrack::None)
1043 })
1044 }
1045
1046 pub fn is_sharing_mic(&self) -> bool {
1047 self.live_kit.as_ref().map_or(false, |live_kit| {
1048 !matches!(live_kit.microphone_track, LocalTrack::None)
1049 })
1050 }
1051
1052 pub fn is_muted(&self) -> bool {
1053 self.live_kit
1054 .as_ref()
1055 .and_then(|live_kit| match &live_kit.microphone_track {
1056 LocalTrack::None => None,
1057 LocalTrack::Pending { muted, .. } => Some(*muted),
1058 LocalTrack::Published { muted, .. } => Some(*muted),
1059 })
1060 .unwrap_or(false)
1061 }
1062
1063 pub fn is_speaking(&self) -> bool {
1064 self.live_kit
1065 .as_ref()
1066 .map_or(false, |live_kit| live_kit.speaking)
1067 }
1068
1069 pub fn is_deafened(&self) -> Option<bool> {
1070 self.live_kit.as_ref().map(|live_kit| live_kit.deafened)
1071 }
1072
1073 pub fn share_microphone(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
1074 if self.status.is_offline() {
1075 return Task::ready(Err(anyhow!("room is offline")));
1076 } else if self.is_sharing_mic() {
1077 return Task::ready(Err(anyhow!("microphone was already shared")));
1078 }
1079
1080 let publish_id = if let Some(live_kit) = self.live_kit.as_mut() {
1081 let publish_id = post_inc(&mut live_kit.next_publish_id);
1082 live_kit.microphone_track = LocalTrack::Pending {
1083 publish_id,
1084 muted: false,
1085 };
1086 cx.notify();
1087 publish_id
1088 } else {
1089 return Task::ready(Err(anyhow!("live-kit was not initialized")));
1090 };
1091
1092 cx.spawn_weak(|this, mut cx| async move {
1093 let publish_track = async {
1094 let track = LocalAudioTrack::create();
1095 this.upgrade(&cx)
1096 .ok_or_else(|| anyhow!("room was dropped"))?
1097 .read_with(&cx, |this, _| {
1098 this.live_kit
1099 .as_ref()
1100 .map(|live_kit| live_kit.room.publish_audio_track(&track))
1101 })
1102 .ok_or_else(|| anyhow!("live-kit was not initialized"))?
1103 .await
1104 };
1105
1106 let publication = publish_track.await;
1107 this.upgrade(&cx)
1108 .ok_or_else(|| anyhow!("room was dropped"))?
1109 .update(&mut cx, |this, cx| {
1110 let live_kit = this
1111 .live_kit
1112 .as_mut()
1113 .ok_or_else(|| anyhow!("live-kit was not initialized"))?;
1114
1115 let (canceled, muted) = if let LocalTrack::Pending {
1116 publish_id: cur_publish_id,
1117 muted,
1118 } = &live_kit.microphone_track
1119 {
1120 (*cur_publish_id != publish_id, *muted)
1121 } else {
1122 (true, false)
1123 };
1124
1125 match publication {
1126 Ok(publication) => {
1127 if canceled {
1128 live_kit.room.unpublish_track(publication);
1129 } else {
1130 if muted {
1131 cx.background().spawn(publication.set_mute(muted)).detach();
1132 }
1133 live_kit.microphone_track = LocalTrack::Published {
1134 track_publication: publication,
1135 muted,
1136 };
1137 cx.notify();
1138 }
1139 Ok(())
1140 }
1141 Err(error) => {
1142 if canceled {
1143 Ok(())
1144 } else {
1145 live_kit.microphone_track = LocalTrack::None;
1146 cx.notify();
1147 Err(error)
1148 }
1149 }
1150 }
1151 })
912 })1152 })
913 }1153 }
914 1154
@@ -921,7 +1161,10 @@ impl Room { · 6 unmodified lines
921 1161
922 let (displays, publish_id) = if let Some(live_kit) = self.live_kit.as_mut() {1162 let (displays, publish_id) = if let Some(live_kit) = self.live_kit.as_mut() {
923 let publish_id = post_inc(&mut live_kit.next_publish_id);1163 let publish_id = post_inc(&mut live_kit.next_publish_id);
924 live_kit.screen_track = ScreenTrack::Pending { publish_id };1164 live_kit.screen_track = LocalTrack::Pending {
1165 publish_id,
1166 muted: false,
1167 };
925 cx.notify();1168 cx.notify();
926 (live_kit.room.display_sources(), publish_id)1169 (live_kit.room.display_sources(), publish_id)
927 } else {1170 } else {
@@ -955,13 +1198,14 @@ impl Room { · 27 unmodified lines
955 .as_mut()1198 .as_mut()
956 .ok_or_else(|| anyhow!("live-kit was not initialized"))?;1199 .ok_or_else(|| anyhow!("live-kit was not initialized"))?;
957 1200
958 let canceled = if let ScreenTrack::Pending {1201 let (canceled, muted) = if let LocalTrack::Pending {
959 publish_id: cur_publish_id,1202 publish_id: cur_publish_id,
1203 muted,
960 } = &live_kit.screen_track1204 } = &live_kit.screen_track
961 {1205 {
962 *cur_publish_id != publish_id1206 (*cur_publish_id != publish_id, *muted)
963 } else {1207 } else {
964 true1208 (true, false)
965 };1209 };
966 1210
967 match publication {1211 match publication {
@@ -969,16 +1213,25 @@ impl Room { · 1 unmodified line
969 if canceled {1213 if canceled {
970 live_kit.room.unpublish_track(publication);1214 live_kit.room.unpublish_track(publication);
971 } else {1215 } else {
972 live_kit.screen_track = ScreenTrack::Published(publication);1216 if muted {
1217 cx.background().spawn(publication.set_mute(muted)).detach();
1218 }
1219 live_kit.screen_track = LocalTrack::Published {
1220 track_publication: publication,
1221 muted,
1222 };
973 cx.notify();1223 cx.notify();
974 }1224 }
1225
1226 Audio::play_sound(Sound::StartScreenshare, cx);
1227
975 Ok(())1228 Ok(())
976 }1229 }
977 Err(error) => {1230 Err(error) => {
978 if canceled {1231 if canceled {
979 Ok(())1232 Ok(())
980 } else {1233 } else {
981 live_kit.screen_track = ScreenTrack::None;1234 live_kit.screen_track = LocalTrack::None;
982 cx.notify();1235 cx.notify();
983 Err(error)1236 Err(error)
984 }1237 }
@@ -988,6 +1241,59 @@ impl Room { · 3 unmodified lines
988 })1241 })
989 }1242 }
990 1243
1244 pub fn toggle_mute(&mut self, cx: &mut ModelContext<Self>) -> Result<Task<Result<()>>> {
1245 let should_mute = !self.is_muted();
1246 if let Some(live_kit) = self.live_kit.as_mut() {
1247 let (ret_task, old_muted) = live_kit.set_mute(should_mute, cx)?;
1248 live_kit.muted_by_user = should_mute;
1249
1250 if old_muted == true && live_kit.deafened == true {
1251 if let Some(task) = self.toggle_deafen(cx).ok() {
1252 task.detach();
1253 }
1254 }
1255
1256 Ok(ret_task)
1257 } else {
1258 Err(anyhow!("LiveKit not started"))
1259 }
1260 }
1261
1262 pub fn toggle_deafen(&mut self, cx: &mut ModelContext<Self>) -> Result<Task<Result<()>>> {
1263 if let Some(live_kit) = self.live_kit.as_mut() {
1264 (*live_kit).deafened = !live_kit.deafened;
1265
1266 let mut tasks = Vec::with_capacity(self.remote_participants.len());
1267 // Context notification is sent within set_mute itself.
1268 let mut mute_task = None;
1269 // When deafening, mute user's mic as well.
1270 // When undeafening, unmute user's mic unless it was manually muted prior to deafening.
1271 if live_kit.deafened || !live_kit.muted_by_user {
1272 mute_task = Some(live_kit.set_mute(live_kit.deafened, cx)?.0);
1273 };
1274 for participant in self.remote_participants.values() {
1275 for track in live_kit
1276 .room
1277 .remote_audio_track_publications(&participant.user.id.to_string())
1278 {
1279 tasks.push(cx.foreground().spawn(track.set_enabled(!live_kit.deafened)));
1280 }
1281 }
1282
1283 Ok(cx.foreground().spawn(async move {
1284 if let Some(mute_task) = mute_task {
1285 mute_task.await?;
1286 }
1287 for task in tasks {
1288 task.await?;
1289 }
1290 Ok(())
1291 }))
1292 } else {
1293 Err(anyhow!("LiveKit not started"))
1294 }
1295 }
1296
991 pub fn unshare_screen(&mut self, cx: &mut ModelContext<Self>) -> Result<()> {1297 pub fn unshare_screen(&mut self, cx: &mut ModelContext<Self>) -> Result<()> {
992 if self.status.is_offline() {1298 if self.status.is_offline() {
993 return Err(anyhow!("room is offline"));1299 return Err(anyhow!("room is offline"));
@@ -998,14 +1304,18 @@ impl Room { · 4 unmodified lines
998 .as_mut()1304 .as_mut()
999 .ok_or_else(|| anyhow!("live-kit was not initialized"))?;1305 .ok_or_else(|| anyhow!("live-kit was not initialized"))?;
1000 match mem::take(&mut live_kit.screen_track) {1306 match mem::take(&mut live_kit.screen_track) {
1001 ScreenTrack::None => Err(anyhow!("screen was not shared")),1307 LocalTrack::None => Err(anyhow!("screen was not shared")),
1002 ScreenTrack::Pending { .. } => {1308 LocalTrack::Pending { .. } => {
1003 cx.notify();1309 cx.notify();
1004 Ok(())1310 Ok(())
1005 }1311 }
1006 ScreenTrack::Published(track) => {1312 LocalTrack::Published {
1007 live_kit.room.unpublish_track(track);1313 track_publication, ..
1314 } => {
1315 live_kit.room.unpublish_track(track_publication);
1008 cx.notify();1316 cx.notify();
1317
1318 Audio::play_sound(Sound::StopScreenshare, cx);
1009 Ok(())1319 Ok(())
1010 }1320 }
1011 }1321 }
@@ -1023,19 +1333,75 @@ impl Room { · 11 unmodified lines
1023 1333
1024struct LiveKitRoom {1334struct LiveKitRoom {
1025 room: Arc<live_kit_client::Room>,1335 room: Arc<live_kit_client::Room>,
1026 screen_track: ScreenTrack,1336 screen_track: LocalTrack,
1337 microphone_track: LocalTrack,
1338 /// Tracks whether we're currently in a muted state due to auto-mute from deafening or manual mute performed by user.
1339 muted_by_user: bool,
1340 deafened: bool,
1341 speaking: bool,
1027 next_publish_id: usize,1342 next_publish_id: usize,
1028 _maintain_room: Task<()>,1343 _maintain_room: Task<()>,
1029 _maintain_tracks: Task<()>,1344 _maintain_tracks: [Task<()>; 2],
1345}
1346
1347impl LiveKitRoom {
1348 fn set_mute(
1349 self: &mut LiveKitRoom,
1350 should_mute: bool,
1351 cx: &mut ModelContext<Room>,
1352 ) -> Result<(Task<Result<()>>, bool)> {
1353 if !should_mute {
1354 // clear user muting state.
1355 self.muted_by_user = false;
1356 }
1357
1358 let (result, old_muted) = match &mut self.microphone_track {
1359 LocalTrack::None => Err(anyhow!("microphone was not shared")),
1360 LocalTrack::Pending { muted, .. } => {
1361 let old_muted = *muted;
1362 *muted = should_mute;
1363 cx.notify();
1364 Ok((Task::Ready(Some(Ok(()))), old_muted))
1365 }
1366 LocalTrack::Published {
1367 track_publication,
1368 muted,
1369 } => {
1370 let old_muted = *muted;
1371 *muted = should_mute;
1372 cx.notify();
1373 Ok((
1374 cx.background().spawn(track_publication.set_mute(*muted)),
1375 old_muted,
1376 ))
1377 }
1378 }?;
1379
1380 if old_muted != should_mute {
1381 if should_mute {
1382 Audio::play_sound(Sound::Mute, cx);
1383 } else {
1384 Audio::play_sound(Sound::Unmute, cx);
1385 }
1386 }
1387
1388 Ok((result, old_muted))
1389 }
1030}1390}
1031 1391
1032enum ScreenTrack {1392enum LocalTrack {
1033 None,1393 None,
1034 Pending { publish_id: usize },1394 Pending {
1035 Published(LocalTrackPublication),1395 publish_id: usize,
1396 muted: bool,
1397 },
1398 Published {
1399 track_publication: LocalTrackPublication,
1400 muted: bool,
1401 },
1036}1402}
1037 1403
1038impl Default for ScreenTrack {1404impl Default for LocalTrack {
1039 fn default() -> Self {1405 fn default() -> Self {
1040 Self::None1406 Self::None
1041 }1407 }
crates/client/src/telemetry.rs+8−34
@@ -1,5 +1,4 @@
1use crate::{TelemetrySettings, ZED_SECRET_CLIENT_TOKEN, ZED_SERVER_URL};1use crate::{TelemetrySettings, ZED_SECRET_CLIENT_TOKEN, ZED_SERVER_URL};
2use db::kvp::KEY_VALUE_STORE;
3use gpui::{executor::Background, serde_json, AppContext, Task};2use gpui::{executor::Background, serde_json, AppContext, Task};
4use lazy_static::lazy_static;3use lazy_static::lazy_static;
5use parking_lot::Mutex;4use parking_lot::Mutex;
@@ -8,7 +7,6 @@ use std::{env, io::Write, mem, path::PathBuf, sync::Arc, time::Duration}; · 2 unmodified lines
8use tempfile::NamedTempFile;7use tempfile::NamedTempFile;
9use util::http::HttpClient;8use util::http::HttpClient;
10use util::{channel::ReleaseChannel, TryFutureExt};9use util::{channel::ReleaseChannel, TryFutureExt};
11use uuid::Uuid;
12 10
13pub struct Telemetry {11pub struct Telemetry {
14 http_client: Arc<dyn HttpClient>,12 http_client: Arc<dyn HttpClient>,
@@ -120,39 +118,15 @@ impl Telemetry { · 105 unmodified lines
120 Some(self.state.lock().log_file.as_ref()?.path().to_path_buf())118 Some(self.state.lock().log_file.as_ref()?.path().to_path_buf())
121 }119 }
122 120
123 pub fn start(self: &Arc<Self>) {121 pub fn start(self: &Arc<Self>, installation_id: Option<String>) {
124 let this = self.clone();122 let mut state = self.state.lock();
125 self.executor123 state.installation_id = installation_id.map(|id| id.into());
126 .spawn(124 let has_clickhouse_events = !state.clickhouse_events_queue.is_empty();
127 async move {125 drop(state);
128 let installation_id =
129 if let Ok(Some(installation_id)) = KEY_VALUE_STORE.read_kvp("device_id") {
130 installation_id
131 } else {
132 let installation_id = Uuid::new_v4().to_string();
133 KEY_VALUE_STORE
134 .write_kvp("device_id".to_string(), installation_id.clone())
135 .await?;
136 installation_id
137 };
138
139 let installation_id: Arc<str> = installation_id.into();
140 let mut state = this.state.lock();
141 state.installation_id = Some(installation_id.clone());
142
143 let has_clickhouse_events = !state.clickhouse_events_queue.is_empty();
144
145 drop(state);
146
147 if has_clickhouse_events {
148 this.flush_clickhouse_events();
149 }
150 126
151 anyhow::Ok(())127 if has_clickhouse_events {
152 }128 self.flush_clickhouse_events();
153 .log_err(),129 }
154 )
155 .detach();
156 }130 }
157 131
158 /// This method takes the entire TelemetrySettings struct in order to force client code132 /// This method takes the entire TelemetrySettings struct in order to force client code
crates/collab/Cargo.toml+3−2
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathan@zed.dev>"] · 2 unmodified lines
3default-run = "collab"3default-run = "collab"
4edition = "2021"4edition = "2021"
5name = "collab"5name = "collab"
6version = "0.14.2"6version = "0.16.0"
7publish = false7publish = false
8 8
9[[bin]]9[[bin]]
@@ -57,6 +57,7 @@ tracing-log = "0.1.3" · 47 unmodified lines
57tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] }57tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] }
58 58
59[dev-dependencies]59[dev-dependencies]
60audio = { path = "../audio" }
60collections = { path = "../collections", features = ["test-support"] }61collections = { path = "../collections", features = ["test-support"] }
61gpui = { path = "../gpui", features = ["test-support"] }62gpui = { path = "../gpui", features = ["test-support"] }
62call = { path = "../call", features = ["test-support"] }63call = { path = "../call", features = ["test-support"] }
@@ -67,7 +68,7 @@ fs = { path = "../fs", features = ["test-support"] } · 4 unmodified lines
67git = { path = "../git", features = ["test-support"] }68git = { path = "../git", features = ["test-support"] }
68live_kit_client = { path = "../live_kit_client", features = ["test-support"] }69live_kit_client = { path = "../live_kit_client", features = ["test-support"] }
69lsp = { path = "../lsp", features = ["test-support"] }70lsp = { path = "../lsp", features = ["test-support"] }
70pretty_assertions = "1.3.0"71pretty_assertions.workspace = true
71project = { path = "../project", features = ["test-support"] }72project = { path = "../project", features = ["test-support"] }
72rpc = { path = "../rpc", features = ["test-support"] }73rpc = { path = "../rpc", features = ["test-support"] }
73settings = { path = "../settings", features = ["test-support"] }74settings = { path = "../settings", features = ["test-support"] }
crates/collab/migrations.sqlite/20221109000000_test_schema.sql+1−0
@@ -74,6 +74,7 @@ CREATE TABLE "worktree_entries" ( · 73 unmodified lines
74 "mtime_seconds" INTEGER NOT NULL,74 "mtime_seconds" INTEGER NOT NULL,
75 "mtime_nanos" INTEGER NOT NULL,75 "mtime_nanos" INTEGER NOT NULL,
76 "is_symlink" BOOL NOT NULL,76 "is_symlink" BOOL NOT NULL,
77 "is_external" BOOL NOT NULL,
77 "is_ignored" BOOL NOT NULL,78 "is_ignored" BOOL NOT NULL,
78 "is_deleted" BOOL NOT NULL,79 "is_deleted" BOOL NOT NULL,
79 "git_status" INTEGER,80 "git_status" INTEGER,
crates/collab/migrations/20230616134535_add_is_external_to_worktree_entries.sql+2−0
@@ -0,0 +1,2 @@
1ALTER TABLE "worktree_entries"
2ADD "is_external" BOOL NOT NULL DEFAULT FALSE;
crates/collab/src/db.rs+3−0
@@ -1539,6 +1539,7 @@ impl Database { · 1538 unmodified lines
1539 }),1539 }),
1540 is_symlink: db_entry.is_symlink,1540 is_symlink: db_entry.is_symlink,
1541 is_ignored: db_entry.is_ignored,1541 is_ignored: db_entry.is_ignored,
1542 is_external: db_entry.is_external,
1542 git_status: db_entry.git_status.map(|status| status as i32),1543 git_status: db_entry.git_status.map(|status| status as i32),
1543 });1544 });
1544 }1545 }
@@ -2349,6 +2350,7 @@ impl Database { · 804 unmodified lines
2349 mtime_nanos: ActiveValue::set(mtime.nanos as i32),2350 mtime_nanos: ActiveValue::set(mtime.nanos as i32),
2350 is_symlink: ActiveValue::set(entry.is_symlink),2351 is_symlink: ActiveValue::set(entry.is_symlink),
2351 is_ignored: ActiveValue::set(entry.is_ignored),2352 is_ignored: ActiveValue::set(entry.is_ignored),
2353 is_external: ActiveValue::set(entry.is_external),
2352 git_status: ActiveValue::set(entry.git_status.map(|status| status as i64)),2354 git_status: ActiveValue::set(entry.git_status.map(|status| status as i64)),
2353 is_deleted: ActiveValue::set(false),2355 is_deleted: ActiveValue::set(false),
2354 scan_id: ActiveValue::set(update.scan_id as i64),2356 scan_id: ActiveValue::set(update.scan_id as i64),
@@ -2705,6 +2707,7 @@ impl Database { · 350 unmodified lines
2705 }),2707 }),
2706 is_symlink: db_entry.is_symlink,2708 is_symlink: db_entry.is_symlink,
2707 is_ignored: db_entry.is_ignored,2709 is_ignored: db_entry.is_ignored,
2710 is_external: db_entry.is_external,
2708 git_status: db_entry.git_status.map(|status| status as i32),2711 git_status: db_entry.git_status.map(|status| status as i32),
2709 });2712 });
2710 }2713 }
crates/collab/src/db/worktree_entry.rs+1−0
@@ -18,6 +18,7 @@ pub struct Model { · 17 unmodified lines
18 pub git_status: Option<i64>,18 pub git_status: Option<i64>,
19 pub is_symlink: bool,19 pub is_symlink: bool,
20 pub is_ignored: bool,20 pub is_ignored: bool,
21 pub is_external: bool,
21 pub is_deleted: bool,22 pub is_deleted: bool,
22 pub scan_id: i64,23 pub scan_id: i64,
23}24}
crates/collab/src/rpc.rs+16−1
@@ -201,6 +201,7 @@ impl Server { · 200 unmodified lines
201 .add_message_handler(update_language_server)201 .add_message_handler(update_language_server)
202 .add_message_handler(update_diagnostic_summary)202 .add_message_handler(update_diagnostic_summary)
203 .add_message_handler(update_worktree_settings)203 .add_message_handler(update_worktree_settings)
204 .add_message_handler(refresh_inlay_hints)
204 .add_request_handler(forward_project_request::<proto::GetHover>)205 .add_request_handler(forward_project_request::<proto::GetHover>)
205 .add_request_handler(forward_project_request::<proto::GetDefinition>)206 .add_request_handler(forward_project_request::<proto::GetDefinition>)
206 .add_request_handler(forward_project_request::<proto::GetTypeDefinition>)207 .add_request_handler(forward_project_request::<proto::GetTypeDefinition>)
@@ -224,7 +225,9 @@ impl Server { · 17 unmodified lines
224 .add_request_handler(forward_project_request::<proto::RenameProjectEntry>)225 .add_request_handler(forward_project_request::<proto::RenameProjectEntry>)
225 .add_request_handler(forward_project_request::<proto::CopyProjectEntry>)226 .add_request_handler(forward_project_request::<proto::CopyProjectEntry>)
226 .add_request_handler(forward_project_request::<proto::DeleteProjectEntry>)227 .add_request_handler(forward_project_request::<proto::DeleteProjectEntry>)
228 .add_request_handler(forward_project_request::<proto::ExpandProjectEntry>)
227 .add_request_handler(forward_project_request::<proto::OnTypeFormatting>)229 .add_request_handler(forward_project_request::<proto::OnTypeFormatting>)
230 .add_request_handler(forward_project_request::<proto::InlayHints>)
228 .add_message_handler(create_buffer_for_peer)231 .add_message_handler(create_buffer_for_peer)
229 .add_request_handler(update_buffer)232 .add_request_handler(update_buffer)
230 .add_message_handler(update_buffer_file)233 .add_message_handler(update_buffer_file)
@@ -1573,6 +1576,10 @@ async fn update_worktree_settings( · 1342 unmodified lines
1573 Ok(())1576 Ok(())
1574}1577}
1575 1578
1579async fn refresh_inlay_hints(request: proto::RefreshInlayHints, session: Session) -> Result<()> {
1580 broadcast_project_message(request.project_id, request, session).await
1581}
1582
1576async fn start_language_server(1583async fn start_language_server(
1577 request: proto::StartLanguageServer,1584 request: proto::StartLanguageServer,
1578 session: Session,1585 session: Session,
@@ -1749,7 +1756,15 @@ async fn buffer_reloaded(request: proto::BufferReloaded, session: Session) -> Re · 170 unmodified lines
1749}1756}
1750 1757
1751async fn buffer_saved(request: proto::BufferSaved, session: Session) -> Result<()> {1758async fn buffer_saved(request: proto::BufferSaved, session: Session) -> Result<()> {
1752 let project_id = ProjectId::from_proto(request.project_id);1759 broadcast_project_message(request.project_id, request, session).await
1760}
1761
1762async fn broadcast_project_message<T: EnvelopedMessage>(
1763 project_id: u64,
1764 request: T,
1765 session: Session,
1766) -> Result<()> {
1767 let project_id = ProjectId::from_proto(project_id);
1753 let project_connection_ids = session1768 let project_connection_ids = session
1754 .db()1769 .db()
1755 .await1770 .await
crates/collab/src/tests.rs+1−0
@@ -203,6 +203,7 @@ impl TestServer { · 202 unmodified lines
203 language::init(cx);203 language::init(cx);
204 editor::init_settings(cx);204 editor::init_settings(cx);
205 workspace::init(app_state.clone(), cx);205 workspace::init(app_state.clone(), cx);
206 audio::init((), cx);
206 call::init(client.clone(), user_store.clone(), cx);207 call::init(client.clone(), user_store.clone(), cx);
207 });208 });
208 209
crates/collab/src/tests/integration_tests.rs+649−12
@@ -18,7 +18,7 @@ use gpui::{ · 17 unmodified lines
18};18};
19use indoc::indoc;19use indoc::indoc;
20use language::{20use language::{
21 language_settings::{AllLanguageSettings, Formatter},21 language_settings::{AllLanguageSettings, Formatter, InlayHintKind, InlayHintSettings},
22 tree_sitter_rust, Anchor, Diagnostic, DiagnosticEntry, FakeLspAdapter, Language,22 tree_sitter_rust, Anchor, Diagnostic, DiagnosticEntry, FakeLspAdapter, Language,
23 LanguageConfig, OffsetRangeExt, Point, Rope,23 LanguageConfig, OffsetRangeExt, Point, Rope,
24};24};
@@ -34,12 +34,17 @@ use std::{ · 9 unmodified lines
34 path::{Path, PathBuf},34 path::{Path, PathBuf},
35 rc::Rc,35 rc::Rc,
36 sync::{36 sync::{
37 atomic::{AtomicBool, Ordering::SeqCst},37 atomic::{AtomicBool, AtomicU32, Ordering::SeqCst},
38 Arc,38 Arc,
39 },39 },
40};40};
41use unindent::Unindent as _;41use unindent::Unindent as _;
42use workspace::{item::ItemHandle as _, shared_screen::SharedScreen, SplitDirection, Workspace};42use workspace::{
43 dock::{test::TestPanel, DockPosition},
44 item::{test::TestItem, ItemHandle as _},
45 shared_screen::SharedScreen,
46 SplitDirection, Workspace,
47};
43 48
44#[ctor::ctor]49#[ctor::ctor]
45fn init_logger() {50fn init_logger() {
@@ -252,7 +257,7 @@ async fn test_basic_calls( · 206 unmodified lines
252 room_b.read_with(cx_b, |room, _| {257 room_b.read_with(cx_b, |room, _| {
253 assert_eq!(258 assert_eq!(
254 room.remote_participants()[&client_a.user_id().unwrap()]259 room.remote_participants()[&client_a.user_id().unwrap()]
255 .tracks260 .video_tracks
256 .len(),261 .len(),
257 1262 1
258 );263 );
@@ -269,7 +274,7 @@ async fn test_basic_calls( · 10 unmodified lines
269 room_c.read_with(cx_c, |room, _| {274 room_c.read_with(cx_c, |room, _| {
270 assert_eq!(275 assert_eq!(
271 room.remote_participants()[&client_a.user_id().unwrap()]276 room.remote_participants()[&client_a.user_id().unwrap()]
272 .tracks277 .video_tracks
273 .len(),278 .len(),
274 1279 1
275 );280 );
@@ -1261,6 +1266,27 @@ async fn test_share_project( · 985 unmodified lines
1261 let client_b_collaborator = project.collaborators().get(&client_b_peer_id).unwrap();1266 let client_b_collaborator = project.collaborators().get(&client_b_peer_id).unwrap();
1262 assert_eq!(client_b_collaborator.replica_id, replica_id_b);1267 assert_eq!(client_b_collaborator.replica_id, replica_id_b);
1263 });1268 });
1269 project_b.read_with(cx_b, |project, cx| {
1270 let worktree = project.worktrees(cx).next().unwrap().read(cx);
1271 assert_eq!(
1272 worktree.paths().map(AsRef::as_ref).collect::<Vec<_>>(),
1273 [
1274 Path::new(".gitignore"),
1275 Path::new("a.txt"),
1276 Path::new("b.txt"),
1277 Path::new("ignored-dir"),
1278 ]
1279 );
1280 });
1281
1282 project_b
1283 .update(cx_b, |project, cx| {
1284 let worktree = project.worktrees(cx).next().unwrap();
1285 let entry = worktree.read(cx).entry_for_path("ignored-dir").unwrap();
1286 project.expand_entry(worktree_id, entry.id, cx).unwrap()
1287 })
1288 .await
1289 .unwrap();
1264 project_b.read_with(cx_b, |project, cx| {1290 project_b.read_with(cx_b, |project, cx| {
1265 let worktree = project.worktrees(cx).next().unwrap().read(cx);1291 let worktree = project.worktrees(cx).next().unwrap().read(cx);
1266 assert_eq!(1292 assert_eq!(
@@ -6847,12 +6873,43 @@ async fn test_basic_following( · 5580 unmodified lines
6847 )6873 )
6848 });6874 });
6849 6875
6850 // Client B activates an external window again, and the previously-opened screen-sharing item6876 // Client B activates a panel, and the previously-opened screen-sharing item gets activated.
6851 // gets activated.6877 let panel = cx_b.add_view(workspace_b.window_id(), |_| {
6852 active_call_b6878 TestPanel::new(DockPosition::Left)
6853 .update(cx_b, |call, cx| call.set_location(None, cx))6879 });
6854 .await6880 workspace_b.update(cx_b, |workspace, cx| {
6855 .unwrap();6881 workspace.add_panel(panel, cx);
6882 workspace.toggle_panel_focus::<TestPanel>(cx);
6883 });
6884 deterministic.run_until_parked();
6885 assert_eq!(
6886 workspace_a.read_with(cx_a, |workspace, cx| workspace
6887 .active_item(cx)
6888 .unwrap()
6889 .id()),
6890 shared_screen.id()
6891 );
6892
6893 // Toggling the focus back to the pane causes client A to return to the multibuffer.
6894 workspace_b.update(cx_b, |workspace, cx| {
6895 workspace.toggle_panel_focus::<TestPanel>(cx);
6896 });
6897 deterministic.run_until_parked();
6898 workspace_a.read_with(cx_a, |workspace, cx| {
6899 assert_eq!(
6900 workspace.active_item(cx).unwrap().id(),
6901 multibuffer_editor_a.id()
6902 )
6903 });
6904
6905 // Client B activates an item that doesn't implement following,
6906 // so the previously-opened screen-sharing item gets activated.
6907 let unfollowable_item = cx_b.add_view(workspace_b.window_id(), |_| TestItem::new());
6908 workspace_b.update(cx_b, |workspace, cx| {
6909 workspace.active_pane().update(cx, |pane, cx| {
6910 pane.add_item(Box::new(unfollowable_item), true, true, None, cx)
6911 })
6912 });
6856 deterministic.run_until_parked();6913 deterministic.run_until_parked();
6857 assert_eq!(6914 assert_eq!(
6858 workspace_a.read_with(cx_a, |workspace, cx| workspace6915 workspace_a.read_with(cx_a, |workspace, cx| workspace
@@ -6957,7 +7014,7 @@ async fn test_join_call_after_screen_was_shared( · 98 unmodified lines
6957 room.remote_participants()7014 room.remote_participants()
6958 .get(&client_a.user_id().unwrap())7015 .get(&client_a.user_id().unwrap())
6959 .unwrap()7016 .unwrap()
6960 .tracks7017 .video_tracks
6961 .len(),7018 .len(),
6962 17019 1
6963 );7020 );
@@ -7743,6 +7800,572 @@ async fn test_on_input_format_from_guest_to_host( · 779 unmodified lines
7743 });7800 });
7744}7801}
7745 7802
7803#[gpui::test]
7804async fn test_mutual_editor_inlay_hint_cache_update(
7805 deterministic: Arc<Deterministic>,
7806 cx_a: &mut TestAppContext,
7807 cx_b: &mut TestAppContext,
7808) {
7809 deterministic.forbid_parking();
7810 let mut server = TestServer::start(&deterministic).await;
7811 let client_a = server.create_client(cx_a, "user_a").await;
7812 let client_b = server.create_client(cx_b, "user_b").await;
7813 server
7814 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
7815 .await;
7816 let active_call_a = cx_a.read(ActiveCall::global);
7817 let active_call_b = cx_b.read(ActiveCall::global);
7818
7819 cx_a.update(editor::init);
7820 cx_b.update(editor::init);
7821
7822 cx_a.update(|cx| {
7823 cx.update_global(|store: &mut SettingsStore, cx| {
7824 store.update_user_settings::<AllLanguageSettings>(cx, |settings| {
7825 settings.defaults.inlay_hints = Some(InlayHintSettings {
7826 enabled: true,
7827 show_type_hints: true,
7828 show_parameter_hints: false,
7829 show_other_hints: true,
7830 })
7831 });
7832 });
7833 });
7834 cx_b.update(|cx| {
7835 cx.update_global(|store: &mut SettingsStore, cx| {
7836 store.update_user_settings::<AllLanguageSettings>(cx, |settings| {
7837 settings.defaults.inlay_hints = Some(InlayHintSettings {
7838 enabled: true,
7839 show_type_hints: true,
7840 show_parameter_hints: false,
7841 show_other_hints: true,
7842 })
7843 });
7844 });
7845 });
7846 let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
7847
7848 let mut language = Language::new(
7849 LanguageConfig {
7850 name: "Rust".into(),
7851 path_suffixes: vec!["rs".to_string()],
7852 ..Default::default()
7853 },
7854 Some(tree_sitter_rust::language()),
7855 );
7856 let mut fake_language_servers = language
7857 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
7858 capabilities: lsp::ServerCapabilities {
7859 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
7860 ..Default::default()
7861 },
7862 ..Default::default()
7863 }))
7864 .await;
7865 let language = Arc::new(language);
7866 client_a.language_registry.add(Arc::clone(&language));
7867 client_b.language_registry.add(language);
7868
7869 client_a
7870 .fs
7871 .insert_tree(
7872 "/a",
7873 json!({
7874 "main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out",
7875 "other.rs": "// Test file",
7876 }),
7877 )
7878 .await;
7879 let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
7880 active_call_a
7881 .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
7882 .await
7883 .unwrap();
7884 let project_id = active_call_a
7885 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
7886 .await
7887 .unwrap();
7888
7889 let project_b = client_b.build_remote_project(project_id, cx_b).await;
7890 active_call_b
7891 .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
7892 .await
7893 .unwrap();
7894
7895 let workspace_a = client_a.build_workspace(&project_a, cx_a);
7896 cx_a.foreground().start_waiting();
7897
7898 let _buffer_a = project_a
7899 .update(cx_a, |project, cx| {
7900 project.open_local_buffer("/a/main.rs", cx)
7901 })
7902 .await
7903 .unwrap();
7904 let fake_language_server = fake_language_servers.next().await.unwrap();
7905 let next_call_id = Arc::new(AtomicU32::new(0));
7906 let editor_a = workspace_a
7907 .update(cx_a, |workspace, cx| {
7908 workspace.open_path((worktree_id, "main.rs"), None, true, cx)
7909 })
7910 .await
7911 .unwrap()
7912 .downcast::<Editor>()
7913 .unwrap();
7914 fake_language_server
7915 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
7916 let task_next_call_id = Arc::clone(&next_call_id);
7917 async move {
7918 assert_eq!(
7919 params.text_document.uri,
7920 lsp::Url::from_file_path("/a/main.rs").unwrap(),
7921 );
7922 let mut current_call_id = Arc::clone(&task_next_call_id).fetch_add(1, SeqCst);
7923 let mut new_hints = Vec::with_capacity(current_call_id as usize);
7924 loop {
7925 new_hints.push(lsp::InlayHint {
7926 position: lsp::Position::new(0, current_call_id),
7927 label: lsp::InlayHintLabel::String(current_call_id.to_string()),
7928 kind: None,
7929 text_edits: None,
7930 tooltip: None,
7931 padding_left: None,
7932 padding_right: None,
7933 data: None,
7934 });
7935 if current_call_id == 0 {
7936 break;
7937 }
7938 current_call_id -= 1;
7939 }
7940 Ok(Some(new_hints))
7941 }
7942 })
7943 .next()
7944 .await
7945 .unwrap();
7946
7947 cx_a.foreground().finish_waiting();
7948 cx_a.foreground().run_until_parked();
7949
7950 let mut edits_made = 1;
7951 editor_a.update(cx_a, |editor, _| {
7952 assert_eq!(
7953 vec!["0".to_string()],
7954 extract_hint_labels(editor),
7955 "Host should get its first hints when opens an editor"
7956 );
7957 let inlay_cache = editor.inlay_hint_cache();
7958 assert_eq!(
7959 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
7960 "Cache should use editor settings to get the allowed hint kinds"
7961 );
7962 assert_eq!(
7963 inlay_cache.version, edits_made,
7964 "Host editor update the cache version after every cache/view change",
7965 );
7966 });
7967 let workspace_b = client_b.build_workspace(&project_b, cx_b);
7968 let editor_b = workspace_b
7969 .update(cx_b, |workspace, cx| {
7970 workspace.open_path((worktree_id, "main.rs"), None, true, cx)
7971 })
7972 .await
7973 .unwrap()
7974 .downcast::<Editor>()
7975 .unwrap();
7976
7977 cx_b.foreground().run_until_parked();
7978 editor_b.update(cx_b, |editor, _| {
7979 assert_eq!(
7980 vec!["0".to_string(), "1".to_string()],
7981 extract_hint_labels(editor),
7982 "Client should get its first hints when opens an editor"
7983 );
7984 let inlay_cache = editor.inlay_hint_cache();
7985 assert_eq!(
7986 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
7987 "Cache should use editor settings to get the allowed hint kinds"
7988 );
7989 assert_eq!(
7990 inlay_cache.version, edits_made,
7991 "Guest editor update the cache version after every cache/view change"
7992 );
7993 });
7994
7995 editor_b.update(cx_b, |editor, cx| {
7996 editor.change_selections(None, cx, |s| s.select_ranges([13..13].clone()));
7997 editor.handle_input(":", cx);
7998 cx.focus(&editor_b);
7999 edits_made += 1;
8000 });
8001 cx_a.foreground().run_until_parked();
8002 cx_b.foreground().run_until_parked();
8003 editor_a.update(cx_a, |editor, _| {
8004 assert_eq!(
8005 vec!["0".to_string(), "1".to_string(), "2".to_string()],
8006 extract_hint_labels(editor),
8007 "Host should get hints from the 1st edit and 1st LSP query"
8008 );
8009 let inlay_cache = editor.inlay_hint_cache();
8010 assert_eq!(
8011 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
8012 "Inlay kinds settings never change during the test"
8013 );
8014 assert_eq!(inlay_cache.version, edits_made);
8015 });
8016 editor_b.update(cx_b, |editor, _| {
8017 assert_eq!(
8018 vec![
8019 "0".to_string(),
8020 "1".to_string(),
8021 "2".to_string(),
8022 "3".to_string()
8023 ],
8024 extract_hint_labels(editor),
8025 "Guest should get hints the 1st edit and 2nd LSP query"
8026 );
8027 let inlay_cache = editor.inlay_hint_cache();
8028 assert_eq!(
8029 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
8030 "Inlay kinds settings never change during the test"
8031 );
8032 assert_eq!(inlay_cache.version, edits_made);
8033 });
8034
8035 editor_a.update(cx_a, |editor, cx| {
8036 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
8037 editor.handle_input("a change to increment both buffers' versions", cx);
8038 cx.focus(&editor_a);
8039 edits_made += 1;
8040 });
8041 cx_a.foreground().run_until_parked();
8042 cx_b.foreground().run_until_parked();
8043 editor_a.update(cx_a, |editor, _| {
8044 assert_eq!(
8045 vec![
8046 "0".to_string(),
8047 "1".to_string(),
8048 "2".to_string(),
8049 "3".to_string(),
8050 "4".to_string()
8051 ],
8052 extract_hint_labels(editor),
8053 "Host should get hints from 3rd edit, 5th LSP query: \
80544th query was made by guest (but not applied) due to cache invalidation logic"
8055 );
8056 let inlay_cache = editor.inlay_hint_cache();
8057 assert_eq!(
8058 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
8059 "Inlay kinds settings never change during the test"
8060 );
8061 assert_eq!(inlay_cache.version, edits_made);
8062 });
8063 editor_b.update(cx_b, |editor, _| {
8064 assert_eq!(
8065 vec![
8066 "0".to_string(),
8067 "1".to_string(),
8068 "2".to_string(),
8069 "3".to_string(),
8070 "4".to_string(),
8071 "5".to_string(),
8072 ],
8073 extract_hint_labels(editor),
8074 "Guest should get hints from 3rd edit, 6th LSP query"
8075 );
8076 let inlay_cache = editor.inlay_hint_cache();
8077 assert_eq!(
8078 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
8079 "Inlay kinds settings never change during the test"
8080 );
8081 assert_eq!(inlay_cache.version, edits_made);
8082 });
8083
8084 fake_language_server
8085 .request::<lsp::request::InlayHintRefreshRequest>(())
8086 .await
8087 .expect("inlay refresh request failed");
8088 edits_made += 1;
8089 cx_a.foreground().run_until_parked();
8090 cx_b.foreground().run_until_parked();
8091 editor_a.update(cx_a, |editor, _| {
8092 assert_eq!(
8093 vec![
8094 "0".to_string(),
8095 "1".to_string(),
8096 "2".to_string(),
8097 "3".to_string(),
8098 "4".to_string(),
8099 "5".to_string(),
8100 "6".to_string(),
8101 ],
8102 extract_hint_labels(editor),
8103 "Host should react to /refresh LSP request and get new hints from 7th LSP query"
8104 );
8105 let inlay_cache = editor.inlay_hint_cache();
8106 assert_eq!(
8107 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
8108 "Inlay kinds settings never change during the test"
8109 );
8110 assert_eq!(
8111 inlay_cache.version, edits_made,
8112 "Host should accepted all edits and bump its cache version every time"
8113 );
8114 });
8115 editor_b.update(cx_b, |editor, _| {
8116 assert_eq!(
8117 vec![
8118 "0".to_string(),
8119 "1".to_string(),
8120 "2".to_string(),
8121 "3".to_string(),
8122 "4".to_string(),
8123 "5".to_string(),
8124 "6".to_string(),
8125 "7".to_string(),
8126 ],
8127 extract_hint_labels(editor),
8128 "Guest should get a /refresh LSP request propagated by host and get new hints from 8th LSP query"
8129 );
8130 let inlay_cache = editor.inlay_hint_cache();
8131 assert_eq!(
8132 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
8133 "Inlay kinds settings never change during the test"
8134 );
8135 assert_eq!(
8136 inlay_cache.version,
8137 edits_made,
8138 "Guest should accepted all edits and bump its cache version every time"
8139 );
8140 });
8141}
8142
8143#[gpui::test]
8144async fn test_inlay_hint_refresh_is_forwarded(
8145 deterministic: Arc<Deterministic>,
8146 cx_a: &mut TestAppContext,
8147 cx_b: &mut TestAppContext,
8148) {
8149 deterministic.forbid_parking();
8150 let mut server = TestServer::start(&deterministic).await;
8151 let client_a = server.create_client(cx_a, "user_a").await;
8152 let client_b = server.create_client(cx_b, "user_b").await;
8153 server
8154 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
8155 .await;
8156 let active_call_a = cx_a.read(ActiveCall::global);
8157 let active_call_b = cx_b.read(ActiveCall::global);
8158
8159 cx_a.update(editor::init);
8160 cx_b.update(editor::init);
8161
8162 cx_a.update(|cx| {
8163 cx.update_global(|store: &mut SettingsStore, cx| {
8164 store.update_user_settings::<AllLanguageSettings>(cx, |settings| {
8165 settings.defaults.inlay_hints = Some(InlayHintSettings {
8166 enabled: false,
8167 show_type_hints: true,
8168 show_parameter_hints: false,
8169 show_other_hints: true,
8170 })
8171 });
8172 });
8173 });
8174 cx_b.update(|cx| {
8175 cx.update_global(|store: &mut SettingsStore, cx| {
8176 store.update_user_settings::<AllLanguageSettings>(cx, |settings| {
8177 settings.defaults.inlay_hints = Some(InlayHintSettings {
8178 enabled: true,
8179 show_type_hints: true,
8180 show_parameter_hints: false,
8181 show_other_hints: true,
8182 })
8183 });
8184 });
8185 });
8186 let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
8187
8188 let mut language = Language::new(
8189 LanguageConfig {
8190 name: "Rust".into(),
8191 path_suffixes: vec!["rs".to_string()],
8192 ..Default::default()
8193 },
8194 Some(tree_sitter_rust::language()),
8195 );
8196 let mut fake_language_servers = language
8197 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
8198 capabilities: lsp::ServerCapabilities {
8199 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
8200 ..Default::default()
8201 },
8202 ..Default::default()
8203 }))
8204 .await;
8205 let language = Arc::new(language);
8206 client_a.language_registry.add(Arc::clone(&language));
8207 client_b.language_registry.add(language);
8208
8209 client_a
8210 .fs
8211 .insert_tree(
8212 "/a",
8213 json!({
8214 "main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out",
8215 "other.rs": "// Test file",
8216 }),
8217 )
8218 .await;
8219 let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
8220 active_call_a
8221 .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
8222 .await
8223 .unwrap();
8224 let project_id = active_call_a
8225 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
8226 .await
8227 .unwrap();
8228
8229 let project_b = client_b.build_remote_project(project_id, cx_b).await;
8230 active_call_b
8231 .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
8232 .await
8233 .unwrap();
8234
8235 let workspace_a = client_a.build_workspace(&project_a, cx_a);
8236 let workspace_b = client_b.build_workspace(&project_b, cx_b);
8237 cx_a.foreground().start_waiting();
8238 cx_b.foreground().start_waiting();
8239
8240 let editor_a = workspace_a
8241 .update(cx_a, |workspace, cx| {
8242 workspace.open_path((worktree_id, "main.rs"), None, true, cx)
8243 })
8244 .await
8245 .unwrap()
8246 .downcast::<Editor>()
8247 .unwrap();
8248
8249 let editor_b = workspace_b
8250 .update(cx_b, |workspace, cx| {
8251 workspace.open_path((worktree_id, "main.rs"), None, true, cx)
8252 })
8253 .await
8254 .unwrap()
8255 .downcast::<Editor>()
8256 .unwrap();
8257
8258 let fake_language_server = fake_language_servers.next().await.unwrap();
8259 let next_call_id = Arc::new(AtomicU32::new(0));
8260 fake_language_server
8261 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
8262 let task_next_call_id = Arc::clone(&next_call_id);
8263 async move {
8264 assert_eq!(
8265 params.text_document.uri,
8266 lsp::Url::from_file_path("/a/main.rs").unwrap(),
8267 );
8268 let mut current_call_id = Arc::clone(&task_next_call_id).fetch_add(1, SeqCst);
8269 let mut new_hints = Vec::with_capacity(current_call_id as usize);
8270 loop {
8271 new_hints.push(lsp::InlayHint {
8272 position: lsp::Position::new(0, current_call_id),
8273 label: lsp::InlayHintLabel::String(current_call_id.to_string()),
8274 kind: None,
8275 text_edits: None,
8276 tooltip: None,
8277 padding_left: None,
8278 padding_right: None,
8279 data: None,
8280 });
8281 if current_call_id == 0 {
8282 break;
8283 }
8284 current_call_id -= 1;
8285 }
8286 Ok(Some(new_hints))
8287 }
8288 })
8289 .next()
8290 .await
8291 .unwrap();
8292 cx_a.foreground().finish_waiting();
8293 cx_b.foreground().finish_waiting();
8294
8295 cx_a.foreground().run_until_parked();
8296 editor_a.update(cx_a, |editor, _| {
8297 assert!(
8298 extract_hint_labels(editor).is_empty(),
8299 "Host should get no hints due to them turned off"
8300 );
8301 let inlay_cache = editor.inlay_hint_cache();
8302 assert_eq!(
8303 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
8304 "Host should have allowed hint kinds set despite hints are off"
8305 );
8306 assert_eq!(
8307 inlay_cache.version, 0,
8308 "Host should not increment its cache version due to no changes",
8309 );
8310 });
8311
8312 let mut edits_made = 1;
8313 cx_b.foreground().run_until_parked();
8314 editor_b.update(cx_b, |editor, _| {
8315 assert_eq!(
8316 vec!["0".to_string()],
8317 extract_hint_labels(editor),
8318 "Client should get its first hints when opens an editor"
8319 );
8320 let inlay_cache = editor.inlay_hint_cache();
8321 assert_eq!(
8322 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
8323 "Cache should use editor settings to get the allowed hint kinds"
8324 );
8325 assert_eq!(
8326 inlay_cache.version, edits_made,
8327 "Guest editor update the cache version after every cache/view change"
8328 );
8329 });
8330
8331 fake_language_server
8332 .request::<lsp::request::InlayHintRefreshRequest>(())
8333 .await
8334 .expect("inlay refresh request failed");
8335 cx_a.foreground().run_until_parked();
8336 editor_a.update(cx_a, |editor, _| {
8337 assert!(
8338 extract_hint_labels(editor).is_empty(),
8339 "Host should get nop hints due to them turned off, even after the /refresh"
8340 );
8341 let inlay_cache = editor.inlay_hint_cache();
8342 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
8343 assert_eq!(
8344 inlay_cache.version, 0,
8345 "Host should not increment its cache version due to no changes",
8346 );
8347 });
8348
8349 edits_made += 1;
8350 cx_b.foreground().run_until_parked();
8351 editor_b.update(cx_b, |editor, _| {
8352 assert_eq!(
8353 vec!["0".to_string(), "1".to_string(),],
8354 extract_hint_labels(editor),
8355 "Guest should get a /refresh LSP request propagated by host despite host hints are off"
8356 );
8357 let inlay_cache = editor.inlay_hint_cache();
8358 assert_eq!(
8359 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
8360 "Inlay kinds settings never change during the test"
8361 );
8362 assert_eq!(
8363 inlay_cache.version, edits_made,
8364 "Guest should accepted all edits and bump its cache version every time"
8365 );
8366 });
8367}
8368
7746#[derive(Debug, Eq, PartialEq)]8369#[derive(Debug, Eq, PartialEq)]
7747struct RoomParticipants {8370struct RoomParticipants {
7748 remote: Vec<String>,8371 remote: Vec<String>,
@@ -7766,3 +8389,17 @@ fn room_participants(room: &ModelHandle<Room>, cx: &mut TestAppContext) -> RoomP · 17 unmodified lines
7766 RoomParticipants { remote, pending }8389 RoomParticipants { remote, pending }
7767 })8390 })
7768}8391}
8392
8393fn extract_hint_labels(editor: &Editor) -> Vec<String> {
8394 let mut labels = Vec::new();
8395 for (_, excerpt_hints) in &editor.inlay_hint_cache().hints {
8396 let excerpt_hints = excerpt_hints.read();
8397 for (_, inlay) in excerpt_hints.hints.iter() {
8398 match &inlay.label {
8399 project::InlayHintLabel::String(s) => labels.push(s.to_string()),
8400 _ => unreachable!(),
8401 }
8402 }
8403 }
8404 labels
8405}
crates/collab_ui/Cargo.toml+4−0
@@ -35,10 +35,14 @@ gpui = { path = "../gpui" } · 34 unmodified lines
35menu = { path = "../menu" }35menu = { path = "../menu" }
36picker = { path = "../picker" }36picker = { path = "../picker" }
37project = { path = "../project" }37project = { path = "../project" }
38recent_projects = {path = "../recent_projects"}
38settings = { path = "../settings" }39settings = { path = "../settings" }
39theme = { path = "../theme" }40theme = { path = "../theme" }
41theme_selector = { path = "../theme_selector" }
40util = { path = "../util" }42util = { path = "../util" }
41workspace = { path = "../workspace" }43workspace = { path = "../workspace" }
44zed-actions = {path = "../zed-actions"}
45
42 46
43anyhow.workspace = true47anyhow.workspace = true
44futures.workspace = true48futures.workspace = true
crates/collab_ui/src/branch_list.rs+238−0
@@ -0,0 +1,238 @@
1use anyhow::{anyhow, bail};
2use fuzzy::{StringMatch, StringMatchCandidate};
3use gpui::{elements::*, AppContext, MouseState, Task, ViewContext, ViewHandle};
4use picker::{Picker, PickerDelegate, PickerEvent};
5use std::{ops::Not, sync::Arc};
6use util::ResultExt;
7use workspace::{Toast, Workspace};
8
9pub fn init(cx: &mut AppContext) {
10 Picker::<BranchListDelegate>::init(cx);
11}
12
13pub type BranchList = Picker<BranchListDelegate>;
14
15pub fn build_branch_list(
16 workspace: ViewHandle<Workspace>,
17 cx: &mut ViewContext<BranchList>,
18) -> BranchList {
19 Picker::new(
20 BranchListDelegate {
21 matches: vec![],
22 workspace,
23 selected_index: 0,
24 last_query: String::default(),
25 },
26 cx,
27 )
28 .with_theme(|theme| theme.picker.clone())
29}
30
31pub struct BranchListDelegate {
32 matches: Vec<StringMatch>,
33 workspace: ViewHandle<Workspace>,
34 selected_index: usize,
35 last_query: String,
36}
37
38impl PickerDelegate for BranchListDelegate {
39 fn placeholder_text(&self) -> Arc<str> {
40 "Select branch...".into()
41 }
42
43 fn match_count(&self) -> usize {
44 self.matches.len()
45 }
46
47 fn selected_index(&self) -> usize {
48 self.selected_index
49 }
50
51 fn set_selected_index(&mut self, ix: usize, _: &mut ViewContext<Picker<Self>>) {
52 self.selected_index = ix;
53 }
54
55 fn update_matches(&mut self, query: String, cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
56 cx.spawn(move |picker, mut cx| async move {
57 let Some(candidates) = picker
58 .read_with(&mut cx, |view, cx| {
59 let delegate = view.delegate();
60 let project = delegate.workspace.read(cx).project().read(&cx);
61 let mut cwd =
62 project
63 .visible_worktrees(cx)
64 .next()
65 .unwrap()
66 .read(cx)
67 .abs_path()
68 .to_path_buf();
69 cwd.push(".git");
70 let Some(repo) = project.fs().open_repo(&cwd) else {bail!("Project does not have associated git repository.")};
71 let mut branches = repo
72 .lock()
73 .branches()?;
74 const RECENT_BRANCHES_COUNT: usize = 10;
75 if query.is_empty() && branches.len() > RECENT_BRANCHES_COUNT {
76 // Truncate list of recent branches
77 // Do a partial sort to show recent-ish branches first.
78 branches.select_nth_unstable_by(RECENT_BRANCHES_COUNT - 1, |lhs, rhs| {
79 rhs.unix_timestamp.cmp(&lhs.unix_timestamp)
80 });
81 branches.truncate(RECENT_BRANCHES_COUNT);
82 branches.sort_unstable_by(|lhs, rhs| lhs.name.cmp(&rhs.name));
83 }
84 Ok(branches
85 .iter()
86 .cloned()
87 .enumerate()
88 .map(|(ix, command)| StringMatchCandidate {
89 id: ix,
90 char_bag: command.name.chars().collect(),
91 string: command.name.into(),
92 })
93 .collect::<Vec<_>>())
94 })
95 .log_err() else { return; };
96 let Some(candidates) = candidates.log_err() else {return;};
97 let matches = if query.is_empty() {
98 candidates
99 .into_iter()
100 .enumerate()
101 .map(|(index, candidate)| StringMatch {
102 candidate_id: index,
103 string: candidate.string,
104 positions: Vec::new(),
105 score: 0.0,
106 })
107 .collect()
108 } else {
109 fuzzy::match_strings(
110 &candidates,
111 &query,
112 true,
113 10000,
114 &Default::default(),
115 cx.background(),
116 )
117 .await
118 };
119 picker
120 .update(&mut cx, |picker, _| {
121 let delegate = picker.delegate_mut();
122 delegate.matches = matches;
123 if delegate.matches.is_empty() {
124 delegate.selected_index = 0;
125 } else {
126 delegate.selected_index =
127 core::cmp::min(delegate.selected_index, delegate.matches.len() - 1);
128 }
129 delegate.last_query = query;
130 })
131 .log_err();
132 })
133 }
134
135 fn confirm(&mut self, cx: &mut ViewContext<Picker<Self>>) {
136 let current_pick = self.selected_index();
137 let current_pick = self.matches[current_pick].string.clone();
138 cx.spawn(|picker, mut cx| async move {
139 picker.update(&mut cx, |this, cx| {
140 let project = this.delegate().workspace.read(cx).project().read(cx);
141 let mut cwd = project
142 .visible_worktrees(cx)
143 .next()
144 .ok_or_else(|| anyhow!("There are no visisible worktrees."))?
145 .read(cx)
146 .abs_path()
147 .to_path_buf();
148 cwd.push(".git");
149 let status = project
150 .fs()
151 .open_repo(&cwd)
152 .ok_or_else(|| anyhow!("Could not open repository at path `{}`", cwd.as_os_str().to_string_lossy()))?
153 .lock()
154 .change_branch(&current_pick);
155 if status.is_err() {
156 const GIT_CHECKOUT_FAILURE_ID: usize = 2048;
157 this.delegate().workspace.update(cx, |model, ctx| {
158 model.show_toast(
159 Toast::new(
160 GIT_CHECKOUT_FAILURE_ID,
161 format!("Failed to checkout branch '{current_pick}', check for conflicts or unstashed files"),
162 ),
163 ctx,
164 )
165 });
166 status?;
167 }
168 cx.emit(PickerEvent::Dismiss);
169
170 Ok::<(), anyhow::Error>(())
171 }).log_err();
172 }).detach();
173 }
174
175 fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
176 cx.emit(PickerEvent::Dismiss);
177 }
178
179 fn render_match(
180 &self,
181 ix: usize,
182 mouse_state: &mut MouseState,
183 selected: bool,
184 cx: &gpui::AppContext,
185 ) -> AnyElement<Picker<Self>> {
186 const DISPLAYED_MATCH_LEN: usize = 29;
187 let theme = &theme::current(cx);
188 let hit = &self.matches[ix];
189 let shortened_branch_name = util::truncate_and_trailoff(&hit.string, DISPLAYED_MATCH_LEN);
190 let highlights = hit
191 .positions
192 .iter()
193 .copied()
194 .filter(|index| index < &DISPLAYED_MATCH_LEN)
195 .collect();
196 let style = theme.picker.item.in_state(selected).style_for(mouse_state);
197 Flex::row()
198 .with_child(
199 Label::new(shortened_branch_name.clone(), style.label.clone())
200 .with_highlights(highlights)
201 .contained()
202 .aligned()
203 .left(),
204 )
205 .contained()
206 .with_style(style.container)
207 .constrained()
208 .with_height(theme.contact_finder.row_height)
209 .into_any()
210 }
211 fn render_header(
212 &self,
213 cx: &mut ViewContext<Picker<Self>>,
214 ) -> Option<AnyElement<Picker<Self>>> {
215 let theme = &theme::current(cx);
216 let style = theme.picker.header.clone();
217 let label = if self.last_query.is_empty() {
218 Flex::row()
219 .with_child(Label::new("Recent branches", style.label.clone()))
220 .contained()
221 .with_style(style.container)
222 } else {
223 Flex::row()
224 .with_child(Label::new("Branches", style.label.clone()))
225 .with_children(self.matches.is_empty().not().then(|| {
226 let suffix = if self.matches.len() == 1 { "" } else { "es" };
227 Label::new(
228 format!("{} match{}", self.matches.len(), suffix),
229 style.label,
230 )
231 .flex_float()
232 }))
233 .contained()
234 .with_style(style.container)
235 };
236 Some(label.into_any())
237 }
238}
crates/collab_ui/src/collab_titlebar_item.rs+500−134
@@ -1,6 +1,10 @@
1use crate::{1use crate::{
2 contact_notification::ContactNotification, contacts_popover, face_pile::FacePile,2 branch_list::{build_branch_list, BranchList},
3 toggle_screen_sharing, ToggleScreenSharing,3 contact_notification::ContactNotification,
4 contacts_popover,
5 face_pile::FacePile,
6 toggle_deafen, toggle_mute, toggle_screen_sharing, LeaveCall, ToggleDeafen, ToggleMute,
7 ToggleScreenSharing,
4};8};
5use call::{ActiveCall, ParticipantLocation, Room};9use call::{ActiveCall, ParticipantLocation, Room};
6use client::{proto::PeerId, Client, ContactEventKind, SignIn, SignOut, User, UserStore};10use client::{proto::PeerId, Client, ContactEventKind, SignIn, SignOut, User, UserStore};
@@ -17,19 +21,25 @@ use gpui::{ · 10 unmodified lines
17 AppContext, Entity, ImageData, LayoutContext, ModelHandle, SceneBuilder, Subscription, View,21 AppContext, Entity, ImageData, LayoutContext, ModelHandle, SceneBuilder, Subscription, View,
18 ViewContext, ViewHandle, WeakViewHandle,22 ViewContext, ViewHandle, WeakViewHandle,
19};23};
20use project::Project;24use picker::PickerEvent;
25use project::{Project, RepositoryEntry};
26use recent_projects::{build_recent_projects, RecentProjects};
21use std::{ops::Range, sync::Arc};27use std::{ops::Range, sync::Arc};
22use theme::{AvatarStyle, Theme};28use theme::{AvatarStyle, Theme};
23use util::ResultExt;29use util::ResultExt;
24use workspace::{FollowNextCollaborator, Workspace};30use workspace::{FollowNextCollaborator, Workspace, WORKSPACE_DB};
25 31
26const MAX_TITLE_LENGTH: usize = 75;32const MAX_PROJECT_NAME_LENGTH: usize = 40;
33const MAX_BRANCH_NAME_LENGTH: usize = 40;
27 34
28actions!(35actions!(
29 collab,36 collab,
30 [37 [
31 ToggleContactsMenu,38 ToggleContactsMenu,
32 ToggleUserMenu,39 ToggleUserMenu,
40 ToggleVcsMenu,
41 ToggleProjectMenu,
42 SwitchBranch,
33 ShareProject,43 ShareProject,
34 UnshareProject,44 UnshareProject,
35 ]45 ]
@@ -40,6 +50,8 @@ pub fn init(cx: &mut AppContext) { · 4 unmodified lines
40 cx.add_action(CollabTitlebarItem::share_project);50 cx.add_action(CollabTitlebarItem::share_project);
41 cx.add_action(CollabTitlebarItem::unshare_project);51 cx.add_action(CollabTitlebarItem::unshare_project);
42 cx.add_action(CollabTitlebarItem::toggle_user_menu);52 cx.add_action(CollabTitlebarItem::toggle_user_menu);
53 cx.add_action(CollabTitlebarItem::toggle_vcs_menu);
54 cx.add_action(CollabTitlebarItem::toggle_project_menu);
43}55}
44 56
45pub struct CollabTitlebarItem {57pub struct CollabTitlebarItem {
@@ -48,6 +60,8 @@ pub struct CollabTitlebarItem { · 2 unmodified lines
48 client: Arc<Client>,60 client: Arc<Client>,
49 workspace: WeakViewHandle<Workspace>,61 workspace: WeakViewHandle<Workspace>,
50 contacts_popover: Option<ViewHandle<ContactsPopover>>,62 contacts_popover: Option<ViewHandle<ContactsPopover>>,
63 branch_popover: Option<ViewHandle<BranchList>>,
64 project_popover: Option<ViewHandle<recent_projects::RecentProjects>>,
51 user_menu: ViewHandle<ContextMenu>,65 user_menu: ViewHandle<ContextMenu>,
52 _subscriptions: Vec<Subscription>,66 _subscriptions: Vec<Subscription>,
53}67}
@@ -68,37 +82,43 @@ impl View for CollabTitlebarItem { · 14 unmodified lines
68 return Empty::new().into_any();82 return Empty::new().into_any();
69 };83 };
70 84
71 let project = self.project.read(cx);
72 let theme = theme::current(cx).clone();85 let theme = theme::current(cx).clone();
73 let mut left_container = Flex::row();86 let mut left_container = Flex::row();
74 let mut right_container = Flex::row().align_children_center();87 let mut right_container = Flex::row().align_children_center();
75 88
76 left_container.add_child(self.collect_title_root_names(&project, theme.clone(), cx));89 left_container.add_child(self.collect_title_root_names(theme.clone(), cx));
77 90
78 let user = self.user_store.read(cx).current_user();91 let user = self.user_store.read(cx).current_user();
79 let peer_id = self.client.peer_id();92 let peer_id = self.client.peer_id();
80 if let Some(((user, peer_id), room)) = user93 if let Some(((user, peer_id), room)) = user
94 .as_ref()
81 .zip(peer_id)95 .zip(peer_id)
82 .zip(ActiveCall::global(cx).read(cx).room().cloned())96 .zip(ActiveCall::global(cx).read(cx).room().cloned())
83 {97 {
84 left_container
85 .add_children(self.render_in_call_share_unshare_button(&workspace, &theme, cx));
86
87 right_container.add_children(self.render_collaborators(&workspace, &theme, &room, cx));
88 right_container98 right_container
89 .add_child(self.render_current_user(&workspace, &theme, &user, peer_id, cx));99 .add_children(self.render_in_call_share_unshare_button(&workspace, &theme, cx));
100 right_container.add_child(self.render_leave_call(&theme, cx));
101 let muted = room.read(cx).is_muted();
102 let speaking = room.read(cx).is_speaking();
103 left_container.add_child(
104 self.render_current_user(&workspace, &theme, &user, peer_id, muted, speaking, cx),
105 );
106 left_container.add_children(self.render_collaborators(&workspace, &theme, &room, cx));
107 right_container.add_child(self.render_toggle_mute(&theme, &room, cx));
108 right_container.add_child(self.render_toggle_deafen(&theme, &room, cx));
90 right_container.add_child(self.render_toggle_screen_sharing_button(&theme, &room, cx));109 right_container.add_child(self.render_toggle_screen_sharing_button(&theme, &room, cx));
91 }110 }
92 111
93 let status = workspace.read(cx).client().status();112 let status = workspace.read(cx).client().status();
94 let status = &*status.borrow();113 let status = &*status.borrow();
95
96 if matches!(status, client::Status::Connected { .. }) {114 if matches!(status, client::Status::Connected { .. }) {
97 right_container.add_child(self.render_toggle_contacts_button(&theme, cx));115 right_container.add_child(self.render_toggle_contacts_button(&theme, cx));
98 right_container.add_child(self.render_user_menu_button(&theme, cx));116 let avatar = user.as_ref().and_then(|user| user.avatar.clone());
117 right_container.add_child(self.render_user_menu_button(&theme, avatar, cx));
99 } else {118 } else {
100 right_container.add_children(self.render_connection_status(status, cx));119 right_container.add_children(self.render_connection_status(status, cx));
101 right_container.add_child(self.render_sign_in_button(&theme, cx));120 right_container.add_child(self.render_sign_in_button(&theme, cx));
121 right_container.add_child(self.render_user_menu_button(&theme, None, cx));
102 }122 }
103 123
104 Stack::new()124 Stack::new()
@@ -108,7 +128,6 @@ impl View for CollabTitlebarItem { · 3 unmodified lines
108 .with_child(128 .with_child(
109 right_container.contained().with_background_color(129 right_container.contained().with_background_color(
110 theme130 theme
111 .workspace
112 .titlebar131 .titlebar
113 .container132 .container
114 .background_color133 .background_color
@@ -163,7 +182,6 @@ impl CollabTitlebarItem { · 48 unmodified lines
163 }),182 }),
164 );183 );
165 184
166 let view_id = cx.view_id();
167 Self {185 Self {
168 workspace: workspace.weak_handle(),186 workspace: workspace.weak_handle(),
169 project,187 project,
@@ -171,69 +189,105 @@ impl CollabTitlebarItem { · 1 unmodified line
171 client,189 client,
172 contacts_popover: None,190 contacts_popover: None,
173 user_menu: cx.add_view(|cx| {191 user_menu: cx.add_view(|cx| {
192 let view_id = cx.view_id();
174 let mut menu = ContextMenu::new(view_id, cx);193 let mut menu = ContextMenu::new(view_id, cx);
175 menu.set_position_mode(OverlayPositionMode::Local);194 menu.set_position_mode(OverlayPositionMode::Local);
176 menu195 menu
177 }),196 }),
197 branch_popover: None,
198 project_popover: None,
178 _subscriptions: subscriptions,199 _subscriptions: subscriptions,
179 }200 }
180 }201 }
181 202
182 fn collect_title_root_names(203 fn collect_title_root_names(
183 &self,204 &self,
184 project: &Project,
185 theme: Arc<Theme>,205 theme: Arc<Theme>,
186 cx: &ViewContext<Self>,206 cx: &mut ViewContext<Self>,
187 ) -> AnyElement<Self> {207 ) -> AnyElement<Self> {
188 let names_and_branches = project.visible_worktrees(cx).map(|worktree| {208 let project = self.project.read(cx);
189 let worktree = worktree.read(cx);
190 (worktree.root_name(), worktree.root_git_entry())
191 });
192
193 fn push_str(buffer: &mut String, index: &mut usize, str: &str) {
194 buffer.push_str(str);
195 *index += str.chars().count();
196 }
197
198 let mut indices = Vec::new();
199 let mut index = 0;
200 let mut title = String::new();
201 let mut names_and_branches = names_and_branches.peekable();
202 while let Some((name, entry)) = names_and_branches.next() {
203 let pre_index = index;
204 push_str(&mut title, &mut index, name);
205 indices.extend((pre_index..index).into_iter());
206 if let Some(branch) = entry.and_then(|entry| entry.branch()) {
207 push_str(&mut title, &mut index, "/");
208 push_str(&mut title, &mut index, &branch);
209 }
210 if names_and_branches.peek().is_some() {
211 push_str(&mut title, &mut index, ", ");
212 if index >= MAX_TITLE_LENGTH {
213 title.push_str(" …");
214 break;
215 }
216 }
217 }
218
219 let text_style = theme.workspace.titlebar.title.clone();
220 let item_spacing = theme.workspace.titlebar.item_spacing;
221 209
222 let mut highlight = text_style.clone();210 let (name, entry) = {
223 highlight.color = theme.workspace.titlebar.highlight_color;211 let mut names_and_branches = project.visible_worktrees(cx).map(|worktree| {
212 let worktree = worktree.read(cx);
213 (worktree.root_name(), worktree.root_git_entry())
214 });
224 215
225 let style = LabelStyle {216 names_and_branches.next().unwrap_or(("", None))
226 text: text_style,
227 highlight_text: Some(highlight),
228 };217 };
229 218
230 Label::new(title, style)219 let name = util::truncate_and_trailoff(name, MAX_PROJECT_NAME_LENGTH);
231 .with_highlights(indices)220 let branch_prepended = entry
232 .contained()221 .as_ref()
233 .with_margin_right(item_spacing)222 .and_then(RepositoryEntry::branch)
234 .aligned()223 .map(|branch| util::truncate_and_trailoff(&branch, MAX_BRANCH_NAME_LENGTH));
235 .left()224 let project_style = theme.titlebar.project_menu_button.clone();
236 .into_any_named("title-with-git-information")225 let git_style = theme.titlebar.git_menu_button.clone();
226 let divider_style = theme.titlebar.project_name_divider.clone();
227 let item_spacing = theme.titlebar.item_spacing;
228
229 let mut ret = Flex::row().with_child(
230 Stack::new()
231 .with_child(
232 MouseEventHandler::<ToggleProjectMenu, Self>::new(0, cx, |mouse_state, _| {
233 let style = project_style
234 .in_state(self.project_popover.is_some())
235 .style_for(mouse_state);
236 Label::new(name, style.text.clone())
237 .contained()
238 .with_style(style.container)
239 .aligned()
240 .left()
241 .into_any_named("title-project-name")
242 })
243 .with_cursor_style(CursorStyle::PointingHand)
244 .on_down(MouseButton::Left, move |_, this, cx| {
245 this.toggle_project_menu(&Default::default(), cx)
246 })
247 .on_click(MouseButton::Left, move |_, _, _| {}),
248 )
249 .with_children(self.render_project_popover_host(&theme.titlebar, cx)),
250 );
251 if let Some(git_branch) = branch_prepended {
252 ret = ret.with_child(
253 Flex::row()
254 .with_child(
255 Label::new("/", divider_style.text)
256 .contained()
257 .with_style(divider_style.container)
258 .aligned()
259 .left(),
260 )
261 .with_child(
262 Stack::new()
263 .with_child(
264 MouseEventHandler::<ToggleVcsMenu, Self>::new(
265 0,
266 cx,
267 |mouse_state, _| {
268 let style = git_style
269 .in_state(self.branch_popover.is_some())
270 .style_for(mouse_state);
271 Label::new(git_branch, style.text.clone())
272 .contained()
273 .with_style(style.container.clone())
274 .with_margin_right(item_spacing)
275 .aligned()
276 .left()
277 .into_any_named("title-project-branch")
278 },
279 )
280 .with_cursor_style(CursorStyle::PointingHand)
281 .on_down(MouseButton::Left, move |_, this, cx| {
282 this.toggle_vcs_menu(&Default::default(), cx)
283 })
284 .on_click(MouseButton::Left, move |_, _, _| {}),
285 )
286 .with_children(self.render_branches_popover_host(&theme.titlebar, cx)),
287 ),
288 )
289 }
290 ret.into_any()
237 }291 }
238 292
239 fn window_activation_changed(&mut self, active: bool, cx: &mut ViewContext<Self>) {293 fn window_activation_changed(&mut self, active: bool, cx: &mut ViewContext<Self>) {
@@ -297,55 +351,167 @@ impl CollabTitlebarItem { · 57 unmodified lines
297 }351 }
298 352
299 pub fn toggle_user_menu(&mut self, _: &ToggleUserMenu, cx: &mut ViewContext<Self>) {353 pub fn toggle_user_menu(&mut self, _: &ToggleUserMenu, cx: &mut ViewContext<Self>) {
300 let theme = theme::current(cx).clone();
301 let avatar_style = theme.workspace.titlebar.leader_avatar.clone();
302 let item_style = theme.context_menu.item.disabled_style().clone();
303 self.user_menu.update(cx, |user_menu, cx| {354 self.user_menu.update(cx, |user_menu, cx| {
304 let items = if let Some(user) = self.user_store.read(cx).current_user() {355 let items = if let Some(_) = self.user_store.read(cx).current_user() {
305 vec![356 vec![
306 ContextMenuItem::Static(Box::new(move |_| {357 ContextMenuItem::action("Settings", zed_actions::OpenSettings),
307 Flex::row()358 ContextMenuItem::action("Theme", theme_selector::Toggle),
308 .with_children(user.avatar.clone().map(|avatar| {359 ContextMenuItem::separator(),
309 Self::render_face(
310 avatar,
311 avatar_style.clone(),
312 Color::transparent_black(),
313 )
314 }))
315 .with_child(Label::new(
316 user.github_login.clone(),
317 item_style.label.clone(),
318 ))
319 .contained()
320 .with_style(item_style.container)
321 .into_any()
322 })),
323 ContextMenuItem::action("Sign out", SignOut),
324 ContextMenuItem::action(360 ContextMenuItem::action(
325 "Send Feedback",361 "Share Feedback",
326 feedback::feedback_editor::GiveFeedback,362 feedback::feedback_editor::GiveFeedback,
327 ),363 ),
364 ContextMenuItem::action("Sign out", SignOut),
328 ]365 ]
329 } else {366 } else {
330 vec![367 vec![
331 ContextMenuItem::action("Sign in", SignIn),368 ContextMenuItem::action("Settings", zed_actions::OpenSettings),
369 ContextMenuItem::action("Theme", theme_selector::Toggle),
370 ContextMenuItem::separator(),
332 ContextMenuItem::action(371 ContextMenuItem::action(
333 "Send Feedback",372 "Share Feedback",
334 feedback::feedback_editor::GiveFeedback,373 feedback::feedback_editor::GiveFeedback,
335 ),374 ),
336 ]375 ]
337 };376 };
338 377 user_menu.toggle(Default::default(), AnchorCorner::TopRight, items, cx);
339 user_menu.show(Default::default(), AnchorCorner::TopRight, items, cx);
340 });378 });
341 }379 }
380 fn render_branches_popover_host<'a>(
381 &'a self,
382 _theme: &'a theme::Titlebar,
383 cx: &'a mut ViewContext<Self>,
384 ) -> Option<AnyElement<Self>> {
385 self.branch_popover.as_ref().map(|child| {
386 let theme = theme::current(cx).clone();
387 let child = ChildView::new(child, cx);
388 let child = MouseEventHandler::<BranchList, Self>::new(0, cx, |_, _| {
389 child
390 .flex(1., true)
391 .contained()
392 .constrained()
393 .with_width(theme.contacts_popover.width)
394 .with_height(theme.contacts_popover.height)
395 })
396 .on_click(MouseButton::Left, |_, _, _| {})
397 .on_down_out(MouseButton::Left, move |_, this, cx| {
398 this.branch_popover.take();
399 cx.emit(());
400 cx.notify();
401 })
402 .contained()
403 .into_any();
404
405 Overlay::new(child)
406 .with_fit_mode(OverlayFitMode::SwitchAnchor)
407 .with_anchor_corner(AnchorCorner::TopLeft)
408 .with_z_index(999)
409 .aligned()
410 .bottom()
411 .left()
412 .into_any()
413 })
414 }
415 fn render_project_popover_host<'a>(
416 &'a self,
417 _theme: &'a theme::Titlebar,
418 cx: &'a mut ViewContext<Self>,
419 ) -> Option<AnyElement<Self>> {
420 self.project_popover.as_ref().map(|child| {
421 let theme = theme::current(cx).clone();
422 let child = ChildView::new(child, cx);
423 let child = MouseEventHandler::<RecentProjects, Self>::new(0, cx, |_, _| {
424 child
425 .flex(1., true)
426 .contained()
427 .constrained()
428 .with_width(theme.contacts_popover.width)
429 .with_height(theme.contacts_popover.height)
430 })
431 .on_click(MouseButton::Left, |_, _, _| {})
432 .on_down_out(MouseButton::Left, move |_, this, cx| {
433 this.project_popover.take();
434 cx.emit(());
435 cx.notify();
436 })
437 .into_any();
438
439 Overlay::new(child)
440 .with_fit_mode(OverlayFitMode::SwitchAnchor)
441 .with_anchor_corner(AnchorCorner::TopLeft)
442 .with_z_index(999)
443 .aligned()
444 .bottom()
445 .left()
446 .into_any()
447 })
448 }
449 pub fn toggle_vcs_menu(&mut self, _: &ToggleVcsMenu, cx: &mut ViewContext<Self>) {
450 if self.branch_popover.take().is_none() {
451 if let Some(workspace) = self.workspace.upgrade(cx) {
452 let view = cx.add_view(|cx| build_branch_list(workspace, cx));
453 cx.subscribe(&view, |this, _, event, cx| {
454 match event {
455 PickerEvent::Dismiss => {
456 this.branch_popover = None;
457 }
458 }
459
460 cx.notify();
461 })
462 .detach();
463 self.project_popover.take();
464 cx.focus(&view);
465 self.branch_popover = Some(view);
466 }
467 }
468
469 cx.notify();
470 }
471
472 pub fn toggle_project_menu(&mut self, _: &ToggleProjectMenu, cx: &mut ViewContext<Self>) {
473 let workspace = self.workspace.clone();
474 if self.project_popover.take().is_none() {
475 cx.spawn(|this, mut cx| async move {
476 let workspaces = WORKSPACE_DB
477 .recent_workspaces_on_disk()
478 .await
479 .unwrap_or_default()
480 .into_iter()
481 .map(|(_, location)| location)
482 .collect();
483
484 let workspace = workspace.clone();
485 this.update(&mut cx, move |this, cx| {
486 let view = cx.add_view(|cx| build_recent_projects(workspace, workspaces, cx));
487
488 cx.subscribe(&view, |this, _, event, cx| {
489 match event {
490 PickerEvent::Dismiss => {
491 this.project_popover = None;
492 }
493 }
342 494
495 cx.notify();
496 })
497 .detach();
498 cx.focus(&view);
499 this.branch_popover.take();
500 this.project_popover = Some(view);
501 cx.notify();
502 })
503 .log_err();
504 })
505 .detach();
506 }
507 cx.notify();
508 }
343 fn render_toggle_contacts_button(509 fn render_toggle_contacts_button(
344 &self,510 &self,
345 theme: &Theme,511 theme: &Theme,
346 cx: &mut ViewContext<Self>,512 cx: &mut ViewContext<Self>,
347 ) -> AnyElement<Self> {513 ) -> AnyElement<Self> {
348 let titlebar = &theme.workspace.titlebar;514 let titlebar = &theme.titlebar;
349 515
350 let badge = if self516 let badge = if self
351 .user_store517 .user_store
@@ -361,8 +527,20 @@ impl CollabTitlebarItem { · 9 unmodified lines
361 .contained()527 .contained()
362 .with_style(titlebar.toggle_contacts_badge)528 .with_style(titlebar.toggle_contacts_badge)
363 .contained()529 .contained()
364 .with_margin_left(titlebar.toggle_contacts_button.default.icon_width)530 .with_margin_left(
365 .with_margin_top(titlebar.toggle_contacts_button.default.icon_width)531 titlebar
532 .toggle_contacts_button
533 .inactive_state()
534 .default
535 .icon_width,
536 )
537 .with_margin_top(
538 titlebar
539 .toggle_contacts_button
540 .inactive_state()
541 .default
542 .icon_width,
543 )
366 .aligned(),544 .aligned(),
367 )545 )
368 };546 };
@@ -372,8 +550,9 @@ impl CollabTitlebarItem { · 3 unmodified lines
372 MouseEventHandler::<ToggleContactsMenu, Self>::new(0, cx, |state, _| {550 MouseEventHandler::<ToggleContactsMenu, Self>::new(0, cx, |state, _| {
373 let style = titlebar551 let style = titlebar
374 .toggle_contacts_button552 .toggle_contacts_button
375 .style_for(state, self.contacts_popover.is_some());553 .in_state(self.contacts_popover.is_some())
376 Svg::new("icons/user_plus_16.svg")554 .style_for(state);
555 Svg::new("icons/radix/person.svg")
377 .with_color(style.color)556 .with_color(style.color)
378 .constrained()557 .constrained()
379 .with_width(style.icon_width)558 .with_width(style.icon_width)
@@ -400,7 +579,6 @@ impl CollabTitlebarItem { · 20 unmodified lines
400 .with_children(self.render_contacts_popover_host(titlebar, cx))579 .with_children(self.render_contacts_popover_host(titlebar, cx))
401 .into_any()580 .into_any()
402 }581 }
403
404 fn render_toggle_screen_sharing_button(582 fn render_toggle_screen_sharing_button(
405 &self,583 &self,
406 theme: &Theme,584 theme: &Theme,
@@ -410,16 +588,21 @@ impl CollabTitlebarItem { · 3 unmodified lines
410 let icon;588 let icon;
411 let tooltip;589 let tooltip;
412 if room.read(cx).is_screen_sharing() {590 if room.read(cx).is_screen_sharing() {
413 icon = "icons/enable_screen_sharing_12.svg";591 icon = "icons/radix/desktop.svg";
414 tooltip = "Stop Sharing Screen"592 tooltip = "Stop Sharing Screen"
415 } else {593 } else {
416 icon = "icons/disable_screen_sharing_12.svg";594 icon = "icons/radix/desktop.svg";
417 tooltip = "Share Screen";595 tooltip = "Share Screen";
418 }596 }
419 597
420 let titlebar = &theme.workspace.titlebar;598 let active = room.read(cx).is_screen_sharing();
599 let titlebar = &theme.titlebar;
421 MouseEventHandler::<ToggleScreenSharing, Self>::new(0, cx, |state, _| {600 MouseEventHandler::<ToggleScreenSharing, Self>::new(0, cx, |state, _| {
422 let style = titlebar.call_control.style_for(state, false);601 let style = titlebar
602 .screen_share_button
603 .in_state(active)
604 .style_for(state);
605
423 Svg::new(icon)606 Svg::new(icon)
424 .with_color(style.color)607 .with_color(style.color)
425 .constrained()608 .constrained()
@@ -445,7 +628,141 @@ impl CollabTitlebarItem { · 19 unmodified lines
445 .aligned()628 .aligned()
446 .into_any()629 .into_any()
447 }630 }
631 fn render_toggle_mute(
632 &self,
633 theme: &Theme,
634 room: &ModelHandle<Room>,
635 cx: &mut ViewContext<Self>,
636 ) -> AnyElement<Self> {
637 let icon;
638 let tooltip;
639 let is_muted = room.read(cx).is_muted();
640 if is_muted {
641 icon = "icons/radix/mic-mute.svg";
642 tooltip = "Unmute microphone\nRight click for options";
643 } else {
644 icon = "icons/radix/mic.svg";
645 tooltip = "Mute microphone\nRight click for options";
646 }
647
648 let titlebar = &theme.titlebar;
649 MouseEventHandler::<ToggleMute, Self>::new(0, cx, |state, _| {
650 let style = titlebar
651 .toggle_microphone_button
652 .in_state(is_muted)
653 .style_for(state);
654 let image = Svg::new(icon)
655 .with_color(style.color)
656 .constrained()
657 .with_width(style.icon_width)
658 .aligned()
659 .constrained()
660 .with_width(style.button_width)
661 .with_height(style.button_width)
662 .contained()
663 .with_style(style.container);
664 if let Some(color) = style.container.background_color {
665 image.with_background_color(color)
666 } else {
667 image
668 }
669 })
670 .with_cursor_style(CursorStyle::PointingHand)
671 .on_click(MouseButton::Left, move |_, _, cx| {
672 toggle_mute(&Default::default(), cx)
673 })
674 .with_tooltip::<ToggleMute>(
675 0,
676 tooltip.into(),
677 Some(Box::new(ToggleMute)),
678 theme.tooltip.clone(),
679 cx,
680 )
681 .aligned()
682 .into_any()
683 }
684 fn render_toggle_deafen(
685 &self,
686 theme: &Theme,
687 room: &ModelHandle<Room>,
688 cx: &mut ViewContext<Self>,
689 ) -> AnyElement<Self> {
690 let icon;
691 let tooltip;
692 let is_deafened = room.read(cx).is_deafened().unwrap_or(false);
693 if is_deafened {
694 icon = "icons/radix/speaker-off.svg";
695 tooltip = "Unmute speakers\nRight click for options";
696 } else {
697 icon = "icons/radix/speaker-loud.svg";
698 tooltip = "Mute speakers\nRight click for options";
699 }
448 700
701 let titlebar = &theme.titlebar;
702 MouseEventHandler::<ToggleDeafen, Self>::new(0, cx, |state, _| {
703 let style = titlebar
704 .toggle_speakers_button
705 .in_state(is_deafened)
706 .style_for(state);
707 Svg::new(icon)
708 .with_color(style.color)
709 .constrained()
710 .with_width(style.icon_width)
711 .aligned()
712 .constrained()
713 .with_width(style.button_width)
714 .with_height(style.button_width)
715 .contained()
716 .with_style(style.container)
717 })
718 .with_cursor_style(CursorStyle::PointingHand)
719 .on_click(MouseButton::Left, move |_, _, cx| {
720 toggle_deafen(&Default::default(), cx)
721 })
722 .with_tooltip::<ToggleDeafen>(
723 0,
724 tooltip.into(),
725 Some(Box::new(ToggleDeafen)),
726 theme.tooltip.clone(),
727 cx,
728 )
729 .aligned()
730 .into_any()
731 }
732 fn render_leave_call(&self, theme: &Theme, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
733 let icon = "icons/radix/exit.svg";
734 let tooltip = "Leave call";
735
736 let titlebar = &theme.titlebar;
737 MouseEventHandler::<LeaveCall, Self>::new(0, cx, |state, _| {
738 let style = titlebar.leave_call_button.style_for(state);
739 Svg::new(icon)
740 .with_color(style.color)
741 .constrained()
742 .with_width(style.icon_width)
743 .aligned()
744 .constrained()
745 .with_width(style.button_width)
746 .with_height(style.button_width)
747 .contained()
748 .with_style(style.container)
749 })
750 .with_cursor_style(CursorStyle::PointingHand)
751 .on_click(MouseButton::Left, move |_, _, cx| {
752 ActiveCall::global(cx)
753 .update(cx, |call, cx| call.hang_up(cx))
754 .detach_and_log_err(cx);
755 })
756 .with_tooltip::<LeaveCall>(
757 0,
758 tooltip.into(),
759 Some(Box::new(LeaveCall)),
760 theme.tooltip.clone(),
761 cx,
762 )
763 .aligned()
764 .into_any()
765 }
449 fn render_in_call_share_unshare_button(766 fn render_in_call_share_unshare_button(
450 &self,767 &self,
451 workspace: &ViewHandle<Workspace>,768 workspace: &ViewHandle<Workspace>,
@@ -458,14 +775,14 @@ impl CollabTitlebarItem { · 6 unmodified lines
458 }775 }
459 776
460 let is_shared = project.read(cx).is_shared();777 let is_shared = project.read(cx).is_shared();
461 let label = if is_shared { "Unshare" } else { "Share" };778 let label = if is_shared { "Stop Sharing" } else { "Share" };
462 let tooltip = if is_shared {779 let tooltip = if is_shared {
463 "Unshare project from call participants"780 "Stop sharing project with call participants"
464 } else {781 } else {
465 "Share project with call participants"782 "Share project with call participants"
466 };783 };
467 784
468 let titlebar = &theme.workspace.titlebar;785 let titlebar = &theme.titlebar;
469 786
470 enum ShareUnshare {}787 enum ShareUnshare {}
471 Some(788 Some(
@@ -473,7 +790,7 @@ impl CollabTitlebarItem { · 1 unmodified line
473 .with_child(790 .with_child(
474 MouseEventHandler::<ShareUnshare, Self>::new(0, cx, |state, _| {791 MouseEventHandler::<ShareUnshare, Self>::new(0, cx, |state, _| {
475 //TODO: Ensure this button has consistent width for both text variations792 //TODO: Ensure this button has consistent width for both text variations
476 let style = titlebar.share_button.style_for(state, false);793 let style = titlebar.share_button.inactive_state().style_for(state);
477 Label::new(label, style.text.clone())794 Label::new(label, style.text.clone())
478 .contained()795 .contained()
479 .with_style(style.container)796 .with_style(style.container)
@@ -496,7 +813,7 @@ impl CollabTitlebarItem { · 16 unmodified lines
496 )813 )
497 .aligned()814 .aligned()
498 .contained()815 .contained()
499 .with_margin_left(theme.workspace.titlebar.item_spacing)816 .with_margin_left(theme.titlebar.item_spacing)
500 .into_any(),817 .into_any(),
501 )818 )
502 }819 }
@@ -504,26 +821,56 @@ impl CollabTitlebarItem { · 1 unmodified line
504 fn render_user_menu_button(821 fn render_user_menu_button(
505 &self,822 &self,
506 theme: &Theme,823 theme: &Theme,
824 avatar: Option<Arc<ImageData>>,
507 cx: &mut ViewContext<Self>,825 cx: &mut ViewContext<Self>,
508 ) -> AnyElement<Self> {826 ) -> AnyElement<Self> {
509 let titlebar = &theme.workspace.titlebar;827 let tooltip = theme.tooltip.clone();
828 let user_menu_button_style = if avatar.is_some() {
829 &theme.titlebar.user_menu.user_menu_button_online
830 } else {
831 &theme.titlebar.user_menu.user_menu_button_offline
832 };
510 833
834 let avatar_style = &user_menu_button_style.avatar;
511 Stack::new()835 Stack::new()
512 .with_child(836 .with_child(
513 MouseEventHandler::<ToggleUserMenu, Self>::new(0, cx, |state, _| {837 MouseEventHandler::<ToggleUserMenu, Self>::new(0, cx, |state, _| {
514 let style = titlebar.call_control.style_for(state, false);838 let style = user_menu_button_style
515 Svg::new("icons/ellipsis_14.svg")839 .user_menu
516 .with_color(style.color)840 .inactive_state()
517 .constrained()841 .style_for(state);
518 .with_width(style.icon_width)842
843 let mut dropdown = Flex::row().align_children_center();
844
845 if let Some(avatar_img) = avatar {
846 dropdown = dropdown.with_child(Self::render_face(
847 avatar_img,
848 *avatar_style,
849 Color::transparent_black(),
850 None,
851 ));
852 };
853
854 dropdown
855 .with_child(
856 Svg::new("icons/caret_down_8.svg")
857 .with_color(user_menu_button_style.icon.color)
858 .constrained()
859 .with_width(user_menu_button_style.icon.width)
860 .contained()
861 .into_any(),
862 )
519 .aligned()863 .aligned()
520 .constrained()864 .constrained()
521 .with_width(style.button_width)865 .with_height(style.width)
522 .with_height(style.button_width)
523 .contained()866 .contained()
524 .with_style(style.container)867 .with_style(style.container)
868 .into_any()
525 })869 })
526 .with_cursor_style(CursorStyle::PointingHand)870 .with_cursor_style(CursorStyle::PointingHand)
871 .on_down(MouseButton::Left, move |_, this, cx| {
872 this.user_menu.update(cx, |menu, _| menu.delay_cancel());
873 })
527 .on_click(MouseButton::Left, move |_, this, cx| {874 .on_click(MouseButton::Left, move |_, this, cx| {
528 this.toggle_user_menu(&Default::default(), cx)875 this.toggle_user_menu(&Default::default(), cx)
529 })876 })
@@ -531,11 +878,10 @@ impl CollabTitlebarItem { · 1 unmodified line
531 0,878 0,
532 "Toggle user menu".to_owned(),879 "Toggle user menu".to_owned(),
533 Some(Box::new(ToggleUserMenu)),880 Some(Box::new(ToggleUserMenu)),
534 theme.tooltip.clone(),881 tooltip,
535 cx,882 cx,
536 )883 )
537 .contained()884 .contained(),
538 .with_margin_left(theme.workspace.titlebar.item_spacing),
539 )885 )
540 .with_child(886 .with_child(
541 ChildView::new(&self.user_menu, cx)887 ChildView::new(&self.user_menu, cx)
@@ -547,9 +893,9 @@ impl CollabTitlebarItem { · 5 unmodified lines
547 }893 }
548 894
549 fn render_sign_in_button(&self, theme: &Theme, cx: &mut ViewContext<Self>) -> AnyElement<Self> {895 fn render_sign_in_button(&self, theme: &Theme, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
550 let titlebar = &theme.workspace.titlebar;896 let titlebar = &theme.titlebar;
551 MouseEventHandler::<SignIn, Self>::new(0, cx, |state, _| {897 MouseEventHandler::<SignIn, Self>::new(0, cx, |state, _| {
552 let style = titlebar.sign_in_prompt.style_for(state, false);898 let style = titlebar.sign_in_button.inactive_state().style_for(state);
553 Label::new("Sign In", style.text.clone())899 Label::new("Sign In", style.text.clone())
554 .contained()900 .contained()
555 .with_style(style.container)901 .with_style(style.container)
@@ -572,7 +918,7 @@ impl CollabTitlebarItem { · 16 unmodified lines
572 self.contacts_popover.as_ref().map(|popover| {918 self.contacts_popover.as_ref().map(|popover| {
573 Overlay::new(ChildView::new(popover, cx))919 Overlay::new(ChildView::new(popover, cx))
574 .with_fit_mode(OverlayFitMode::SwitchAnchor)920 .with_fit_mode(OverlayFitMode::SwitchAnchor)
575 .with_anchor_corner(AnchorCorner::TopRight)921 .with_anchor_corner(AnchorCorner::TopLeft)
576 .with_z_index(999)922 .with_z_index(999)
577 .aligned()923 .aligned()
578 .bottom()924 .bottom()
@@ -611,11 +957,13 @@ impl CollabTitlebarItem { · 32 unmodified lines
611 replica_id,957 replica_id,
612 participant.peer_id,958 participant.peer_id,
613 Some(participant.location),959 Some(participant.location),
960 participant.muted,
961 participant.speaking,
614 workspace,962 workspace,
615 theme,963 theme,
616 cx,964 cx,
617 ))965 ))
618 .with_margin_right(theme.workspace.titlebar.face_pile_spacing),966 .with_margin_right(theme.titlebar.face_pile_spacing),
619 )967 )
620 })968 })
621 .collect()969 .collect()
@@ -627,19 +975,24 @@ impl CollabTitlebarItem { · 5 unmodified lines
627 theme: &Theme,975 theme: &Theme,
628 user: &Arc<User>,976 user: &Arc<User>,
629 peer_id: PeerId,977 peer_id: PeerId,
978 muted: bool,
979 speaking: bool,
630 cx: &mut ViewContext<Self>,980 cx: &mut ViewContext<Self>,
631 ) -> AnyElement<Self> {981 ) -> AnyElement<Self> {
632 let replica_id = workspace.read(cx).project().read(cx).replica_id();982 let replica_id = workspace.read(cx).project().read(cx).replica_id();
983
633 Container::new(self.render_face_pile(984 Container::new(self.render_face_pile(
634 user,985 user,
635 Some(replica_id),986 Some(replica_id),
636 peer_id,987 peer_id,
637 None,988 None,
989 muted,
990 speaking,
638 workspace,991 workspace,
639 theme,992 theme,
640 cx,993 cx,
641 ))994 ))
642 .with_margin_right(theme.workspace.titlebar.item_spacing)995 .with_margin_right(theme.titlebar.item_spacing)
643 .into_any()996 .into_any()
644 }997 }
645 998
@@ -649,6 +1002,8 @@ impl CollabTitlebarItem { · 3 unmodified lines
649 replica_id: Option<ReplicaId>,1002 replica_id: Option<ReplicaId>,
650 peer_id: PeerId,1003 peer_id: PeerId,
651 location: Option<ParticipantLocation>,1004 location: Option<ParticipantLocation>,
1005 muted: bool,
1006 speaking: bool,
652 workspace: &ViewHandle<Workspace>,1007 workspace: &ViewHandle<Workspace>,
653 theme: &Theme,1008 theme: &Theme,
654 cx: &mut ViewContext<Self>,1009 cx: &mut ViewContext<Self>,
@@ -671,15 +1026,23 @@ impl CollabTitlebarItem { · 16 unmodified lines
671 })1026 })
672 .unwrap_or(false);1027 .unwrap_or(false);
673 1028
674 let leader_style = theme.workspace.titlebar.leader_avatar;1029 let leader_style = theme.titlebar.leader_avatar;
675 let follower_style = theme.workspace.titlebar.follower_avatar;1030 let follower_style = theme.titlebar.follower_avatar;
1031
1032 let microphone_state = if muted {
1033 Some(theme.titlebar.muted)
1034 } else if speaking {
1035 Some(theme.titlebar.speaking)
1036 } else {
1037 None
1038 };
676 1039
677 let mut background_color = theme1040 let mut background_color = theme
678 .workspace
679 .titlebar1041 .titlebar
680 .container1042 .container
681 .background_color1043 .background_color
682 .unwrap_or_default();1044 .unwrap_or_default();
1045
683 if let Some(replica_id) = replica_id {1046 if let Some(replica_id) = replica_id {
684 if followed_by_self {1047 if followed_by_self {
685 let selection = theme.editor.replica_selection_style(replica_id).selection;1048 let selection = theme.editor.replica_selection_style(replica_id).selection;
@@ -690,11 +1053,12 @@ impl CollabTitlebarItem { · 4 unmodified lines
690 1053
691 let mut content = Stack::new()1054 let mut content = Stack::new()
692 .with_children(user.avatar.as_ref().map(|avatar| {1055 .with_children(user.avatar.as_ref().map(|avatar| {
693 let face_pile = FacePile::new(theme.workspace.titlebar.follower_avatar_overlap)1056 let face_pile = FacePile::new(theme.titlebar.follower_avatar_overlap)
694 .with_child(Self::render_face(1057 .with_child(Self::render_face(
695 avatar.clone(),1058 avatar.clone(),
696 Self::location_style(workspace, location, leader_style, cx),1059 Self::location_style(workspace, location, leader_style, cx),
697 background_color,1060 background_color,
1061 microphone_state,
698 ))1062 ))
699 .with_children(1063 .with_children(
700 (|| {1064 (|| {
@@ -726,6 +1090,7 @@ impl CollabTitlebarItem { · 25 unmodified lines
726 avatar.clone(),1090 avatar.clone(),
727 follower_style,1091 follower_style,
728 background_color,1092 background_color,
1093 None,
729 ))1094 ))
730 }))1095 }))
731 })()1096 })()
@@ -735,7 +1100,7 @@ impl CollabTitlebarItem { · 3 unmodified lines
735 1100
736 let mut container = face_pile1101 let mut container = face_pile
737 .contained()1102 .contained()
738 .with_style(theme.workspace.titlebar.leader_selection);1103 .with_style(theme.titlebar.leader_selection);
739 1104
740 if let Some(replica_id) = replica_id {1105 if let Some(replica_id) = replica_id {
741 if followed_by_self {1106 if followed_by_self {
@@ -752,8 +1117,8 @@ impl CollabTitlebarItem { · 10 unmodified lines
752 Some(1117 Some(
753 AvatarRibbon::new(color)1118 AvatarRibbon::new(color)
754 .constrained()1119 .constrained()
755 .with_width(theme.workspace.titlebar.avatar_ribbon.width)1120 .with_width(theme.titlebar.avatar_ribbon.width)
756 .with_height(theme.workspace.titlebar.avatar_ribbon.height)1121 .with_height(theme.titlebar.avatar_ribbon.height)
757 .aligned()1122 .aligned()
758 .bottom(),1123 .bottom(),
759 )1124 )
@@ -844,12 +1209,13 @@ impl CollabTitlebarItem { · 84 unmodified lines
844 avatar: Arc<ImageData>,1209 avatar: Arc<ImageData>,
845 avatar_style: AvatarStyle,1210 avatar_style: AvatarStyle,
846 background_color: Color,1211 background_color: Color,
1212 microphone_state: Option<Color>,
847 ) -> AnyElement<V> {1213 ) -> AnyElement<V> {
848 Image::from_data(avatar)1214 Image::from_data(avatar)
849 .with_style(avatar_style.image)1215 .with_style(avatar_style.image)
850 .aligned()1216 .aligned()
851 .contained()1217 .contained()
852 .with_background_color(background_color)1218 .with_background_color(microphone_state.unwrap_or(background_color))
853 .with_corner_radius(avatar_style.outer_corner_radius)1219 .with_corner_radius(avatar_style.outer_corner_radius)
854 .constrained()1220 .constrained()
855 .with_width(avatar_style.outer_width)1221 .with_width(avatar_style.outer_width)
@@ -873,22 +1239,22 @@ impl CollabTitlebarItem { · 17 unmodified lines
873 | client::Status::Reconnecting { .. }1239 | client::Status::Reconnecting { .. }
874 | client::Status::ReconnectionError { .. } => Some(1240 | client::Status::ReconnectionError { .. } => Some(
875 Svg::new("icons/cloud_slash_12.svg")1241 Svg::new("icons/cloud_slash_12.svg")
876 .with_color(theme.workspace.titlebar.offline_icon.color)1242 .with_color(theme.titlebar.offline_icon.color)
877 .constrained()1243 .constrained()
878 .with_width(theme.workspace.titlebar.offline_icon.width)1244 .with_width(theme.titlebar.offline_icon.width)
879 .aligned()1245 .aligned()
880 .contained()1246 .contained()
881 .with_style(theme.workspace.titlebar.offline_icon.container)1247 .with_style(theme.titlebar.offline_icon.container)
882 .into_any(),1248 .into_any(),
883 ),1249 ),
884 client::Status::UpgradeRequired => Some(1250 client::Status::UpgradeRequired => Some(
885 MouseEventHandler::<ConnectionStatusButton, Self>::new(0, cx, |_, _| {1251 MouseEventHandler::<ConnectionStatusButton, Self>::new(0, cx, |_, _| {
886 Label::new(1252 Label::new(
887 "Please update Zed to collaborate",1253 "Please update Zed to collaborate",
888 theme.workspace.titlebar.outdated_warning.text.clone(),1254 theme.titlebar.outdated_warning.text.clone(),
889 )1255 )
890 .contained()1256 .contained()
891 .with_style(theme.workspace.titlebar.outdated_warning.container)1257 .with_style(theme.titlebar.outdated_warning.container)
892 .aligned()1258 .aligned()
893 })1259 })
894 .with_cursor_style(CursorStyle::PointingHand)1260 .with_cursor_style(CursorStyle::PointingHand)
crates/collab_ui/src/collab_ui.rs+40−2
@@ -1,3 +1,4 @@
1mod branch_list;
1mod collab_titlebar_item;2mod collab_titlebar_item;
2mod contact_finder;3mod contact_finder;
3mod contact_list;4mod contact_list;
@@ -9,15 +10,26 @@ mod notifications; · 5 unmodified lines
9mod project_shared_notification;10mod project_shared_notification;
10mod sharing_status_indicator;11mod sharing_status_indicator;
11 12
12use call::ActiveCall;13use call::{ActiveCall, Room};
13pub use collab_titlebar_item::{CollabTitlebarItem, ToggleContactsMenu};14pub use collab_titlebar_item::{CollabTitlebarItem, ToggleContactsMenu};
14use gpui::{actions, AppContext, Task};15use gpui::{actions, AppContext, Task};
15use std::sync::Arc;16use std::sync::Arc;
17use util::ResultExt;
16use workspace::AppState;18use workspace::AppState;
17 19
18actions!(collab, [ToggleScreenSharing]);20actions!(
21 collab,
22 [
23 ToggleScreenSharing,
24 ToggleMute,
25 ToggleDeafen,
26 LeaveCall,
27 ShareMicrophone
28 ]
29);
19 30
20pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {31pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
32 branch_list::init(cx);
21 collab_titlebar_item::init(cx);33 collab_titlebar_item::init(cx);
22 contact_list::init(cx);34 contact_list::init(cx);
23 contact_finder::init(cx);35 contact_finder::init(cx);
@@ -27,6 +39,9 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) { · 3 unmodified lines
27 sharing_status_indicator::init(cx);39 sharing_status_indicator::init(cx);
28 40
29 cx.add_global_action(toggle_screen_sharing);41 cx.add_global_action(toggle_screen_sharing);
42 cx.add_global_action(toggle_mute);
43 cx.add_global_action(toggle_deafen);
44 cx.add_global_action(share_microphone);
30}45}
31 46
32pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {47pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {
@@ -41,3 +56,26 @@ pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) { · 8 unmodified lines
41 toggle_screen_sharing.detach_and_log_err(cx);56 toggle_screen_sharing.detach_and_log_err(cx);
42 }57 }
43}58}
59
60pub fn toggle_mute(_: &ToggleMute, cx: &mut AppContext) {
61 if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
62 room.update(cx, Room::toggle_mute)
63 .map(|task| task.detach_and_log_err(cx))
64 .log_err();
65 }
66}
67
68pub fn toggle_deafen(_: &ToggleDeafen, cx: &mut AppContext) {
69 if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
70 room.update(cx, Room::toggle_deafen)
71 .map(|task| task.detach_and_log_err(cx))
72 .log_err();
73 }
74}
75
76pub fn share_microphone(_: &ShareMicrophone, cx: &mut AppContext) {
77 if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
78 room.update(cx, Room::share_microphone)
79 .detach_and_log_err(cx)
80 }
81}
crates/collab_ui/src/contact_finder.rs+2−1
@@ -117,7 +117,8 @@ impl PickerDelegate for ContactFinderDelegate { · 116 unmodified lines
117 .contact_finder117 .contact_finder
118 .picker118 .picker
119 .item119 .item
120 .style_for(mouse_state, selected);120 .in_state(selected)
121 .style_for(mouse_state);
121 Flex::row()122 Flex::row()
122 .with_children(user.avatar.clone().map(|avatar| {123 .with_children(user.avatar.clone().map(|avatar| {
123 Image::from_data(avatar)124 Image::from_data(avatar)
crates/collab_ui/src/contact_list.rs+27−18
@@ -514,10 +514,10 @@ impl ContactList { · 513 unmodified lines
514 project_id: project.id,514 project_id: project.id,
515 worktree_root_names: project.worktree_root_names.clone(),515 worktree_root_names: project.worktree_root_names.clone(),
516 host_user_id: participant.user.id,516 host_user_id: participant.user.id,
517 is_last: projects.peek().is_none() && participant.tracks.is_empty(),517 is_last: projects.peek().is_none() && participant.video_tracks.is_empty(),
518 });518 });
519 }519 }
520 if !participant.tracks.is_empty() {520 if !participant.video_tracks.is_empty() {
521 participant_entries.push(ContactEntry::ParticipantScreen {521 participant_entries.push(ContactEntry::ParticipantScreen {
522 peer_id: participant.peer_id,522 peer_id: participant.peer_id,
523 is_last: true,523 is_last: true,
@@ -774,7 +774,8 @@ impl ContactList { · 250 unmodified lines
774 .with_style(774 .with_style(
775 *theme775 *theme
776 .contact_row776 .contact_row
777 .style_for(&mut Default::default(), is_selected),777 .in_state(is_selected)
778 .style_for(&mut Default::default()),
778 )779 )
779 .into_any()780 .into_any()
780 }781 }
@@ -797,7 +798,7 @@ impl ContactList { · 16 unmodified lines
797 .width798 .width
798 .or(theme.contact_avatar.height)799 .or(theme.contact_avatar.height)
799 .unwrap_or(0.);800 .unwrap_or(0.);
800 let row = &theme.project_row.default;801 let row = &theme.project_row.inactive_state().default;
801 let tree_branch = theme.tree_branch;802 let tree_branch = theme.tree_branch;
802 let line_height = row.name.text.line_height(font_cache);803 let line_height = row.name.text.line_height(font_cache);
803 let cap_height = row.name.text.cap_height(font_cache);804 let cap_height = row.name.text.cap_height(font_cache);
@@ -810,8 +811,11 @@ impl ContactList { · 6 unmodified lines
810 };811 };
811 812
812 MouseEventHandler::<JoinProject, Self>::new(project_id as usize, cx, |mouse_state, _| {813 MouseEventHandler::<JoinProject, Self>::new(project_id as usize, cx, |mouse_state, _| {
813 let tree_branch = *tree_branch.style_for(mouse_state, is_selected);814 let tree_branch = *tree_branch.in_state(is_selected).style_for(mouse_state);
814 let row = theme.project_row.style_for(mouse_state, is_selected);815 let row = theme
816 .project_row
817 .in_state(is_selected)
818 .style_for(mouse_state);
815 819
816 Flex::row()820 Flex::row()
817 .with_child(821 .with_child(
@@ -893,7 +897,7 @@ impl ContactList { · 75 unmodified lines
893 .width897 .width
894 .or(theme.contact_avatar.height)898 .or(theme.contact_avatar.height)
895 .unwrap_or(0.);899 .unwrap_or(0.);
896 let row = &theme.project_row.default;900 let row = &theme.project_row.inactive_state().default;
897 let tree_branch = theme.tree_branch;901 let tree_branch = theme.tree_branch;
898 let line_height = row.name.text.line_height(font_cache);902 let line_height = row.name.text.line_height(font_cache);
899 let cap_height = row.name.text.cap_height(font_cache);903 let cap_height = row.name.text.cap_height(font_cache);
@@ -904,8 +908,11 @@ impl ContactList { · 4 unmodified lines
904 peer_id.as_u64() as usize,908 peer_id.as_u64() as usize,
905 cx,909 cx,
906 |mouse_state, _| {910 |mouse_state, _| {
907 let tree_branch = *tree_branch.style_for(mouse_state, is_selected);911 let tree_branch = *tree_branch.in_state(is_selected).style_for(mouse_state);
908 let row = theme.project_row.style_for(mouse_state, is_selected);912 let row = theme
913 .project_row
914 .in_state(is_selected)
915 .style_for(mouse_state);
909 916
910 Flex::row()917 Flex::row()
911 .with_child(918 .with_child(
@@ -989,7 +996,8 @@ impl ContactList { · 77 unmodified lines
989 996
990 let header_style = theme997 let header_style = theme
991 .header_row998 .header_row
992 .style_for(&mut Default::default(), is_selected);999 .in_state(is_selected)
1000 .style_for(&mut Default::default());
993 let text = match section {1001 let text = match section {
994 Section::ActiveCall => "Collaborators",1002 Section::ActiveCall => "Collaborators",
995 Section::Requests => "Contact Requests",1003 Section::Requests => "Contact Requests",
@@ -999,7 +1007,7 @@ impl ContactList { · 3 unmodified lines
999 let leave_call = if section == Section::ActiveCall {1007 let leave_call = if section == Section::ActiveCall {
1000 Some(1008 Some(
1001 MouseEventHandler::<LeaveCallContactList, Self>::new(0, cx, |state, _| {1009 MouseEventHandler::<LeaveCallContactList, Self>::new(0, cx, |state, _| {
1002 let style = theme.leave_call.style_for(state, false);1010 let style = theme.leave_call.style_for(state);
1003 Label::new("Leave Call", style.text.clone())1011 Label::new("Leave Call", style.text.clone())
1004 .contained()1012 .contained()
1005 .with_style(style.container)1013 .with_style(style.container)
@@ -1110,8 +1118,7 @@ impl ContactList { · 104 unmodified lines
1110 contact.user.id as usize,1118 contact.user.id as usize,
1111 cx,1119 cx,
1112 |mouse_state, _| {1120 |mouse_state, _| {
1113 let button_style =1121 let button_style = theme.contact_button.style_for(mouse_state);
1114 theme.contact_button.style_for(mouse_state, false);
1115 render_icon_button(button_style, "icons/x_mark_8.svg")1122 render_icon_button(button_style, "icons/x_mark_8.svg")
1116 .aligned()1123 .aligned()
1117 .flex_float()1124 .flex_float()
@@ -1146,7 +1153,8 @@ impl ContactList { · 28 unmodified lines
1146 .with_style(1153 .with_style(
1147 *theme1154 *theme
1148 .contact_row1155 .contact_row
1149 .style_for(&mut Default::default(), is_selected),1156 .in_state(is_selected)
1157 .style_for(&mut Default::default()),
1150 )1158 )
1151 })1159 })
1152 .on_click(MouseButton::Left, move |_, this, cx| {1160 .on_click(MouseButton::Left, move |_, this, cx| {
@@ -1204,7 +1212,7 @@ impl ContactList { · 51 unmodified lines
1204 let button_style = if is_contact_request_pending {1212 let button_style = if is_contact_request_pending {
1205 &theme.disabled_button1213 &theme.disabled_button
1206 } else {1214 } else {
1207 theme.contact_button.style_for(mouse_state, false)1215 theme.contact_button.style_for(mouse_state)
1208 };1216 };
1209 render_icon_button(button_style, "icons/x_mark_8.svg").aligned()1217 render_icon_button(button_style, "icons/x_mark_8.svg").aligned()
1210 })1218 })
@@ -1227,7 +1235,7 @@ impl ContactList { · 16 unmodified lines
1227 let button_style = if is_contact_request_pending {1235 let button_style = if is_contact_request_pending {
1228 &theme.disabled_button1236 &theme.disabled_button
1229 } else {1237 } else {
1230 theme.contact_button.style_for(mouse_state, false)1238 theme.contact_button.style_for(mouse_state)
1231 };1239 };
1232 render_icon_button(button_style, "icons/check_8.svg")1240 render_icon_button(button_style, "icons/check_8.svg")
1233 .aligned()1241 .aligned()
@@ -1250,7 +1258,7 @@ impl ContactList { · 16 unmodified lines
1250 let button_style = if is_contact_request_pending {1258 let button_style = if is_contact_request_pending {
1251 &theme.disabled_button1259 &theme.disabled_button
1252 } else {1260 } else {
1253 theme.contact_button.style_for(mouse_state, false)1261 theme.contact_button.style_for(mouse_state)
1254 };1262 };
1255 render_icon_button(button_style, "icons/x_mark_8.svg")1263 render_icon_button(button_style, "icons/x_mark_8.svg")
1256 .aligned()1264 .aligned()
@@ -1277,7 +1285,8 @@ impl ContactList { · 20 unmodified lines
1277 .with_style(1285 .with_style(
1278 *theme1286 *theme
1279 .contact_row1287 .contact_row
1280 .style_for(&mut Default::default(), is_selected),1288 .in_state(is_selected)
1289 .style_for(&mut Default::default()),
1281 )1290 )
1282 .into_any()1291 .into_any()
1283 }1292 }
crates/collab_ui/src/notifications.rs+2−2
@@ -53,7 +53,7 @@ where · 52 unmodified lines
53 )53 )
54 .with_child(54 .with_child(
55 MouseEventHandler::<Dismiss, V>::new(user.id as usize, cx, |state, _| {55 MouseEventHandler::<Dismiss, V>::new(user.id as usize, cx, |state, _| {
56 let style = theme.dismiss_button.style_for(state, false);56 let style = theme.dismiss_button.style_for(state);
57 Svg::new("icons/x_mark_8.svg")57 Svg::new("icons/x_mark_8.svg")
58 .with_color(style.color)58 .with_color(style.color)
59 .constrained()59 .constrained()
@@ -93,7 +93,7 @@ where · 33 unmodified lines
93 .with_children(buttons.into_iter().enumerate().map(93 .with_children(buttons.into_iter().enumerate().map(
94 |(ix, (message, handler))| {94 |(ix, (message, handler))| {
95 MouseEventHandler::<Button, V>::new(ix, cx, |state, _| {95 MouseEventHandler::<Button, V>::new(ix, cx, |state, _| {
96 let button = theme.button.style_for(state, false);96 let button = theme.button.style_for(state);
97 Label::new(message, button.text.clone())97 Label::new(message, button.text.clone())
98 .contained()98 .contained()
99 .with_style(button.container)99 .with_style(button.container)
crates/command_palette/src/command_palette.rs+2−2
@@ -185,8 +185,8 @@ impl PickerDelegate for CommandPaletteDelegate { · 184 unmodified lines
185 let mat = &self.matches[ix];185 let mat = &self.matches[ix];
186 let command = &self.actions[mat.candidate_id];186 let command = &self.actions[mat.candidate_id];
187 let theme = theme::current(cx);187 let theme = theme::current(cx);
188 let style = theme.picker.item.style_for(mouse_state, selected);188 let style = theme.picker.item.in_state(selected).style_for(mouse_state);
189 let key_style = &theme.command_palette.key.style_for(mouse_state, selected);189 let key_style = &theme.command_palette.key.in_state(selected);
190 let keystroke_spacing = theme.command_palette.keystroke_spacing;190 let keystroke_spacing = theme.command_palette.keystroke_spacing;
191 191
192 Flex::row()192 Flex::row()
crates/context_menu/src/context_menu.rs+51−18
@@ -124,6 +124,7 @@ pub struct ContextMenu { · 123 unmodified lines
124 items: Vec<ContextMenuItem>,124 items: Vec<ContextMenuItem>,
125 selected_index: Option<usize>,125 selected_index: Option<usize>,
126 visible: bool,126 visible: bool,
127 delay_cancel: bool,
127 previously_focused_view_id: Option<usize>,128 previously_focused_view_id: Option<usize>,
128 parent_view_id: usize,129 parent_view_id: usize,
129 _actions_observation: Subscription,130 _actions_observation: Subscription,
@@ -178,6 +179,7 @@ impl ContextMenu { · 48 unmodified lines
178 pub fn new(parent_view_id: usize, cx: &mut ViewContext<Self>) -> Self {179 pub fn new(parent_view_id: usize, cx: &mut ViewContext<Self>) -> Self {
179 Self {180 Self {
180 show_count: 0,181 show_count: 0,
182 delay_cancel: false,
181 anchor_position: Default::default(),183 anchor_position: Default::default(),
182 anchor_corner: AnchorCorner::TopLeft,184 anchor_corner: AnchorCorner::TopLeft,
183 position_mode: OverlayPositionMode::Window,185 position_mode: OverlayPositionMode::Window,
@@ -232,15 +234,22 @@ impl ContextMenu { · 48 unmodified lines
232 }234 }
233 }235 }
234 236
237 pub fn delay_cancel(&mut self) {
238 self.delay_cancel = true;
239 }
240
235 fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {241 fn cancel(&mut self, _: &Cancel, cx: &mut ViewContext<Self>) {
236 self.reset(cx);242 if !self.delay_cancel {
237 let show_count = self.show_count;243 self.reset(cx);
238 cx.defer(move |this, cx| {244 let show_count = self.show_count;
239 if cx.handle().is_focused(cx) && this.show_count == show_count {245 cx.defer(move |this, cx| {
240 let window_id = cx.window_id();246 if cx.handle().is_focused(cx) && this.show_count == show_count {
241 (**cx).focus(window_id, this.previously_focused_view_id.take());247 (**cx).focus(this.previously_focused_view_id.take());
242 }248 }
243 });249 });
250 } else {
251 self.delay_cancel = false;
252 }
244 }253 }
245 254
246 fn reset(&mut self, cx: &mut ViewContext<Self>) {255 fn reset(&mut self, cx: &mut ViewContext<Self>) {
@@ -293,6 +302,34 @@ impl ContextMenu { · 46 unmodified lines
293 }302 }
294 }303 }
295 304
305 pub fn toggle(
306 &mut self,
307 anchor_position: Vector2F,
308 anchor_corner: AnchorCorner,
309 items: Vec<ContextMenuItem>,
310 cx: &mut ViewContext<Self>,
311 ) {
312 if self.visible() {
313 self.cancel(&Cancel, cx);
314 } else {
315 let mut items = items.into_iter().peekable();
316 if items.peek().is_some() {
317 self.items = items.collect();
318 self.anchor_position = anchor_position;
319 self.anchor_corner = anchor_corner;
320 self.visible = true;
321 self.show_count += 1;
322 if !cx.is_self_focused() {
323 self.previously_focused_view_id = cx.focused_view_id();
324 }
325 cx.focus_self();
326 } else {
327 self.visible = false;
328 }
329 }
330 cx.notify();
331 }
332
296 pub fn show(333 pub fn show(
297 &mut self,334 &mut self,
298 anchor_position: Vector2F,335 anchor_position: Vector2F,
@@ -328,10 +365,8 @@ impl ContextMenu { · 29 unmodified lines
328 Flex::column().with_children(self.items.iter().enumerate().map(|(ix, item)| {365 Flex::column().with_children(self.items.iter().enumerate().map(|(ix, item)| {
329 match item {366 match item {
330 ContextMenuItem::Item { label, .. } => {367 ContextMenuItem::Item { label, .. } => {
331 let style = style.item.style_for(368 let style = style.item.in_state(self.selected_index == Some(ix));
332 &mut Default::default(),369 let style = style.style_for(&mut Default::default());
333 Some(ix) == self.selected_index,
334 );
335 370
336 match label {371 match label {
337 ContextMenuItemLabel::String(label) => {372 ContextMenuItemLabel::String(label) => {
@@ -363,10 +398,8 @@ impl ContextMenu { · 25 unmodified lines
363 .with_children(self.items.iter().enumerate().map(|(ix, item)| {398 .with_children(self.items.iter().enumerate().map(|(ix, item)| {
364 match item {399 match item {
365 ContextMenuItem::Item { action, .. } => {400 ContextMenuItem::Item { action, .. } => {
366 let style = style.item.style_for(401 let style = style.item.in_state(self.selected_index == Some(ix));
367 &mut Default::default(),402 let style = style.style_for(&mut Default::default());
368 Some(ix) == self.selected_index,
369 );
370 403
371 match action {404 match action {
372 ContextMenuItemAction::Action(action) => KeystrokeLabel::new(405 ContextMenuItemAction::Action(action) => KeystrokeLabel::new(
@@ -412,8 +445,8 @@ impl ContextMenu { · 39 unmodified lines
412 let action = action.clone();445 let action = action.clone();
413 let view_id = self.parent_view_id;446 let view_id = self.parent_view_id;
414 MouseEventHandler::<MenuItem, ContextMenu>::new(ix, cx, |state, _| {447 MouseEventHandler::<MenuItem, ContextMenu>::new(ix, cx, |state, _| {
415 let style =448 let style = style.item.in_state(self.selected_index == Some(ix));
416 style.item.style_for(state, Some(ix) == self.selected_index);449 let style = style.style_for(state);
417 let keystroke = match &action {450 let keystroke = match &action {
418 ContextMenuItemAction::Action(action) => Some(451 ContextMenuItemAction::Action(action) => Some(
419 KeystrokeLabel::new(452 KeystrokeLabel::new(
crates/copilot/src/copilot.rs+8−5
@@ -15,7 +15,7 @@ use language::{ · 14 unmodified lines
15 ToPointUtf16,15 ToPointUtf16,
16};16};
17use log::{debug, error};17use log::{debug, error};
18use lsp::{LanguageServer, LanguageServerId};18use lsp::{LanguageServer, LanguageServerBinary, LanguageServerId};
19use node_runtime::NodeRuntime;19use node_runtime::NodeRuntime;
20use request::{LogMessage, StatusNotification};20use request::{LogMessage, StatusNotification};
21use settings::SettingsStore;21use settings::SettingsStore;
@@ -340,7 +340,7 @@ impl Copilot { · 318 unmodified lines
340 let http = util::http::FakeHttpClient::create(|_| async { unreachable!() });340 let http = util::http::FakeHttpClient::create(|_| async { unreachable!() });
341 let this = cx.add_model(|cx| Self {341 let this = cx.add_model(|cx| Self {
342 http: http.clone(),342 http: http.clone(),
343 node_runtime: NodeRuntime::new(http, cx.background().clone()),343 node_runtime: NodeRuntime::instance(http, cx.background().clone()),
344 server: CopilotServer::Running(RunningCopilotServer {344 server: CopilotServer::Running(RunningCopilotServer {
345 lsp: Arc::new(server),345 lsp: Arc::new(server),
346 sign_in_status: SignInStatus::Authorized,346 sign_in_status: SignInStatus::Authorized,
@@ -361,11 +361,14 @@ impl Copilot { · 14 unmodified lines
361 let start_language_server = async {361 let start_language_server = async {
362 let server_path = get_copilot_lsp(http).await?;362 let server_path = get_copilot_lsp(http).await?;
363 let node_path = node_runtime.binary_path().await?;363 let node_path = node_runtime.binary_path().await?;
364 let arguments: &[OsString] = &[server_path.into(), "--stdio".into()];364 let arguments: Vec<OsString> = vec![server_path.into(), "--stdio".into()];
365 let binary = LanguageServerBinary {
366 path: node_path,
367 arguments,
368 };
365 let server = LanguageServer::new(369 let server = LanguageServer::new(
366 LanguageServerId(0),370 LanguageServerId(0),
367 &node_path,371 binary,
368 arguments,
369 Path::new("/"),372 Path::new("/"),
370 None,373 None,
371 cx.clone(),374 cx.clone(),
crates/copilot/src/sign_in.rs+3−3
@@ -127,16 +127,16 @@ impl CopilotCodeVerification { · 126 unmodified lines
127 .with_child(127 .with_child(
128 Label::new(128 Label::new(
129 if copied { "Copied!" } else { "Copy" },129 if copied { "Copied!" } else { "Copy" },
130 device_code_style.cta.style_for(state, false).text.clone(),130 device_code_style.cta.style_for(state).text.clone(),
131 )131 )
132 .aligned()132 .aligned()
133 .contained()133 .contained()
134 .with_style(*device_code_style.right_container.style_for(state, false))134 .with_style(*device_code_style.right_container.style_for(state))
135 .constrained()135 .constrained()
136 .with_width(device_code_style.right),136 .with_width(device_code_style.right),
137 )137 )
138 .contained()138 .contained()
139 .with_style(device_code_style.cta.style_for(state, false).container)139 .with_style(device_code_style.cta.style_for(state).container)
140 })140 })
141 .on_click(gpui::platform::MouseButton::Left, {141 .on_click(gpui::platform::MouseButton::Left, {
142 let user_code = data.user_code.clone();142 let user_code = data.user_code.clone();
crates/copilot_button/src/copilot_button.rs+8−4
@@ -71,7 +71,8 @@ impl View for CopilotButton { · 70 unmodified lines
71 .status_bar71 .status_bar
72 .panel_buttons72 .panel_buttons
73 .button73 .button
74 .style_for(state, active);74 .in_state(active)
75 .style_for(state);
75 76
76 Flex::row()77 Flex::row()
77 .with_child(78 .with_child(
@@ -101,6 +102,9 @@ impl View for CopilotButton { · 23 unmodified lines
101 }102 }
102 })103 })
103 .with_cursor_style(CursorStyle::PointingHand)104 .with_cursor_style(CursorStyle::PointingHand)
105 .on_down(MouseButton::Left, |_, this, cx| {
106 this.popup_menu.update(cx, |menu, _| menu.delay_cancel());
107 })
104 .on_click(MouseButton::Left, {108 .on_click(MouseButton::Left, {
105 let status = status.clone();109 let status = status.clone();
106 move |_, this, cx| match status {110 move |_, this, cx| match status {
@@ -185,7 +189,7 @@ impl CopilotButton { · 78 unmodified lines
185 }));189 }));
186 190
187 self.popup_menu.update(cx, |menu, cx| {191 self.popup_menu.update(cx, |menu, cx| {
188 menu.show(192 menu.toggle(
189 Default::default(),193 Default::default(),
190 AnchorCorner::BottomRight,194 AnchorCorner::BottomRight,
191 menu_options,195 menu_options,
@@ -255,7 +259,7 @@ impl CopilotButton { · 63 unmodified lines
255 move |state: &mut MouseState, style: &theme::ContextMenuItem| {259 move |state: &mut MouseState, style: &theme::ContextMenuItem| {
256 Flex::row()260 Flex::row()
257 .with_child(Label::new("Copilot Settings", style.label.clone()))261 .with_child(Label::new("Copilot Settings", style.label.clone()))
258 .with_child(theme::ui::icon(icon_style.style_for(state, false)))262 .with_child(theme::ui::icon(icon_style.style_for(state)))
259 .align_children_center()263 .align_children_center()
260 .into_any()264 .into_any()
261 },265 },
@@ -265,7 +269,7 @@ impl CopilotButton { · 3 unmodified lines
265 menu_options.push(ContextMenuItem::action("Sign Out", SignOut));269 menu_options.push(ContextMenuItem::action("Sign Out", SignOut));
266 270
267 self.popup_menu.update(cx, |menu, cx| {271 self.popup_menu.update(cx, |menu, cx| {
268 menu.show(272 menu.toggle(
269 Default::default(),273 Default::default(),
270 AnchorCorner::BottomRight,274 AnchorCorner::BottomRight,
271 menu_options,275 menu_options,
crates/diagnostics/src/diagnostics.rs+3−1
@@ -1509,7 +1509,8 @@ mod tests { · 1508 unmodified lines
1509 let snapshot = editor.snapshot(cx);1509 let snapshot = editor.snapshot(cx);
1510 snapshot1510 snapshot
1511 .blocks_in_range(0..snapshot.max_point().row())1511 .blocks_in_range(0..snapshot.max_point().row())
1512 .filter_map(|(row, block)| {1512 .enumerate()
1513 .filter_map(|(ix, (row, block))| {
1513 let name = match block {1514 let name = match block {
1514 TransformBlock::Custom(block) => block1515 TransformBlock::Custom(block) => block
1515 .render(&mut BlockContext {1516 .render(&mut BlockContext {
@@ -1520,6 +1521,7 @@ mod tests { · 4 unmodified lines
1520 gutter_width: 0.,1521 gutter_width: 0.,
1521 line_height: 0.,1522 line_height: 0.,
1522 em_width: 0.,1523 em_width: 0.,
1524 block_id: ix,
1523 })1525 })
1524 .name()?1526 .name()?
1525 .to_string(),1527 .to_string(),
crates/diagnostics/src/items.rs+2−2
@@ -100,7 +100,7 @@ impl View for DiagnosticIndicator { · 99 unmodified lines
100 .workspace100 .workspace
101 .status_bar101 .status_bar
102 .diagnostic_summary102 .diagnostic_summary
103 .style_for(state, false);103 .style_for(state);
104 104
105 let mut summary_row = Flex::row();105 let mut summary_row = Flex::row();
106 if self.summary.error_count > 0 {106 if self.summary.error_count > 0 {
@@ -198,7 +198,7 @@ impl View for DiagnosticIndicator { · 91 unmodified lines
198 MouseEventHandler::<Message, _>::new(1, cx, |state, _| {198 MouseEventHandler::<Message, _>::new(1, cx, |state, _| {
199 Label::new(199 Label::new(
200 diagnostic.message.split('\n').next().unwrap().to_string(),200 diagnostic.message.split('\n').next().unwrap().to_string(),
201 message_style.style_for(state, false).text.clone(),201 message_style.style_for(state).text.clone(),
202 )202 )
203 .aligned()203 .aligned()
204 .contained()204 .contained()
crates/editor/src/display_map.rs+86−70
@@ -1,24 +1,23 @@
1mod block_map;1mod block_map;
2mod fold_map;2mod fold_map;
3mod suggestion_map;3mod inlay_map;
4mod tab_map;4mod tab_map;
5mod wrap_map;5mod wrap_map;
6 6
7use crate::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset, ToPoint};7use crate::{Anchor, AnchorRangeExt, InlayId, MultiBuffer, MultiBufferSnapshot, ToOffset, ToPoint};
8pub use block_map::{BlockMap, BlockPoint};8pub use block_map::{BlockMap, BlockPoint};
9use collections::{HashMap, HashSet};9use collections::{HashMap, HashSet};
10use fold_map::{FoldMap, FoldOffset};10use fold_map::FoldMap;
11use gpui::{11use gpui::{
12 color::Color,12 color::Color,
13 fonts::{FontId, HighlightStyle},13 fonts::{FontId, HighlightStyle},
14 Entity, ModelContext, ModelHandle,14 Entity, ModelContext, ModelHandle,
15};15};
16use inlay_map::InlayMap;
16use language::{17use language::{
17 language_settings::language_settings, OffsetUtf16, Point, Subscription as BufferSubscription,18 language_settings::language_settings, OffsetUtf16, Point, Subscription as BufferSubscription,
18};19};
19use std::{any::TypeId, fmt::Debug, num::NonZeroU32, ops::Range, sync::Arc};20use std::{any::TypeId, fmt::Debug, num::NonZeroU32, ops::Range, sync::Arc};
20pub use suggestion_map::Suggestion;
21use suggestion_map::SuggestionMap;
22use sum_tree::{Bias, TreeMap};21use sum_tree::{Bias, TreeMap};
23use tab_map::TabMap;22use tab_map::TabMap;
24use wrap_map::WrapMap;23use wrap_map::WrapMap;
@@ -28,6 +27,8 @@ pub use block_map::{ · 3 unmodified lines
28 BlockDisposition, BlockId, BlockProperties, BlockStyle, RenderBlock, TransformBlock,27 BlockDisposition, BlockId, BlockProperties, BlockStyle, RenderBlock, TransformBlock,
29};28};
30 29
30pub use self::inlay_map::Inlay;
31
31#[derive(Copy, Clone, Debug, PartialEq, Eq)]32#[derive(Copy, Clone, Debug, PartialEq, Eq)]
32pub enum FoldStatus {33pub enum FoldStatus {
33 Folded,34 Folded,
@@ -44,7 +45,7 @@ pub struct DisplayMap { · 10 unmodified lines
44 buffer: ModelHandle<MultiBuffer>,45 buffer: ModelHandle<MultiBuffer>,
45 buffer_subscription: BufferSubscription,46 buffer_subscription: BufferSubscription,
46 fold_map: FoldMap,47 fold_map: FoldMap,
47 suggestion_map: SuggestionMap,48 inlay_map: InlayMap,
48 tab_map: TabMap,49 tab_map: TabMap,
49 wrap_map: ModelHandle<WrapMap>,50 wrap_map: ModelHandle<WrapMap>,
50 block_map: BlockMap,51 block_map: BlockMap,
@@ -69,8 +70,8 @@ impl DisplayMap { · 18 unmodified lines
69 let buffer_subscription = buffer.update(cx, |buffer, _| buffer.subscribe());70 let buffer_subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
70 71
71 let tab_size = Self::tab_size(&buffer, cx);72 let tab_size = Self::tab_size(&buffer, cx);
72 let (fold_map, snapshot) = FoldMap::new(buffer.read(cx).snapshot(cx));73 let (inlay_map, snapshot) = InlayMap::new(buffer.read(cx).snapshot(cx));
73 let (suggestion_map, snapshot) = SuggestionMap::new(snapshot);74 let (fold_map, snapshot) = FoldMap::new(snapshot);
74 let (tab_map, snapshot) = TabMap::new(snapshot, tab_size);75 let (tab_map, snapshot) = TabMap::new(snapshot, tab_size);
75 let (wrap_map, snapshot) = WrapMap::new(snapshot, font_id, font_size, wrap_width, cx);76 let (wrap_map, snapshot) = WrapMap::new(snapshot, font_id, font_size, wrap_width, cx);
76 let block_map = BlockMap::new(snapshot, buffer_header_height, excerpt_header_height);77 let block_map = BlockMap::new(snapshot, buffer_header_height, excerpt_header_height);
@@ -79,7 +80,7 @@ impl DisplayMap { · 2 unmodified lines
79 buffer,80 buffer,
80 buffer_subscription,81 buffer_subscription,
81 fold_map,82 fold_map,
82 suggestion_map,83 inlay_map,
83 tab_map,84 tab_map,
84 wrap_map,85 wrap_map,
85 block_map,86 block_map,
@@ -88,16 +89,13 @@ impl DisplayMap { · 2 unmodified lines
88 }89 }
89 }90 }
90 91
91 pub fn snapshot(&self, cx: &mut ModelContext<Self>) -> DisplaySnapshot {92 pub fn snapshot(&mut self, cx: &mut ModelContext<Self>) -> DisplaySnapshot {
92 let buffer_snapshot = self.buffer.read(cx).snapshot(cx);93 let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
93 let edits = self.buffer_subscription.consume().into_inner();94 let edits = self.buffer_subscription.consume().into_inner();
94 let (fold_snapshot, edits) = self.fold_map.read(buffer_snapshot, edits);95 let (inlay_snapshot, edits) = self.inlay_map.sync(buffer_snapshot, edits);
95 let (suggestion_snapshot, edits) = self.suggestion_map.sync(fold_snapshot.clone(), edits);96 let (fold_snapshot, edits) = self.fold_map.read(inlay_snapshot.clone(), edits);
96
97 let tab_size = Self::tab_size(&self.buffer, cx);97 let tab_size = Self::tab_size(&self.buffer, cx);
98 let (tab_snapshot, edits) = self98 let (tab_snapshot, edits) = self.tab_map.sync(fold_snapshot.clone(), edits, tab_size);
99 .tab_map
100 .sync(suggestion_snapshot.clone(), edits, tab_size);
101 let (wrap_snapshot, edits) = self99 let (wrap_snapshot, edits) = self
102 .wrap_map100 .wrap_map
103 .update(cx, |map, cx| map.sync(tab_snapshot.clone(), edits, cx));101 .update(cx, |map, cx| map.sync(tab_snapshot.clone(), edits, cx));
@@ -106,7 +104,7 @@ impl DisplayMap { · 2 unmodified lines
106 DisplaySnapshot {104 DisplaySnapshot {
107 buffer_snapshot: self.buffer.read(cx).snapshot(cx),105 buffer_snapshot: self.buffer.read(cx).snapshot(cx),
108 fold_snapshot,106 fold_snapshot,
109 suggestion_snapshot,107 inlay_snapshot,
110 tab_snapshot,108 tab_snapshot,
111 wrap_snapshot,109 wrap_snapshot,
112 block_snapshot,110 block_snapshot,
@@ -132,15 +130,14 @@ impl DisplayMap { · 19 unmodified lines
132 let snapshot = self.buffer.read(cx).snapshot(cx);130 let snapshot = self.buffer.read(cx).snapshot(cx);
133 let edits = self.buffer_subscription.consume().into_inner();131 let edits = self.buffer_subscription.consume().into_inner();
134 let tab_size = Self::tab_size(&self.buffer, cx);132 let tab_size = Self::tab_size(&self.buffer, cx);
133 let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
135 let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);134 let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);
136 let (snapshot, edits) = self.suggestion_map.sync(snapshot, edits);
137 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);135 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
138 let (snapshot, edits) = self136 let (snapshot, edits) = self
139 .wrap_map137 .wrap_map
140 .update(cx, |map, cx| map.sync(snapshot, edits, cx));138 .update(cx, |map, cx| map.sync(snapshot, edits, cx));
141 self.block_map.read(snapshot, edits);139 self.block_map.read(snapshot, edits);
142 let (snapshot, edits) = fold_map.fold(ranges);140 let (snapshot, edits) = fold_map.fold(ranges);
143 let (snapshot, edits) = self.suggestion_map.sync(snapshot, edits);
144 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);141 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
145 let (snapshot, edits) = self142 let (snapshot, edits) = self
146 .wrap_map143 .wrap_map
@@ -157,15 +154,14 @@ impl DisplayMap { · 10 unmodified lines
157 let snapshot = self.buffer.read(cx).snapshot(cx);154 let snapshot = self.buffer.read(cx).snapshot(cx);
158 let edits = self.buffer_subscription.consume().into_inner();155 let edits = self.buffer_subscription.consume().into_inner();
159 let tab_size = Self::tab_size(&self.buffer, cx);156 let tab_size = Self::tab_size(&self.buffer, cx);
157 let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
160 let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);158 let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);
161 let (snapshot, edits) = self.suggestion_map.sync(snapshot, edits);
162 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);159 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
163 let (snapshot, edits) = self160 let (snapshot, edits) = self
164 .wrap_map161 .wrap_map
165 .update(cx, |map, cx| map.sync(snapshot, edits, cx));162 .update(cx, |map, cx| map.sync(snapshot, edits, cx));
166 self.block_map.read(snapshot, edits);163 self.block_map.read(snapshot, edits);
167 let (snapshot, edits) = fold_map.unfold(ranges, inclusive);164 let (snapshot, edits) = fold_map.unfold(ranges, inclusive);
168 let (snapshot, edits) = self.suggestion_map.sync(snapshot, edits);
169 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);165 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
170 let (snapshot, edits) = self166 let (snapshot, edits) = self
171 .wrap_map167 .wrap_map
@@ -181,8 +177,8 @@ impl DisplayMap { · 9 unmodified lines
181 let snapshot = self.buffer.read(cx).snapshot(cx);177 let snapshot = self.buffer.read(cx).snapshot(cx);
182 let edits = self.buffer_subscription.consume().into_inner();178 let edits = self.buffer_subscription.consume().into_inner();
183 let tab_size = Self::tab_size(&self.buffer, cx);179 let tab_size = Self::tab_size(&self.buffer, cx);
180 let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
184 let (snapshot, edits) = self.fold_map.read(snapshot, edits);181 let (snapshot, edits) = self.fold_map.read(snapshot, edits);
185 let (snapshot, edits) = self.suggestion_map.sync(snapshot, edits);
186 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);182 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
187 let (snapshot, edits) = self183 let (snapshot, edits) = self
188 .wrap_map184 .wrap_map
@@ -199,8 +195,8 @@ impl DisplayMap { · 10 unmodified lines
199 let snapshot = self.buffer.read(cx).snapshot(cx);195 let snapshot = self.buffer.read(cx).snapshot(cx);
200 let edits = self.buffer_subscription.consume().into_inner();196 let edits = self.buffer_subscription.consume().into_inner();
201 let tab_size = Self::tab_size(&self.buffer, cx);197 let tab_size = Self::tab_size(&self.buffer, cx);
198 let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
202 let (snapshot, edits) = self.fold_map.read(snapshot, edits);199 let (snapshot, edits) = self.fold_map.read(snapshot, edits);
203 let (snapshot, edits) = self.suggestion_map.sync(snapshot, edits);
204 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);200 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
205 let (snapshot, edits) = self201 let (snapshot, edits) = self
206 .wrap_map202 .wrap_map
@@ -231,32 +227,6 @@ impl DisplayMap { · 24 unmodified lines
231 self.text_highlights.remove(&Some(type_id))227 self.text_highlights.remove(&Some(type_id))
232 }228 }
233 229
234 pub fn has_suggestion(&self) -> bool {
235 self.suggestion_map.has_suggestion()
236 }
237
238 pub fn replace_suggestion<T>(
239 &self,
240 new_suggestion: Option<Suggestion<T>>,
241 cx: &mut ModelContext<Self>,
242 ) -> Option<Suggestion<FoldOffset>>
243 where
244 T: ToPoint,
245 {
246 let snapshot = self.buffer.read(cx).snapshot(cx);
247 let edits = self.buffer_subscription.consume().into_inner();
248 let tab_size = Self::tab_size(&self.buffer, cx);
249 let (snapshot, edits) = self.fold_map.read(snapshot, edits);
250 let (snapshot, edits, old_suggestion) =
251 self.suggestion_map.replace(new_suggestion, snapshot, edits);
252 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
253 let (snapshot, edits) = self
254 .wrap_map
255 .update(cx, |map, cx| map.sync(snapshot, edits, cx));
256 self.block_map.read(snapshot, edits);
257 old_suggestion
258 }
259
260 pub fn set_font(&self, font_id: FontId, font_size: f32, cx: &mut ModelContext<Self>) -> bool {230 pub fn set_font(&self, font_id: FontId, font_size: f32, cx: &mut ModelContext<Self>) -> bool {
261 self.wrap_map231 self.wrap_map
262 .update(cx, |map, cx| map.set_font(font_id, font_size, cx))232 .update(cx, |map, cx| map.set_font(font_id, font_size, cx))
@@ -271,6 +241,39 @@ impl DisplayMap { · 8 unmodified lines
271 .update(cx, |map, cx| map.set_wrap_width(width, cx))241 .update(cx, |map, cx| map.set_wrap_width(width, cx))
272 }242 }
273 243
244 pub fn current_inlays(&self) -> impl Iterator<Item = &Inlay> {
245 self.inlay_map.current_inlays()
246 }
247
248 pub fn splice_inlays(
249 &mut self,
250 to_remove: Vec<InlayId>,
251 to_insert: Vec<Inlay>,
252 cx: &mut ModelContext<Self>,
253 ) {
254 if to_remove.is_empty() && to_insert.is_empty() {
255 return;
256 }
257 let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
258 let edits = self.buffer_subscription.consume().into_inner();
259 let (snapshot, edits) = self.inlay_map.sync(buffer_snapshot, edits);
260 let (snapshot, edits) = self.fold_map.read(snapshot, edits);
261 let tab_size = Self::tab_size(&self.buffer, cx);
262 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
263 let (snapshot, edits) = self
264 .wrap_map
265 .update(cx, |map, cx| map.sync(snapshot, edits, cx));
266 self.block_map.read(snapshot, edits);
267
268 let (snapshot, edits) = self.inlay_map.splice(to_remove, to_insert);
269 let (snapshot, edits) = self.fold_map.read(snapshot, edits);
270 let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
271 let (snapshot, edits) = self
272 .wrap_map
273 .update(cx, |map, cx| map.sync(snapshot, edits, cx));
274 self.block_map.read(snapshot, edits);
275 }
276
274 fn tab_size(buffer: &ModelHandle<MultiBuffer>, cx: &mut ModelContext<Self>) -> NonZeroU32 {277 fn tab_size(buffer: &ModelHandle<MultiBuffer>, cx: &mut ModelContext<Self>) -> NonZeroU32 {
275 let language = buffer278 let language = buffer
276 .read(cx)279 .read(cx)
@@ -288,7 +291,7 @@ impl DisplayMap { · 11 unmodified lines
288pub struct DisplaySnapshot {291pub struct DisplaySnapshot {
289 pub buffer_snapshot: MultiBufferSnapshot,292 pub buffer_snapshot: MultiBufferSnapshot,
290 fold_snapshot: fold_map::FoldSnapshot,293 fold_snapshot: fold_map::FoldSnapshot,
291 suggestion_snapshot: suggestion_map::SuggestionSnapshot,294 inlay_snapshot: inlay_map::InlaySnapshot,
292 tab_snapshot: tab_map::TabSnapshot,295 tab_snapshot: tab_map::TabSnapshot,
293 wrap_snapshot: wrap_map::WrapSnapshot,296 wrap_snapshot: wrap_map::WrapSnapshot,
294 block_snapshot: block_map::BlockSnapshot,297 block_snapshot: block_map::BlockSnapshot,
@@ -316,9 +319,11 @@ impl DisplaySnapshot { · 21 unmodified lines
316 319
317 pub fn prev_line_boundary(&self, mut point: Point) -> (Point, DisplayPoint) {320 pub fn prev_line_boundary(&self, mut point: Point) -> (Point, DisplayPoint) {
318 loop {321 loop {
319 let mut fold_point = self.fold_snapshot.to_fold_point(point, Bias::Left);322 let mut inlay_point = self.inlay_snapshot.to_inlay_point(point);
320 *fold_point.column_mut() = 0;323 let mut fold_point = self.fold_snapshot.to_fold_point(inlay_point, Bias::Left);
321 point = fold_point.to_buffer_point(&self.fold_snapshot);324 fold_point.0.column = 0;
325 inlay_point = fold_point.to_inlay_point(&self.fold_snapshot);
326 point = self.inlay_snapshot.to_buffer_point(inlay_point);
322 327
323 let mut display_point = self.point_to_display_point(point, Bias::Left);328 let mut display_point = self.point_to_display_point(point, Bias::Left);
324 *display_point.column_mut() = 0;329 *display_point.column_mut() = 0;
@@ -332,9 +337,11 @@ impl DisplaySnapshot { · 7 unmodified lines
332 337
333 pub fn next_line_boundary(&self, mut point: Point) -> (Point, DisplayPoint) {338 pub fn next_line_boundary(&self, mut point: Point) -> (Point, DisplayPoint) {
334 loop {339 loop {
335 let mut fold_point = self.fold_snapshot.to_fold_point(point, Bias::Right);340 let mut inlay_point = self.inlay_snapshot.to_inlay_point(point);
336 *fold_point.column_mut() = self.fold_snapshot.line_len(fold_point.row());341 let mut fold_point = self.fold_snapshot.to_fold_point(inlay_point, Bias::Right);
337 point = fold_point.to_buffer_point(&self.fold_snapshot);342 fold_point.0.column = self.fold_snapshot.line_len(fold_point.row());
343 inlay_point = fold_point.to_inlay_point(&self.fold_snapshot);
344 point = self.inlay_snapshot.to_buffer_point(inlay_point);
338 345
339 let mut display_point = self.point_to_display_point(point, Bias::Right);346 let mut display_point = self.point_to_display_point(point, Bias::Right);
340 *display_point.column_mut() = self.line_len(display_point.row());347 *display_point.column_mut() = self.line_len(display_point.row());
@@ -364,9 +371,9 @@ impl DisplaySnapshot { · 23 unmodified lines
364 }371 }
365 372
366 fn point_to_display_point(&self, point: Point, bias: Bias) -> DisplayPoint {373 fn point_to_display_point(&self, point: Point, bias: Bias) -> DisplayPoint {
367 let fold_point = self.fold_snapshot.to_fold_point(point, bias);374 let inlay_point = self.inlay_snapshot.to_inlay_point(point);
368 let suggestion_point = self.suggestion_snapshot.to_suggestion_point(fold_point);375 let fold_point = self.fold_snapshot.to_fold_point(inlay_point, bias);
369 let tab_point = self.tab_snapshot.to_tab_point(suggestion_point);376 let tab_point = self.tab_snapshot.to_tab_point(fold_point);
370 let wrap_point = self.wrap_snapshot.tab_point_to_wrap_point(tab_point);377 let wrap_point = self.wrap_snapshot.tab_point_to_wrap_point(tab_point);
371 let block_point = self.block_snapshot.to_block_point(wrap_point);378 let block_point = self.block_snapshot.to_block_point(wrap_point);
372 DisplayPoint(block_point)379 DisplayPoint(block_point)
@@ -376,9 +383,9 @@ impl DisplaySnapshot { · 3 unmodified lines
376 let block_point = point.0;383 let block_point = point.0;
377 let wrap_point = self.block_snapshot.to_wrap_point(block_point);384 let wrap_point = self.block_snapshot.to_wrap_point(block_point);
378 let tab_point = self.wrap_snapshot.to_tab_point(wrap_point);385 let tab_point = self.wrap_snapshot.to_tab_point(wrap_point);
379 let suggestion_point = self.tab_snapshot.to_suggestion_point(tab_point, bias).0;386 let fold_point = self.tab_snapshot.to_fold_point(tab_point, bias).0;
380 let fold_point = self.suggestion_snapshot.to_fold_point(suggestion_point);387 let inlay_point = fold_point.to_inlay_point(&self.fold_snapshot);
381 fold_point.to_buffer_point(&self.fold_snapshot)388 self.inlay_snapshot.to_buffer_point(inlay_point)
382 }389 }
383 390
384 pub fn max_point(&self) -> DisplayPoint {391 pub fn max_point(&self) -> DisplayPoint {
@@ -388,7 +395,13 @@ impl DisplaySnapshot { · 3 unmodified lines
388 /// Returns text chunks starting at the given display row until the end of the file395 /// Returns text chunks starting at the given display row until the end of the file
389 pub fn text_chunks(&self, display_row: u32) -> impl Iterator<Item = &str> {396 pub fn text_chunks(&self, display_row: u32) -> impl Iterator<Item = &str> {
390 self.block_snapshot397 self.block_snapshot
391 .chunks(display_row..self.max_point().row() + 1, false, None, None)398 .chunks(
399 display_row..self.max_point().row() + 1,
400 false,
401 None,
402 None,
403 None,
404 )
392 .map(|h| h.text)405 .map(|h| h.text)
393 }406 }
394 407
@@ -396,7 +409,7 @@ impl DisplaySnapshot { · 1 unmodified line
396 pub fn reverse_text_chunks(&self, display_row: u32) -> impl Iterator<Item = &str> {409 pub fn reverse_text_chunks(&self, display_row: u32) -> impl Iterator<Item = &str> {
397 (0..=display_row).into_iter().rev().flat_map(|row| {410 (0..=display_row).into_iter().rev().flat_map(|row| {
398 self.block_snapshot411 self.block_snapshot
399 .chunks(row..row + 1, false, None, None)412 .chunks(row..row + 1, false, None, None, None)
400 .map(|h| h.text)413 .map(|h| h.text)
401 .collect::<Vec<_>>()414 .collect::<Vec<_>>()
402 .into_iter()415 .into_iter()
@@ -408,13 +421,15 @@ impl DisplaySnapshot { · 5 unmodified lines
408 &self,421 &self,
409 display_rows: Range<u32>,422 display_rows: Range<u32>,
410 language_aware: bool,423 language_aware: bool,
411 suggestion_highlight: Option<HighlightStyle>,424 hint_highlights: Option<HighlightStyle>,
425 suggestion_highlights: Option<HighlightStyle>,
412 ) -> DisplayChunks<'_> {426 ) -> DisplayChunks<'_> {
413 self.block_snapshot.chunks(427 self.block_snapshot.chunks(
414 display_rows,428 display_rows,
415 language_aware,429 language_aware,
416 Some(&self.text_highlights),430 Some(&self.text_highlights),
417 suggestion_highlight,431 hint_highlights,
432 suggestion_highlights,
418 )433 )
419 }434 }
420 435
@@ -790,9 +805,10 @@ impl DisplayPoint { · 369 unmodified lines
790 pub fn to_offset(self, map: &DisplaySnapshot, bias: Bias) -> usize {805 pub fn to_offset(self, map: &DisplaySnapshot, bias: Bias) -> usize {
791 let wrap_point = map.block_snapshot.to_wrap_point(self.0);806 let wrap_point = map.block_snapshot.to_wrap_point(self.0);
792 let tab_point = map.wrap_snapshot.to_tab_point(wrap_point);807 let tab_point = map.wrap_snapshot.to_tab_point(wrap_point);
793 let suggestion_point = map.tab_snapshot.to_suggestion_point(tab_point, bias).0;808 let fold_point = map.tab_snapshot.to_fold_point(tab_point, bias).0;
794 let fold_point = map.suggestion_snapshot.to_fold_point(suggestion_point);809 let inlay_point = fold_point.to_inlay_point(&map.fold_snapshot);
795 fold_point.to_buffer_offset(&map.fold_snapshot)810 map.inlay_snapshot
811 .to_buffer_offset(map.inlay_snapshot.to_offset(inlay_point))
796 }812 }
797}813}
798 814
@@ -1706,7 +1722,7 @@ pub mod tests { · 907 unmodified lines
1706 ) -> Vec<(String, Option<Color>, Option<Color>)> {1722 ) -> Vec<(String, Option<Color>, Option<Color>)> {
1707 let snapshot = map.update(cx, |map, cx| map.snapshot(cx));1723 let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
1708 let mut chunks: Vec<(String, Option<Color>, Option<Color>)> = Vec::new();1724 let mut chunks: Vec<(String, Option<Color>, Option<Color>)> = Vec::new();
1709 for chunk in snapshot.chunks(rows, true, None) {1725 for chunk in snapshot.chunks(rows, true, None, None) {
1710 let syntax_color = chunk1726 let syntax_color = chunk
1711 .syntax_highlight_id1727 .syntax_highlight_id
1712 .and_then(|id| id.style(theme)?.color);1728 .and_then(|id| id.style(theme)?.color);
crates/editor/src/display_map/block_map.rs+43−37
@@ -88,6 +88,7 @@ pub struct BlockContext<'a, 'b, 'c> { · 87 unmodified lines
88 pub gutter_padding: f32,88 pub gutter_padding: f32,
89 pub em_width: f32,89 pub em_width: f32,
90 pub line_height: f32,90 pub line_height: f32,
91 pub block_id: usize,
91}92}
92 93
93#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]94#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
@@ -243,7 +244,7 @@ impl BlockMap { · 149 unmodified lines
243 // Preserve any old transforms that precede this edit.244 // Preserve any old transforms that precede this edit.
244 let old_start = WrapRow(edit.old.start);245 let old_start = WrapRow(edit.old.start);
245 let new_start = WrapRow(edit.new.start);246 let new_start = WrapRow(edit.new.start);
246 new_transforms.push_tree(cursor.slice(&old_start, Bias::Left, &()), &());247 new_transforms.append(cursor.slice(&old_start, Bias::Left, &()), &());
247 if let Some(transform) = cursor.item() {248 if let Some(transform) = cursor.item() {
248 if transform.is_isomorphic() && old_start == cursor.end(&()) {249 if transform.is_isomorphic() && old_start == cursor.end(&()) {
249 new_transforms.push(transform.clone(), &());250 new_transforms.push(transform.clone(), &());
@@ -425,7 +426,7 @@ impl BlockMap { · 175 unmodified lines
425 push_isomorphic(&mut new_transforms, extent_after_edit);426 push_isomorphic(&mut new_transforms, extent_after_edit);
426 }427 }
427 428
428 new_transforms.push_tree(cursor.suffix(&()), &());429 new_transforms.append(cursor.suffix(&()), &());
429 debug_assert_eq!(430 debug_assert_eq!(
430 new_transforms.summary().input_rows,431 new_transforms.summary().input_rows,
431 wrap_snapshot.max_point().row() + 1432 wrap_snapshot.max_point().row() + 1
@@ -572,9 +573,15 @@ impl<'a> BlockMapWriter<'a> { · 140 unmodified lines
572impl BlockSnapshot {573impl BlockSnapshot {
573 #[cfg(test)]574 #[cfg(test)]
574 pub fn text(&self) -> String {575 pub fn text(&self) -> String {
575 self.chunks(0..self.transforms.summary().output_rows, false, None, None)576 self.chunks(
576 .map(|chunk| chunk.text)577 0..self.transforms.summary().output_rows,
577 .collect()578 false,
579 None,
580 None,
581 None,
582 )
583 .map(|chunk| chunk.text)
584 .collect()
578 }585 }
579 586
580 pub fn chunks<'a>(587 pub fn chunks<'a>(
@@ -582,7 +589,8 @@ impl BlockSnapshot { · 1 unmodified line
582 rows: Range<u32>,589 rows: Range<u32>,
583 language_aware: bool,590 language_aware: bool,
584 text_highlights: Option<&'a TextHighlights>,591 text_highlights: Option<&'a TextHighlights>,
585 suggestion_highlight: Option<HighlightStyle>,592 hint_highlights: Option<HighlightStyle>,
593 suggestion_highlights: Option<HighlightStyle>,
586 ) -> BlockChunks<'a> {594 ) -> BlockChunks<'a> {
587 let max_output_row = cmp::min(rows.end, self.transforms.summary().output_rows);595 let max_output_row = cmp::min(rows.end, self.transforms.summary().output_rows);
588 let mut cursor = self.transforms.cursor::<(BlockRow, WrapRow)>();596 let mut cursor = self.transforms.cursor::<(BlockRow, WrapRow)>();
@@ -615,7 +623,8 @@ impl BlockSnapshot { · 26 unmodified lines
615 input_start..input_end,623 input_start..input_end,
616 language_aware,624 language_aware,
617 text_highlights,625 text_highlights,
618 suggestion_highlight,626 hint_highlights,
627 suggestion_highlights,
619 ),628 ),
620 input_chunk: Default::default(),629 input_chunk: Default::default(),
621 transforms: cursor,630 transforms: cursor,
@@ -988,7 +997,7 @@ fn offset_for_row(s: &str, target: u32) -> (u32, usize) { · 366 unmodified lines
988#[cfg(test)]997#[cfg(test)]
989mod tests {998mod tests {
990 use super::*;999 use super::*;
991 use crate::display_map::suggestion_map::SuggestionMap;1000 use crate::display_map::inlay_map::InlayMap;
992 use crate::display_map::{fold_map::FoldMap, tab_map::TabMap, wrap_map::WrapMap};1001 use crate::display_map::{fold_map::FoldMap, tab_map::TabMap, wrap_map::WrapMap};
993 use crate::multi_buffer::MultiBuffer;1002 use crate::multi_buffer::MultiBuffer;
994 use gpui::{elements::Empty, Element};1003 use gpui::{elements::Empty, Element};
@@ -1029,9 +1038,9 @@ mod tests { · 34 unmodified lines
1029 let buffer = MultiBuffer::build_simple(text, cx);1038 let buffer = MultiBuffer::build_simple(text, cx);
1030 let buffer_snapshot = buffer.read(cx).snapshot(cx);1039 let buffer_snapshot = buffer.read(cx).snapshot(cx);
1031 let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());1040 let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
1032 let (fold_map, fold_snapshot) = FoldMap::new(buffer_snapshot.clone());1041 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1033 let (suggestion_map, suggestion_snapshot) = SuggestionMap::new(fold_snapshot);1042 let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
1034 let (tab_map, tab_snapshot) = TabMap::new(suggestion_snapshot, 1.try_into().unwrap());1043 let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, 1.try_into().unwrap());
1035 let (wrap_map, wraps_snapshot) = WrapMap::new(tab_snapshot, font_id, 14.0, None, cx);1044 let (wrap_map, wraps_snapshot) = WrapMap::new(tab_snapshot, font_id, 14.0, None, cx);
1036 let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);1045 let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
1037 1046
@@ -1174,12 +1183,11 @@ mod tests { · 136 unmodified lines
1174 buffer.snapshot(cx)1183 buffer.snapshot(cx)
1175 });1184 });
1176 1185
1177 let (fold_snapshot, fold_edits) =1186 let (inlay_snapshot, inlay_edits) =
1178 fold_map.read(buffer_snapshot, subscription.consume().into_inner());1187 inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
1179 let (suggestion_snapshot, suggestion_edits) =1188 let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
1180 suggestion_map.sync(fold_snapshot, fold_edits);
1181 let (tab_snapshot, tab_edits) =1189 let (tab_snapshot, tab_edits) =
1182 tab_map.sync(suggestion_snapshot, suggestion_edits, 4.try_into().unwrap());1190 tab_map.sync(fold_snapshot, fold_edits, 4.try_into().unwrap());
1183 let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {1191 let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
1184 wrap_map.sync(tab_snapshot, tab_edits, cx)1192 wrap_map.sync(tab_snapshot, tab_edits, cx)
1185 });1193 });
@@ -1204,9 +1212,9 @@ mod tests { · 18 unmodified lines
1204 1212
1205 let buffer = MultiBuffer::build_simple(text, cx);1213 let buffer = MultiBuffer::build_simple(text, cx);
1206 let buffer_snapshot = buffer.read(cx).snapshot(cx);1214 let buffer_snapshot = buffer.read(cx).snapshot(cx);
1207 let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone());1215 let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1208 let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot);1216 let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
1209 let (_, tab_snapshot) = TabMap::new(suggestion_snapshot, 1.try_into().unwrap());1217 let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
1210 let (_, wraps_snapshot) = WrapMap::new(tab_snapshot, font_id, 14.0, Some(60.), cx);1218 let (_, wraps_snapshot) = WrapMap::new(tab_snapshot, font_id, 14.0, Some(60.), cx);
1211 let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);1219 let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
1212 1220
@@ -1276,9 +1284,9 @@ mod tests { · 63 unmodified lines
1276 };1284 };
1277 1285
1278 let mut buffer_snapshot = buffer.read(cx).snapshot(cx);1286 let mut buffer_snapshot = buffer.read(cx).snapshot(cx);
1279 let (fold_map, fold_snapshot) = FoldMap::new(buffer_snapshot.clone());1287 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1280 let (suggestion_map, suggestion_snapshot) = SuggestionMap::new(fold_snapshot);1288 let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot);
1281 let (tab_map, tab_snapshot) = TabMap::new(suggestion_snapshot, tab_size);1289 let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
1282 let (wrap_map, wraps_snapshot) =1290 let (wrap_map, wraps_snapshot) =
1283 WrapMap::new(tab_snapshot, font_id, font_size, wrap_width, cx);1291 WrapMap::new(tab_snapshot, font_id, font_size, wrap_width, cx);
1284 let mut block_map = BlockMap::new(1292 let mut block_map = BlockMap::new(
@@ -1331,12 +1339,11 @@ mod tests { · 46 unmodified lines
1331 })1339 })
1332 .collect::<Vec<_>>();1340 .collect::<Vec<_>>();
1333 1341
1334 let (fold_snapshot, fold_edits) =1342 let (inlay_snapshot, inlay_edits) =
1335 fold_map.read(buffer_snapshot.clone(), vec![]);1343 inlay_map.sync(buffer_snapshot.clone(), vec![]);
1336 let (suggestion_snapshot, suggestion_edits) =1344 let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
1337 suggestion_map.sync(fold_snapshot, fold_edits);
1338 let (tab_snapshot, tab_edits) =1345 let (tab_snapshot, tab_edits) =
1339 tab_map.sync(suggestion_snapshot, suggestion_edits, tab_size);1346 tab_map.sync(fold_snapshot, fold_edits, tab_size);
1340 let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {1347 let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
1341 wrap_map.sync(tab_snapshot, tab_edits, cx)1348 wrap_map.sync(tab_snapshot, tab_edits, cx)
1342 });1349 });
@@ -1356,12 +1363,11 @@ mod tests { · 13 unmodified lines
1356 })1363 })
1357 .collect();1364 .collect();
1358 1365
1359 let (fold_snapshot, fold_edits) =1366 let (inlay_snapshot, inlay_edits) =
1360 fold_map.read(buffer_snapshot.clone(), vec![]);1367 inlay_map.sync(buffer_snapshot.clone(), vec![]);
1361 let (suggestion_snapshot, suggestion_edits) =1368 let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
1362 suggestion_map.sync(fold_snapshot, fold_edits);
1363 let (tab_snapshot, tab_edits) =1369 let (tab_snapshot, tab_edits) =
1364 tab_map.sync(suggestion_snapshot, suggestion_edits, tab_size);1370 tab_map.sync(fold_snapshot, fold_edits, tab_size);
1365 let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {1371 let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
1366 wrap_map.sync(tab_snapshot, tab_edits, cx)1372 wrap_map.sync(tab_snapshot, tab_edits, cx)
1367 });1373 });
@@ -1380,11 +1386,10 @@ mod tests { · 12 unmodified lines
1380 }1386 }
1381 }1387 }
1382 1388
1383 let (fold_snapshot, fold_edits) = fold_map.read(buffer_snapshot.clone(), buffer_edits);1389 let (inlay_snapshot, inlay_edits) =
1384 let (suggestion_snapshot, suggestion_edits) =1390 inlay_map.sync(buffer_snapshot.clone(), buffer_edits);
1385 suggestion_map.sync(fold_snapshot, fold_edits);1391 let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
1386 let (tab_snapshot, tab_edits) =1392 let (tab_snapshot, tab_edits) = tab_map.sync(fold_snapshot, fold_edits, tab_size);
1387 tab_map.sync(suggestion_snapshot, suggestion_edits, tab_size);
1388 let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {1393 let (wraps_snapshot, wrap_edits) = wrap_map.update(cx, |wrap_map, cx| {
1389 wrap_map.sync(tab_snapshot, tab_edits, cx)1394 wrap_map.sync(tab_snapshot, tab_edits, cx)
1390 });1395 });
@@ -1498,6 +1503,7 @@ mod tests { · 107 unmodified lines
1498 false,1503 false,
1499 None,1504 None,
1500 None,1505 None,
1506 None,
1501 )1507 )
1502 .map(|chunk| chunk.text)1508 .map(|chunk| chunk.text)
1503 .collect::<String>();1509 .collect::<String>();
crates/editor/src/display_map/fold_map.rs+408−453
@@ -1,19 +1,15 @@
1use super::TextHighlights;1use super::{
2use crate::{2 inlay_map::{InlayBufferRows, InlayChunks, InlayEdit, InlayOffset, InlayPoint, InlaySnapshot},
3 multi_buffer::MultiBufferRows, Anchor, AnchorRangeExt, MultiBufferChunks, MultiBufferSnapshot,3 TextHighlights,
4 ToOffset,
5};4};
6use collections::BTreeMap;5use crate::{Anchor, AnchorRangeExt, MultiBufferSnapshot, ToOffset};
7use gpui::{color::Color, fonts::HighlightStyle};6use gpui::{color::Color, fonts::HighlightStyle};
8use language::{Chunk, Edit, Point, TextSummary};7use language::{Chunk, Edit, Point, TextSummary};
9use parking_lot::Mutex;
10use std::{8use std::{
11 any::TypeId,9 any::TypeId,
12 cmp::{self, Ordering},10 cmp::{self, Ordering},
13 iter::{self, Peekable},11 iter,
14 ops::{Range, Sub},12 ops::{Add, AddAssign, Range, Sub},
15 sync::atomic::{AtomicUsize, Ordering::SeqCst},
16 vec,
17};13};
18use sum_tree::{Bias, Cursor, FilterCursor, SumTree};14use sum_tree::{Bias, Cursor, FilterCursor, SumTree};
19 15
@@ -29,28 +25,24 @@ impl FoldPoint { · 9 unmodified lines
29 self.0.row25 self.0.row
30 }26 }
31 27
28 pub fn column(self) -> u32 {
29 self.0.column
30 }
31
32 pub fn row_mut(&mut self) -> &mut u32 {32 pub fn row_mut(&mut self) -> &mut u32 {
33 &mut self.0.row33 &mut self.0.row
34 }34 }
35 35
36 #[cfg(test)]
36 pub fn column_mut(&mut self) -> &mut u32 {37 pub fn column_mut(&mut self) -> &mut u32 {
37 &mut self.0.column38 &mut self.0.column
38 }39 }
39 40
40 pub fn to_buffer_point(self, snapshot: &FoldSnapshot) -> Point {41 pub fn to_inlay_point(self, snapshot: &FoldSnapshot) -> InlayPoint {
41 let mut cursor = snapshot.transforms.cursor::<(FoldPoint, Point)>();42 let mut cursor = snapshot.transforms.cursor::<(FoldPoint, InlayPoint)>();
42 cursor.seek(&self, Bias::Right, &());
43 let overshoot = self.0 - cursor.start().0 .0;
44 cursor.start().1 + overshoot
45 }
46
47 pub fn to_buffer_offset(self, snapshot: &FoldSnapshot) -> usize {
48 let mut cursor = snapshot.transforms.cursor::<(FoldPoint, Point)>();
49 cursor.seek(&self, Bias::Right, &());43 cursor.seek(&self, Bias::Right, &());
50 let overshoot = self.0 - cursor.start().0 .0;44 let overshoot = self.0 - cursor.start().0 .0;
51 snapshot45 InlayPoint(cursor.start().1 .0 + overshoot)
52 .buffer_snapshot
53 .point_to_offset(cursor.start().1 + overshoot)
54 }46 }
55 47
56 pub fn to_offset(self, snapshot: &FoldSnapshot) -> FoldOffset {48 pub fn to_offset(self, snapshot: &FoldSnapshot) -> FoldOffset {
@@ -63,10 +55,10 @@ impl FoldPoint { · 6 unmodified lines
63 if !overshoot.is_zero() {55 if !overshoot.is_zero() {
64 let transform = cursor.item().expect("display point out of range");56 let transform = cursor.item().expect("display point out of range");
65 assert!(transform.output_text.is_none());57 assert!(transform.output_text.is_none());
66 let end_buffer_offset = snapshot58 let end_inlay_offset = snapshot
67 .buffer_snapshot59 .inlay_snapshot
68 .point_to_offset(cursor.start().1.input.lines + overshoot);60 .to_offset(InlayPoint(cursor.start().1.input.lines + overshoot));
69 offset += end_buffer_offset - cursor.start().1.input.len;61 offset += end_inlay_offset.0 - cursor.start().1.input.len;
70 }62 }
71 FoldOffset(offset)63 FoldOffset(offset)
72 }64 }
@@ -87,8 +79,9 @@ impl<'a> FoldMapWriter<'a> { · 14 unmodified lines
87 ) -> (FoldSnapshot, Vec<FoldEdit>) {79 ) -> (FoldSnapshot, Vec<FoldEdit>) {
88 let mut edits = Vec::new();80 let mut edits = Vec::new();
89 let mut folds = Vec::new();81 let mut folds = Vec::new();
90 let buffer = self.0.buffer.lock().clone();82 let snapshot = self.0.snapshot.inlay_snapshot.clone();
91 for range in ranges.into_iter() {83 for range in ranges.into_iter() {
84 let buffer = &snapshot.buffer;
92 let range = range.start.to_offset(&buffer)..range.end.to_offset(&buffer);85 let range = range.start.to_offset(&buffer)..range.end.to_offset(&buffer);
93 86
94 // Ignore any empty ranges.87 // Ignore any empty ranges.
@@ -103,35 +96,32 @@ impl<'a> FoldMapWriter<'a> { · 8 unmodified lines
103 }96 }
104 97
105 folds.push(fold);98 folds.push(fold);
106 edits.push(text::Edit {99
107 old: range.clone(),100 let inlay_range =
108 new: range,101 snapshot.to_inlay_offset(range.start)..snapshot.to_inlay_offset(range.end);
102 edits.push(InlayEdit {
103 old: inlay_range.clone(),
104 new: inlay_range,
109 });105 });
110 }106 }
111 107
112 folds.sort_unstable_by(|a, b| sum_tree::SeekTarget::cmp(a, b, &buffer));108 let buffer = &snapshot.buffer;
109 folds.sort_unstable_by(|a, b| sum_tree::SeekTarget::cmp(a, b, buffer));
113 110
114 self.0.folds = {111 self.0.snapshot.folds = {
115 let mut new_tree = SumTree::new();112 let mut new_tree = SumTree::new();
116 let mut cursor = self.0.folds.cursor::<Fold>();113 let mut cursor = self.0.snapshot.folds.cursor::<Fold>();
117 for fold in folds {114 for fold in folds {
118 new_tree.push_tree(cursor.slice(&fold, Bias::Right, &buffer), &buffer);115 new_tree.append(cursor.slice(&fold, Bias::Right, buffer), buffer);
119 new_tree.push(fold, &buffer);116 new_tree.push(fold, buffer);
120 }117 }
121 new_tree.push_tree(cursor.suffix(&buffer), &buffer);118 new_tree.append(cursor.suffix(buffer), buffer);
122 new_tree119 new_tree
123 };120 };
124 121
125 consolidate_buffer_edits(&mut edits);122 consolidate_inlay_edits(&mut edits);
126 let edits = self.0.sync(buffer.clone(), edits);123 let edits = self.0.sync(snapshot.clone(), edits);
127 let snapshot = FoldSnapshot {124 (self.0.snapshot.clone(), edits)
128 transforms: self.0.transforms.lock().clone(),
129 folds: self.0.folds.clone(),
130 buffer_snapshot: buffer,
131 version: self.0.version.load(SeqCst),
132 ellipses_color: self.0.ellipses_color,
133 };
134 (snapshot, edits)
135 }125 }
136 126
137 pub fn unfold<T: ToOffset>(127 pub fn unfold<T: ToOffset>(
@@ -141,110 +131,93 @@ impl<'a> FoldMapWriter<'a> { · 3 unmodified lines
141 ) -> (FoldSnapshot, Vec<FoldEdit>) {131 ) -> (FoldSnapshot, Vec<FoldEdit>) {
142 let mut edits = Vec::new();132 let mut edits = Vec::new();
143 let mut fold_ixs_to_delete = Vec::new();133 let mut fold_ixs_to_delete = Vec::new();
144 let buffer = self.0.buffer.lock().clone();134 let snapshot = self.0.snapshot.inlay_snapshot.clone();
135 let buffer = &snapshot.buffer;
145 for range in ranges.into_iter() {136 for range in ranges.into_iter() {
146 // Remove intersecting folds and add their ranges to edits that are passed to sync.137 // Remove intersecting folds and add their ranges to edits that are passed to sync.
147 let mut folds_cursor = intersecting_folds(&buffer, &self.0.folds, range, inclusive);138 let mut folds_cursor =
139 intersecting_folds(&snapshot, &self.0.snapshot.folds, range, inclusive);
148 while let Some(fold) = folds_cursor.item() {140 while let Some(fold) = folds_cursor.item() {
149 let offset_range = fold.0.start.to_offset(&buffer)..fold.0.end.to_offset(&buffer);141 let offset_range = fold.0.start.to_offset(buffer)..fold.0.end.to_offset(buffer);
150 if offset_range.end > offset_range.start {142 if offset_range.end > offset_range.start {
151 edits.push(text::Edit {143 let inlay_range = snapshot.to_inlay_offset(offset_range.start)
152 old: offset_range.clone(),144 ..snapshot.to_inlay_offset(offset_range.end);
153 new: offset_range,145 edits.push(InlayEdit {
146 old: inlay_range.clone(),
147 new: inlay_range,
154 });148 });
155 }149 }
156 fold_ixs_to_delete.push(*folds_cursor.start());150 fold_ixs_to_delete.push(*folds_cursor.start());
157 folds_cursor.next(&buffer);151 folds_cursor.next(buffer);
158 }152 }
159 }153 }
160 154
161 fold_ixs_to_delete.sort_unstable();155 fold_ixs_to_delete.sort_unstable();
162 fold_ixs_to_delete.dedup();156 fold_ixs_to_delete.dedup();
163 157
164 self.0.folds = {158 self.0.snapshot.folds = {
165 let mut cursor = self.0.folds.cursor::<usize>();159 let mut cursor = self.0.snapshot.folds.cursor::<usize>();
166 let mut folds = SumTree::new();160 let mut folds = SumTree::new();
167 for fold_ix in fold_ixs_to_delete {161 for fold_ix in fold_ixs_to_delete {
168 folds.push_tree(cursor.slice(&fold_ix, Bias::Right, &buffer), &buffer);162 folds.append(cursor.slice(&fold_ix, Bias::Right, buffer), buffer);
169 cursor.next(&buffer);163 cursor.next(buffer);
170 }164 }
171 folds.push_tree(cursor.suffix(&buffer), &buffer);165 folds.append(cursor.suffix(buffer), buffer);
172 folds166 folds
173 };167 };
174 168
175 consolidate_buffer_edits(&mut edits);169 consolidate_inlay_edits(&mut edits);
176 let edits = self.0.sync(buffer.clone(), edits);170 let edits = self.0.sync(snapshot.clone(), edits);
177 let snapshot = FoldSnapshot {171 (self.0.snapshot.clone(), edits)
178 transforms: self.0.transforms.lock().clone(),
179 folds: self.0.folds.clone(),
180 buffer_snapshot: buffer,
181 version: self.0.version.load(SeqCst),
182 ellipses_color: self.0.ellipses_color,
183 };
184 (snapshot, edits)
185 }172 }
186}173}
187 174
188pub struct FoldMap {175pub struct FoldMap {
189 buffer: Mutex<MultiBufferSnapshot>,176 snapshot: FoldSnapshot,
190 transforms: Mutex<SumTree<Transform>>,
191 folds: SumTree<Fold>,
192 version: AtomicUsize,
193 ellipses_color: Option<Color>,177 ellipses_color: Option<Color>,
194}178}
195 179
196impl FoldMap {180impl FoldMap {
197 pub fn new(buffer: MultiBufferSnapshot) -> (Self, FoldSnapshot) {181 pub fn new(inlay_snapshot: InlaySnapshot) -> (Self, FoldSnapshot) {
198 let this = Self {182 let this = Self {
199 buffer: Mutex::new(buffer.clone()),183 snapshot: FoldSnapshot {
200 folds: Default::default(),184 folds: Default::default(),
201 transforms: Mutex::new(SumTree::from_item(185 transforms: SumTree::from_item(
202 Transform {186 Transform {
203 summary: TransformSummary {187 summary: TransformSummary {
204 input: buffer.text_summary(),188 input: inlay_snapshot.text_summary(),
205 output: buffer.text_summary(),189 output: inlay_snapshot.text_summary(),
190 },
191 output_text: None,
206 },192 },
207 output_text: None,193 &(),
208 },194 ),
209 &(),195 inlay_snapshot: inlay_snapshot.clone(),
210 )),196 version: 0,
211 ellipses_color: None,197 ellipses_color: None,
212 version: Default::default(),198 },
213 };
214
215 let snapshot = FoldSnapshot {
216 transforms: this.transforms.lock().clone(),
217 folds: this.folds.clone(),
218 buffer_snapshot: this.buffer.lock().clone(),
219 version: this.version.load(SeqCst),
220 ellipses_color: None,199 ellipses_color: None,
221 };200 };
201 let snapshot = this.snapshot.clone();
222 (this, snapshot)202 (this, snapshot)
223 }203 }
224 204
225 pub fn read(205 pub fn read(
226 &self,206 &mut self,
227 buffer: MultiBufferSnapshot,207 inlay_snapshot: InlaySnapshot,
228 edits: Vec<Edit<usize>>,208 edits: Vec<InlayEdit>,
229 ) -> (FoldSnapshot, Vec<FoldEdit>) {209 ) -> (FoldSnapshot, Vec<FoldEdit>) {
230 let edits = self.sync(buffer, edits);210 let edits = self.sync(inlay_snapshot, edits);
231 self.check_invariants();211 self.check_invariants();
232 let snapshot = FoldSnapshot {212 (self.snapshot.clone(), edits)
233 transforms: self.transforms.lock().clone(),
234 folds: self.folds.clone(),
235 buffer_snapshot: self.buffer.lock().clone(),
236 version: self.version.load(SeqCst),
237 ellipses_color: self.ellipses_color,
238 };
239 (snapshot, edits)
240 }213 }
241 214
242 pub fn write(215 pub fn write(
243 &mut self,216 &mut self,
244 buffer: MultiBufferSnapshot,217 inlay_snapshot: InlaySnapshot,
245 edits: Vec<Edit<usize>>,218 edits: Vec<InlayEdit>,
246 ) -> (FoldMapWriter, FoldSnapshot, Vec<FoldEdit>) {219 ) -> (FoldMapWriter, FoldSnapshot, Vec<FoldEdit>) {
247 let (snapshot, edits) = self.read(buffer, edits);220 let (snapshot, edits) = self.read(inlay_snapshot, edits);
248 (FoldMapWriter(self), snapshot, edits)221 (FoldMapWriter(self), snapshot, edits)
249 }222 }
250 223
@@ -260,15 +233,17 @@ impl FoldMap { · 9 unmodified lines
260 fn check_invariants(&self) {233 fn check_invariants(&self) {
261 if cfg!(test) {234 if cfg!(test) {
262 assert_eq!(235 assert_eq!(
263 self.transforms.lock().summary().input.len,236 self.snapshot.transforms.summary().input.len,
264 self.buffer.lock().len(),237 self.snapshot.inlay_snapshot.len().0,
265 "transform tree does not match buffer's length"238 "transform tree does not match inlay snapshot's length"
266 );239 );
267 240
268 let mut folds = self.folds.iter().peekable();241 let mut folds = self.snapshot.folds.iter().peekable();
269 while let Some(fold) = folds.next() {242 while let Some(fold) = folds.next() {
270 if let Some(next_fold) = folds.peek() {243 if let Some(next_fold) = folds.peek() {
271 let comparison = fold.0.cmp(&next_fold.0, &self.buffer.lock());244 let comparison = fold
245 .0
246 .cmp(&next_fold.0, &self.snapshot.inlay_snapshot.buffer);
272 assert!(comparison.is_le());247 assert!(comparison.is_le());
273 }248 }
274 }249 }
@@ -276,50 +251,42 @@ impl FoldMap { · 1 unmodified line
276 }251 }
277 252
278 fn sync(253 fn sync(
279 &self,254 &mut self,
280 new_buffer: MultiBufferSnapshot,255 inlay_snapshot: InlaySnapshot,
281 buffer_edits: Vec<text::Edit<usize>>,256 inlay_edits: Vec<InlayEdit>,
282 ) -> Vec<FoldEdit> {257 ) -> Vec<FoldEdit> {
283 if buffer_edits.is_empty() {258 if inlay_edits.is_empty() {
284 let mut buffer = self.buffer.lock();259 if self.snapshot.inlay_snapshot.version != inlay_snapshot.version {
285 if buffer.edit_count() != new_buffer.edit_count()260 self.snapshot.version += 1;
286 || buffer.parse_count() != new_buffer.parse_count()
287 || buffer.diagnostics_update_count() != new_buffer.diagnostics_update_count()
288 || buffer.git_diff_update_count() != new_buffer.git_diff_update_count()
289 || buffer.trailing_excerpt_update_count()
290 != new_buffer.trailing_excerpt_update_count()
291 {
292 self.version.fetch_add(1, SeqCst);
293 }261 }
294 *buffer = new_buffer;262 self.snapshot.inlay_snapshot = inlay_snapshot;
295 Vec::new()263 Vec::new()
296 } else {264 } else {
297 let mut buffer_edits_iter = buffer_edits.iter().cloned().peekable();265 let mut inlay_edits_iter = inlay_edits.iter().cloned().peekable();
298 266
299 let mut new_transforms = SumTree::new();267 let mut new_transforms = SumTree::new();
300 let mut transforms = self.transforms.lock();268 let mut cursor = self.snapshot.transforms.cursor::<InlayOffset>();
301 let mut cursor = transforms.cursor::<usize>();269 cursor.seek(&InlayOffset(0), Bias::Right, &());
302 cursor.seek(&0, Bias::Right, &());
303 270
304 while let Some(mut edit) = buffer_edits_iter.next() {271 while let Some(mut edit) = inlay_edits_iter.next() {
305 new_transforms.push_tree(cursor.slice(&edit.old.start, Bias::Left, &()), &());272 new_transforms.append(cursor.slice(&edit.old.start, Bias::Left, &()), &());
306 edit.new.start -= edit.old.start - cursor.start();273 edit.new.start -= edit.old.start - *cursor.start();
307 edit.old.start = *cursor.start();274 edit.old.start = *cursor.start();
308 275
309 cursor.seek(&edit.old.end, Bias::Right, &());276 cursor.seek(&edit.old.end, Bias::Right, &());
310 cursor.next(&());277 cursor.next(&());
311 278
312 let mut delta = edit.new.len() as isize - edit.old.len() as isize;279 let mut delta = edit.new_len().0 as isize - edit.old_len().0 as isize;
313 loop {280 loop {
314 edit.old.end = *cursor.start();281 edit.old.end = *cursor.start();
315 282
316 if let Some(next_edit) = buffer_edits_iter.peek() {283 if let Some(next_edit) = inlay_edits_iter.peek() {
317 if next_edit.old.start > edit.old.end {284 if next_edit.old.start > edit.old.end {
318 break;285 break;
319 }286 }
320 287
321 let next_edit = buffer_edits_iter.next().unwrap();288 let next_edit = inlay_edits_iter.next().unwrap();
322 delta += next_edit.new.len() as isize - next_edit.old.len() as isize;289 delta += next_edit.new_len().0 as isize - next_edit.old_len().0 as isize;
323 290
324 if next_edit.old.end >= edit.old.end {291 if next_edit.old.end >= edit.old.end {
325 edit.old.end = next_edit.old.end;292 edit.old.end = next_edit.old.end;
@@ -331,19 +298,29 @@ impl FoldMap { · 5 unmodified lines
331 }298 }
332 }299 }
333 300
334 edit.new.end = ((edit.new.start + edit.old.len()) as isize + delta) as usize;301 edit.new.end =
335 302 InlayOffset(((edit.new.start + edit.old_len()).0 as isize + delta) as usize);
336 let anchor = new_buffer.anchor_before(edit.new.start);303
337 let mut folds_cursor = self.folds.cursor::<Fold>();304 let anchor = inlay_snapshot
338 folds_cursor.seek(&Fold(anchor..Anchor::max()), Bias::Left, &new_buffer);305 .buffer
306 .anchor_before(inlay_snapshot.to_buffer_offset(edit.new.start));
307 let mut folds_cursor = self.snapshot.folds.cursor::<Fold>();
308 folds_cursor.seek(
309 &Fold(anchor..Anchor::max()),
310 Bias::Left,
311 &inlay_snapshot.buffer,
312 );
339 313
340 let mut folds = iter::from_fn({314 let mut folds = iter::from_fn({
341 let buffer = &new_buffer;315 let inlay_snapshot = &inlay_snapshot;
342 move || {316 move || {
343 let item = folds_cursor317 let item = folds_cursor.item().map(|f| {
344 .item()318 let buffer_start = f.0.start.to_offset(&inlay_snapshot.buffer);
345 .map(|f| f.0.start.to_offset(buffer)..f.0.end.to_offset(buffer));319 let buffer_end = f.0.end.to_offset(&inlay_snapshot.buffer);
346 folds_cursor.next(buffer);320 inlay_snapshot.to_inlay_offset(buffer_start)
321 ..inlay_snapshot.to_inlay_offset(buffer_end)
322 });
323 folds_cursor.next(&inlay_snapshot.buffer);
347 item324 item
348 }325 }
349 })326 })
@@ -353,7 +330,7 @@ impl FoldMap { · 3 unmodified lines
353 let mut fold = folds.next().unwrap();330 let mut fold = folds.next().unwrap();
354 let sum = new_transforms.summary();331 let sum = new_transforms.summary();
355 332
356 assert!(fold.start >= sum.input.len);333 assert!(fold.start.0 >= sum.input.len);
357 334
358 while folds335 while folds
359 .peek()336 .peek()
@@ -365,9 +342,9 @@ impl FoldMap { · 5 unmodified lines
365 }342 }
366 }343 }
367 344
368 if fold.start > sum.input.len {345 if fold.start.0 > sum.input.len {
369 let text_summary = new_buffer346 let text_summary = inlay_snapshot
370 .text_summary_for_range::<TextSummary, _>(sum.input.len..fold.start);347 .text_summary_for_range(InlayOffset(sum.input.len)..fold.start);
371 new_transforms.push(348 new_transforms.push(
372 Transform {349 Transform {
373 summary: TransformSummary {350 summary: TransformSummary {
@@ -386,7 +363,8 @@ impl FoldMap { · 12 unmodified lines
386 Transform {363 Transform {
387 summary: TransformSummary {364 summary: TransformSummary {
388 output: TextSummary::from(output_text),365 output: TextSummary::from(output_text),
389 input: new_buffer.text_summary_for_range(fold.start..fold.end),366 input: inlay_snapshot
367 .text_summary_for_range(fold.start..fold.end),
390 },368 },
391 output_text: Some(output_text),369 output_text: Some(output_text),
392 },370 },
@@ -396,9 +374,9 @@ impl FoldMap { · 3 unmodified lines
396 }374 }
397 375
398 let sum = new_transforms.summary();376 let sum = new_transforms.summary();
399 if sum.input.len < edit.new.end {377 if sum.input.len < edit.new.end.0 {
400 let text_summary = new_buffer378 let text_summary = inlay_snapshot
401 .text_summary_for_range::<TextSummary, _>(sum.input.len..edit.new.end);379 .text_summary_for_range(InlayOffset(sum.input.len)..edit.new.end);
402 new_transforms.push(380 new_transforms.push(
403 Transform {381 Transform {
404 summary: TransformSummary {382 summary: TransformSummary {
@@ -412,9 +390,9 @@ impl FoldMap { · 7 unmodified lines
412 }390 }
413 }391 }
414 392
415 new_transforms.push_tree(cursor.suffix(&()), &());393 new_transforms.append(cursor.suffix(&()), &());
416 if new_transforms.is_empty() {394 if new_transforms.is_empty() {
417 let text_summary = new_buffer.text_summary();395 let text_summary = inlay_snapshot.text_summary();
418 new_transforms.push(396 new_transforms.push(
419 Transform {397 Transform {
420 summary: TransformSummary {398 summary: TransformSummary {
@@ -429,18 +407,21 @@ impl FoldMap { · 8 unmodified lines
429 407
430 drop(cursor);408 drop(cursor);
431 409
432 let mut fold_edits = Vec::with_capacity(buffer_edits.len());410 let mut fold_edits = Vec::with_capacity(inlay_edits.len());
433 {411 {
434 let mut old_transforms = transforms.cursor::<(usize, FoldOffset)>();412 let mut old_transforms = self
435 let mut new_transforms = new_transforms.cursor::<(usize, FoldOffset)>();413 .snapshot
414 .transforms
415 .cursor::<(InlayOffset, FoldOffset)>();
416 let mut new_transforms = new_transforms.cursor::<(InlayOffset, FoldOffset)>();
436 417
437 for mut edit in buffer_edits {418 for mut edit in inlay_edits {
438 old_transforms.seek(&edit.old.start, Bias::Left, &());419 old_transforms.seek(&edit.old.start, Bias::Left, &());
439 if old_transforms.item().map_or(false, |t| t.is_fold()) {420 if old_transforms.item().map_or(false, |t| t.is_fold()) {
440 edit.old.start = old_transforms.start().0;421 edit.old.start = old_transforms.start().0;
441 }422 }
442 let old_start =423 let old_start =
443 old_transforms.start().1 .0 + (edit.old.start - old_transforms.start().0);424 old_transforms.start().1 .0 + (edit.old.start - old_transforms.start().0).0;
444 425
445 old_transforms.seek_forward(&edit.old.end, Bias::Right, &());426 old_transforms.seek_forward(&edit.old.end, Bias::Right, &());
446 if old_transforms.item().map_or(false, |t| t.is_fold()) {427 if old_transforms.item().map_or(false, |t| t.is_fold()) {
@@ -448,14 +429,14 @@ impl FoldMap { · 1 unmodified line
448 edit.old.end = old_transforms.start().0;429 edit.old.end = old_transforms.start().0;
449 }430 }
450 let old_end =431 let old_end =
451 old_transforms.start().1 .0 + (edit.old.end - old_transforms.start().0);432 old_transforms.start().1 .0 + (edit.old.end - old_transforms.start().0).0;
452 433
453 new_transforms.seek(&edit.new.start, Bias::Left, &());434 new_transforms.seek(&edit.new.start, Bias::Left, &());
454 if new_transforms.item().map_or(false, |t| t.is_fold()) {435 if new_transforms.item().map_or(false, |t| t.is_fold()) {
455 edit.new.start = new_transforms.start().0;436 edit.new.start = new_transforms.start().0;
456 }437 }
457 let new_start =438 let new_start =
458 new_transforms.start().1 .0 + (edit.new.start - new_transforms.start().0);439 new_transforms.start().1 .0 + (edit.new.start - new_transforms.start().0).0;
459 440
460 new_transforms.seek_forward(&edit.new.end, Bias::Right, &());441 new_transforms.seek_forward(&edit.new.end, Bias::Right, &());
461 if new_transforms.item().map_or(false, |t| t.is_fold()) {442 if new_transforms.item().map_or(false, |t| t.is_fold()) {
@@ -463,7 +444,7 @@ impl FoldMap { · 1 unmodified line
463 edit.new.end = new_transforms.start().0;444 edit.new.end = new_transforms.start().0;
464 }445 }
465 let new_end =446 let new_end =
466 new_transforms.start().1 .0 + (edit.new.end - new_transforms.start().0);447 new_transforms.start().1 .0 + (edit.new.end - new_transforms.start().0).0;
467 448
468 fold_edits.push(FoldEdit {449 fold_edits.push(FoldEdit {
469 old: FoldOffset(old_start)..FoldOffset(old_end),450 old: FoldOffset(old_start)..FoldOffset(old_end),
@@ -474,9 +455,9 @@ impl FoldMap { · 4 unmodified lines
474 consolidate_fold_edits(&mut fold_edits);455 consolidate_fold_edits(&mut fold_edits);
475 }456 }
476 457
477 *transforms = new_transforms;458 self.snapshot.transforms = new_transforms;
478 *self.buffer.lock() = new_buffer;459 self.snapshot.inlay_snapshot = inlay_snapshot;
479 self.version.fetch_add(1, SeqCst);460 self.snapshot.version += 1;
480 fold_edits461 fold_edits
481 }462 }
482 }463 }
@@ -486,32 +467,28 @@ impl FoldMap { · 3 unmodified lines
486pub struct FoldSnapshot {467pub struct FoldSnapshot {
487 transforms: SumTree<Transform>,468 transforms: SumTree<Transform>,
488 folds: SumTree<Fold>,469 folds: SumTree<Fold>,
489 buffer_snapshot: MultiBufferSnapshot,470 pub inlay_snapshot: InlaySnapshot,
490 pub version: usize,471 pub version: usize,
491 pub ellipses_color: Option<Color>,472 pub ellipses_color: Option<Color>,
492}473}
493 474
494impl FoldSnapshot {475impl FoldSnapshot {
495 pub fn buffer_snapshot(&self) -> &MultiBufferSnapshot {
496 &self.buffer_snapshot
497 }
498
499 #[cfg(test)]476 #[cfg(test)]
500 pub fn text(&self) -> String {477 pub fn text(&self) -> String {
501 self.chunks(FoldOffset(0)..self.len(), false, None)478 self.chunks(FoldOffset(0)..self.len(), false, None, None, None)
502 .map(|c| c.text)479 .map(|c| c.text)
503 .collect()480 .collect()
504 }481 }
505 482
506 #[cfg(test)]483 #[cfg(test)]
507 pub fn fold_count(&self) -> usize {484 pub fn fold_count(&self) -> usize {
508 self.folds.items(&self.buffer_snapshot).len()485 self.folds.items(&self.inlay_snapshot.buffer).len()
509 }486 }
510 487
511 pub fn text_summary_for_range(&self, range: Range<FoldPoint>) -> TextSummary {488 pub fn text_summary_for_range(&self, range: Range<FoldPoint>) -> TextSummary {
512 let mut summary = TextSummary::default();489 let mut summary = TextSummary::default();
513 490
514 let mut cursor = self.transforms.cursor::<(FoldPoint, Point)>();491 let mut cursor = self.transforms.cursor::<(FoldPoint, InlayPoint)>();
515 cursor.seek(&range.start, Bias::Right, &());492 cursor.seek(&range.start, Bias::Right, &());
516 if let Some(transform) = cursor.item() {493 if let Some(transform) = cursor.item() {
517 let start_in_transform = range.start.0 - cursor.start().0 .0;494 let start_in_transform = range.start.0 - cursor.start().0 .0;
@@ -522,11 +499,15 @@ impl FoldSnapshot { · 4 unmodified lines
522 [start_in_transform.column as usize..end_in_transform.column as usize],499 [start_in_transform.column as usize..end_in_transform.column as usize],
523 );500 );
524 } else {501 } else {
525 let buffer_start = cursor.start().1 + start_in_transform;502 let inlay_start = self
526 let buffer_end = cursor.start().1 + end_in_transform;503 .inlay_snapshot
504 .to_offset(InlayPoint(cursor.start().1 .0 + start_in_transform));
505 let inlay_end = self
506 .inlay_snapshot
507 .to_offset(InlayPoint(cursor.start().1 .0 + end_in_transform));
527 summary = self508 summary = self
528 .buffer_snapshot509 .inlay_snapshot
529 .text_summary_for_range(buffer_start..buffer_end);510 .text_summary_for_range(inlay_start..inlay_end);
530 }511 }
531 }512 }
532 513
@@ -540,11 +521,13 @@ impl FoldSnapshot { · 7 unmodified lines
540 if let Some(output_text) = transform.output_text {521 if let Some(output_text) = transform.output_text {
541 summary += TextSummary::from(&output_text[..end_in_transform.column as usize]);522 summary += TextSummary::from(&output_text[..end_in_transform.column as usize]);
542 } else {523 } else {
543 let buffer_start = cursor.start().1;524 let inlay_start = self.inlay_snapshot.to_offset(cursor.start().1);
544 let buffer_end = cursor.start().1 + end_in_transform;525 let inlay_end = self
526 .inlay_snapshot
527 .to_offset(InlayPoint(cursor.start().1 .0 + end_in_transform));
545 summary += self528 summary += self
546 .buffer_snapshot529 .inlay_snapshot
547 .text_summary_for_range::<TextSummary, _>(buffer_start..buffer_end);530 .text_summary_for_range(inlay_start..inlay_end);
548 }531 }
549 }532 }
550 }533 }
@@ -552,8 +535,8 @@ impl FoldSnapshot { · 1 unmodified line
552 summary535 summary
553 }536 }
554 537
555 pub fn to_fold_point(&self, point: Point, bias: Bias) -> FoldPoint {538 pub fn to_fold_point(&self, point: InlayPoint, bias: Bias) -> FoldPoint {
556 let mut cursor = self.transforms.cursor::<(Point, FoldPoint)>();539 let mut cursor = self.transforms.cursor::<(InlayPoint, FoldPoint)>();
557 cursor.seek(&point, Bias::Right, &());540 cursor.seek(&point, Bias::Right, &());
558 if cursor.item().map_or(false, |t| t.is_fold()) {541 if cursor.item().map_or(false, |t| t.is_fold()) {
559 if bias == Bias::Left || point == cursor.start().0 {542 if bias == Bias::Left || point == cursor.start().0 {
@@ -562,7 +545,7 @@ impl FoldSnapshot { · 2 unmodified lines
562 cursor.end(&()).1545 cursor.end(&()).1
563 }546 }
564 } else {547 } else {
565 let overshoot = point - cursor.start().0;548 let overshoot = point.0 - cursor.start().0 .0;
566 FoldPoint(cmp::min(549 FoldPoint(cmp::min(
567 cursor.start().1 .0 + overshoot,550 cursor.start().1 .0 + overshoot,
568 cursor.end(&()).1 .0,551 cursor.end(&()).1 .0,
@@ -590,12 +573,12 @@ impl FoldSnapshot { · 21 unmodified lines
590 }573 }
591 574
592 let fold_point = FoldPoint::new(start_row, 0);575 let fold_point = FoldPoint::new(start_row, 0);
593 let mut cursor = self.transforms.cursor::<(FoldPoint, Point)>();576 let mut cursor = self.transforms.cursor::<(FoldPoint, InlayPoint)>();
594 cursor.seek(&fold_point, Bias::Left, &());577 cursor.seek(&fold_point, Bias::Left, &());
595 578
596 let overshoot = fold_point.0 - cursor.start().0 .0;579 let overshoot = fold_point.0 - cursor.start().0 .0;
597 let buffer_point = cursor.start().1 + overshoot;580 let inlay_point = InlayPoint(cursor.start().1 .0 + overshoot);
598 let input_buffer_rows = self.buffer_snapshot.buffer_rows(buffer_point.row);581 let input_buffer_rows = self.inlay_snapshot.buffer_rows(inlay_point.row());
599 582
600 FoldBufferRows {583 FoldBufferRows {
601 fold_point,584 fold_point,
@@ -617,10 +600,10 @@ impl FoldSnapshot { · 15 unmodified lines
617 where600 where
618 T: ToOffset,601 T: ToOffset,
619 {602 {
620 let mut folds = intersecting_folds(&self.buffer_snapshot, &self.folds, range, false);603 let mut folds = intersecting_folds(&self.inlay_snapshot, &self.folds, range, false);
621 iter::from_fn(move || {604 iter::from_fn(move || {
622 let item = folds.item().map(|f| &f.0);605 let item = folds.item().map(|f| &f.0);
623 folds.next(&self.buffer_snapshot);606 folds.next(&self.inlay_snapshot.buffer);
624 item607 item
625 })608 })
626 }609 }
@@ -629,26 +612,39 @@ impl FoldSnapshot { · 2 unmodified lines
629 where612 where
630 T: ToOffset,613 T: ToOffset,
631 {614 {
632 let offset = offset.to_offset(&self.buffer_snapshot);615 let buffer_offset = offset.to_offset(&self.inlay_snapshot.buffer);
633 let mut cursor = self.transforms.cursor::<usize>();616 let inlay_offset = self.inlay_snapshot.to_inlay_offset(buffer_offset);
634 cursor.seek(&offset, Bias::Right, &());617 let mut cursor = self.transforms.cursor::<InlayOffset>();
618 cursor.seek(&inlay_offset, Bias::Right, &());
635 cursor.item().map_or(false, |t| t.output_text.is_some())619 cursor.item().map_or(false, |t| t.output_text.is_some())
636 }620 }
637 621
638 pub fn is_line_folded(&self, buffer_row: u32) -> bool {622 pub fn is_line_folded(&self, buffer_row: u32) -> bool {
639 let mut cursor = self.transforms.cursor::<Point>();623 let mut inlay_point = self
640 cursor.seek(&Point::new(buffer_row, 0), Bias::Right, &());624 .inlay_snapshot
641 while let Some(transform) = cursor.item() {625 .to_inlay_point(Point::new(buffer_row, 0));
642 if transform.output_text.is_some() {626 let mut cursor = self.transforms.cursor::<InlayPoint>();
643 return true;627 cursor.seek(&inlay_point, Bias::Right, &());
628 loop {
629 match cursor.item() {
630 Some(transform) => {
631 let buffer_point = self.inlay_snapshot.to_buffer_point(inlay_point);
632 if buffer_point.row != buffer_row {
633 return false;
634 } else if transform.output_text.is_some() {
635 return true;
636 }
637 }
638 None => return false,
644 }639 }
645 if cursor.end(&()).row == buffer_row {640
646 cursor.next(&())641 if cursor.end(&()).row() == inlay_point.row() {
642 cursor.next(&());
647 } else {643 } else {
648 break;644 inlay_point.0 += Point::new(1, 0);
645 cursor.seek(&inlay_point, Bias::Right, &());
649 }646 }
650 }647 }
651 false
652 }648 }
653 649
654 pub fn chunks<'a>(650 pub fn chunks<'a>(
@@ -656,127 +652,56 @@ impl FoldSnapshot { · 1 unmodified line
656 range: Range<FoldOffset>,652 range: Range<FoldOffset>,
657 language_aware: bool,653 language_aware: bool,
658 text_highlights: Option<&'a TextHighlights>,654 text_highlights: Option<&'a TextHighlights>,
655 hint_highlights: Option<HighlightStyle>,
656 suggestion_highlights: Option<HighlightStyle>,
659 ) -> FoldChunks<'a> {657 ) -> FoldChunks<'a> {
660 let mut highlight_endpoints = Vec::new();658 let mut transform_cursor = self.transforms.cursor::<(FoldOffset, InlayOffset)>();
661 let mut transform_cursor = self.transforms.cursor::<(FoldOffset, usize)>();
662 659
663 let buffer_end = {660 let inlay_end = {
664 transform_cursor.seek(&range.end, Bias::Right, &());661 transform_cursor.seek(&range.end, Bias::Right, &());
665 let overshoot = range.end.0 - transform_cursor.start().0 .0;662 let overshoot = range.end.0 - transform_cursor.start().0 .0;
666 transform_cursor.start().1 + overshoot663 transform_cursor.start().1 + InlayOffset(overshoot)
667 };664 };
668 665
669 let buffer_start = {666 let inlay_start = {
670 transform_cursor.seek(&range.start, Bias::Right, &());667 transform_cursor.seek(&range.start, Bias::Right, &());
671 let overshoot = range.start.0 - transform_cursor.start().0 .0;668 let overshoot = range.start.0 - transform_cursor.start().0 .0;
672 transform_cursor.start().1 + overshoot669 transform_cursor.start().1 + InlayOffset(overshoot)
673 };670 };
674 671
675 if let Some(text_highlights) = text_highlights {
676 if !text_highlights.is_empty() {
677 while transform_cursor.start().0 < range.end {
678 if !transform_cursor.item().unwrap().is_fold() {
679 let transform_start = self
680 .buffer_snapshot
681 .anchor_after(cmp::max(buffer_start, transform_cursor.start().1));
682
683 let transform_end = {
684 let overshoot = range.end.0 - transform_cursor.start().0 .0;
685 self.buffer_snapshot.anchor_before(cmp::min(
686 transform_cursor.end(&()).1,
687 transform_cursor.start().1 + overshoot,
688 ))
689 };
690
691 for (tag, highlights) in text_highlights.iter() {
692 let style = highlights.0;
693 let ranges = &highlights.1;
694
695 let start_ix = match ranges.binary_search_by(|probe| {
696 let cmp = probe.end.cmp(&transform_start, self.buffer_snapshot());
697 if cmp.is_gt() {
698 Ordering::Greater
699 } else {
700 Ordering::Less
701 }
702 }) {
703 Ok(i) | Err(i) => i,
704 };
705 for range in &ranges[start_ix..] {
706 if range
707 .start
708 .cmp(&transform_end, &self.buffer_snapshot)
709 .is_ge()
710 {
711 break;
712 }
713
714 highlight_endpoints.push(HighlightEndpoint {
715 offset: range.start.to_offset(&self.buffer_snapshot),
716 is_start: true,
717 tag: *tag,
718 style,
719 });
720 highlight_endpoints.push(HighlightEndpoint {
721 offset: range.end.to_offset(&self.buffer_snapshot),
722 is_start: false,
723 tag: *tag,
724 style,
725 });
726 }
727 }
728 }
729
730 transform_cursor.next(&());
731 }
732 highlight_endpoints.sort();
733 transform_cursor.seek(&range.start, Bias::Right, &());
734 }
735 }
736
737 FoldChunks {672 FoldChunks {
738 transform_cursor,673 transform_cursor,
739 buffer_chunks: self674 inlay_chunks: self.inlay_snapshot.chunks(
740 .buffer_snapshot675 inlay_start..inlay_end,
741 .chunks(buffer_start..buffer_end, language_aware),676 language_aware,
742 buffer_chunk: None,677 text_highlights,
743 buffer_offset: buffer_start,678 hint_highlights,
679 suggestion_highlights,
680 ),
681 inlay_chunk: None,
682 inlay_offset: inlay_start,
744 output_offset: range.start.0,683 output_offset: range.start.0,
745 max_output_offset: range.end.0,684 max_output_offset: range.end.0,
746 highlight_endpoints: highlight_endpoints.into_iter().peekable(),
747 active_highlights: Default::default(),
748 ellipses_color: self.ellipses_color,685 ellipses_color: self.ellipses_color,
749 }686 }
750 }687 }
751 688
689 pub fn chars_at(&self, start: FoldPoint) -> impl '_ + Iterator<Item = char> {
690 self.chunks(start.to_offset(self)..self.len(), false, None, None, None)
691 .flat_map(|chunk| chunk.text.chars())
692 }
693
752 #[cfg(test)]694 #[cfg(test)]
753 pub fn clip_offset(&self, offset: FoldOffset, bias: Bias) -> FoldOffset {695 pub fn clip_offset(&self, offset: FoldOffset, bias: Bias) -> FoldOffset {
754 let mut cursor = self.transforms.cursor::<(FoldOffset, usize)>();696 if offset > self.len() {
755 cursor.seek(&offset, Bias::Right, &());697 self.len()
756 if let Some(transform) = cursor.item() {
757 let transform_start = cursor.start().0 .0;
758 if transform.output_text.is_some() {
759 if offset.0 == transform_start || matches!(bias, Bias::Left) {
760 FoldOffset(transform_start)
761 } else {
762 FoldOffset(cursor.end(&()).0 .0)
763 }
764 } else {
765 let overshoot = offset.0 - transform_start;
766 let buffer_offset = cursor.start().1 + overshoot;
767 let clipped_buffer_offset = self.buffer_snapshot.clip_offset(buffer_offset, bias);
768 FoldOffset(
769 (offset.0 as isize + (clipped_buffer_offset as isize - buffer_offset as isize))
770 as usize,
771 )
772 }
773 } else {698 } else {
774 FoldOffset(self.transforms.summary().output.len)699 self.clip_point(offset.to_point(self), bias).to_offset(self)
775 }700 }
776 }701 }
777 702
778 pub fn clip_point(&self, point: FoldPoint, bias: Bias) -> FoldPoint {703 pub fn clip_point(&self, point: FoldPoint, bias: Bias) -> FoldPoint {
779 let mut cursor = self.transforms.cursor::<(FoldPoint, Point)>();704 let mut cursor = self.transforms.cursor::<(FoldPoint, InlayPoint)>();
780 cursor.seek(&point, Bias::Right, &());705 cursor.seek(&point, Bias::Right, &());
781 if let Some(transform) = cursor.item() {706 if let Some(transform) = cursor.item() {
782 let transform_start = cursor.start().0 .0;707 let transform_start = cursor.start().0 .0;
@@ -787,11 +712,10 @@ impl FoldSnapshot { · 4 unmodified lines
787 FoldPoint(cursor.end(&()).0 .0)712 FoldPoint(cursor.end(&()).0 .0)
788 }713 }
789 } else {714 } else {
790 let overshoot = point.0 - transform_start;715 let overshoot = InlayPoint(point.0 - transform_start);
791 let buffer_position = cursor.start().1 + overshoot;716 let inlay_point = cursor.start().1 + overshoot;
792 let clipped_buffer_position =717 let clipped_inlay_point = self.inlay_snapshot.clip_point(inlay_point, bias);
793 self.buffer_snapshot.clip_point(buffer_position, bias);718 FoldPoint(cursor.start().0 .0 + (clipped_inlay_point - cursor.start().1).0)
794 FoldPoint(cursor.start().0 .0 + (clipped_buffer_position - cursor.start().1))
795 }719 }
796 } else {720 } else {
797 FoldPoint(self.transforms.summary().output.lines)721 FoldPoint(self.transforms.summary().output.lines)
@@ -800,7 +724,7 @@ impl FoldSnapshot { · 2 unmodified lines
800}724}
801 725
802fn intersecting_folds<'a, T>(726fn intersecting_folds<'a, T>(
803 buffer: &'a MultiBufferSnapshot,727 inlay_snapshot: &'a InlaySnapshot,
804 folds: &'a SumTree<Fold>,728 folds: &'a SumTree<Fold>,
805 range: Range<T>,729 range: Range<T>,
806 inclusive: bool,730 inclusive: bool,
@@ -808,6 +732,7 @@ fn intersecting_folds<'a, T>( · 1 unmodified line
808where732where
809 T: ToOffset,733 T: ToOffset,
810{734{
735 let buffer = &inlay_snapshot.buffer;
811 let start = buffer.anchor_before(range.start.to_offset(buffer));736 let start = buffer.anchor_before(range.start.to_offset(buffer));
812 let end = buffer.anchor_after(range.end.to_offset(buffer));737 let end = buffer.anchor_after(range.end.to_offset(buffer));
813 let mut cursor = folds.filter::<_, usize>(move |summary| {738 let mut cursor = folds.filter::<_, usize>(move |summary| {
@@ -824,7 +749,7 @@ where · 10 unmodified lines
824 cursor749 cursor
825}750}
826 751
827fn consolidate_buffer_edits(edits: &mut Vec<text::Edit<usize>>) {752fn consolidate_inlay_edits(edits: &mut Vec<InlayEdit>) {
828 edits.sort_unstable_by(|a, b| {753 edits.sort_unstable_by(|a, b| {
829 a.old754 a.old
830 .start755 .start
@@ -952,7 +877,7 @@ impl Default for FoldSummary { · 121 unmodified lines
952impl sum_tree::Summary for FoldSummary {877impl sum_tree::Summary for FoldSummary {
953 type Context = MultiBufferSnapshot;878 type Context = MultiBufferSnapshot;
954 879
955 fn add_summary(&mut self, other: &Self, buffer: &MultiBufferSnapshot) {880 fn add_summary(&mut self, other: &Self, buffer: &Self::Context) {
956 if other.min_start.cmp(&self.min_start, buffer) == Ordering::Less {881 if other.min_start.cmp(&self.min_start, buffer) == Ordering::Less {
957 self.min_start = other.min_start.clone();882 self.min_start = other.min_start.clone();
958 }883 }
@@ -996,8 +921,8 @@ impl<'a> sum_tree::Dimension<'a, FoldSummary> for usize { · 37 unmodified lines
996 921
997#[derive(Clone)]922#[derive(Clone)]
998pub struct FoldBufferRows<'a> {923pub struct FoldBufferRows<'a> {
999 cursor: Cursor<'a, Transform, (FoldPoint, Point)>,924 cursor: Cursor<'a, Transform, (FoldPoint, InlayPoint)>,
1000 input_buffer_rows: MultiBufferRows<'a>,925 input_buffer_rows: InlayBufferRows<'a>,
1001 fold_point: FoldPoint,926 fold_point: FoldPoint,
1002}927}
1003 928
@@ -1016,7 +941,7 @@ impl<'a> Iterator for FoldBufferRows<'a> { · 12 unmodified lines
1016 941
1017 if self.cursor.item().is_some() {942 if self.cursor.item().is_some() {
1018 if traversed_fold {943 if traversed_fold {
1019 self.input_buffer_rows.seek(self.cursor.start().1.row);944 self.input_buffer_rows.seek(self.cursor.start().1.row());
1020 self.input_buffer_rows.next();945 self.input_buffer_rows.next();
1021 }946 }
1022 *self.fold_point.row_mut() += 1;947 *self.fold_point.row_mut() += 1;
@@ -1028,14 +953,12 @@ impl<'a> Iterator for FoldBufferRows<'a> { · 5 unmodified lines
1028}953}
1029 954
1030pub struct FoldChunks<'a> {955pub struct FoldChunks<'a> {
1031 transform_cursor: Cursor<'a, Transform, (FoldOffset, usize)>,956 transform_cursor: Cursor<'a, Transform, (FoldOffset, InlayOffset)>,
1032 buffer_chunks: MultiBufferChunks<'a>,957 inlay_chunks: InlayChunks<'a>,
1033 buffer_chunk: Option<(usize, Chunk<'a>)>,958 inlay_chunk: Option<(InlayOffset, Chunk<'a>)>,
1034 buffer_offset: usize,959 inlay_offset: InlayOffset,
1035 output_offset: usize,960 output_offset: usize,
1036 max_output_offset: usize,961 max_output_offset: usize,
1037 highlight_endpoints: Peekable<vec::IntoIter<HighlightEndpoint>>,
1038 active_highlights: BTreeMap<Option<TypeId>, HighlightStyle>,
1039 ellipses_color: Option<Color>,962 ellipses_color: Option<Color>,
1040}963}
1041 964
@@ -1052,11 +975,11 @@ impl<'a> Iterator for FoldChunks<'a> { · 10 unmodified lines
1052 // If we're in a fold, then return the fold's display text and975 // If we're in a fold, then return the fold's display text and
1053 // advance the transform and buffer cursors to the end of the fold.976 // advance the transform and buffer cursors to the end of the fold.
1054 if let Some(output_text) = transform.output_text {977 if let Some(output_text) = transform.output_text {
1055 self.buffer_chunk.take();978 self.inlay_chunk.take();
1056 self.buffer_offset += transform.summary.input.len;979 self.inlay_offset += InlayOffset(transform.summary.input.len);
1057 self.buffer_chunks.seek(self.buffer_offset);980 self.inlay_chunks.seek(self.inlay_offset);
1058 981
1059 while self.buffer_offset >= self.transform_cursor.end(&()).1982 while self.inlay_offset >= self.transform_cursor.end(&()).1
1060 && self.transform_cursor.item().is_some()983 && self.transform_cursor.item().is_some()
1061 {984 {
1062 self.transform_cursor.next(&());985 self.transform_cursor.next(&());
@@ -1073,53 +996,28 @@ impl<'a> Iterator for FoldChunks<'a> { · 10 unmodified lines
1073 });996 });
1074 }997 }
1075 998
1076 let mut next_highlight_endpoint = usize::MAX;
1077 while let Some(endpoint) = self.highlight_endpoints.peek().copied() {
1078 if endpoint.offset <= self.buffer_offset {
1079 if endpoint.is_start {
1080 self.active_highlights.insert(endpoint.tag, endpoint.style);
1081 } else {
1082 self.active_highlights.remove(&endpoint.tag);
1083 }
1084 self.highlight_endpoints.next();
1085 } else {
1086 next_highlight_endpoint = endpoint.offset;
1087 break;
1088 }
1089 }
1090
1091 // Retrieve a chunk from the current location in the buffer.999 // Retrieve a chunk from the current location in the buffer.
1092 if self.buffer_chunk.is_none() {1000 if self.inlay_chunk.is_none() {
1093 let chunk_offset = self.buffer_chunks.offset();1001 let chunk_offset = self.inlay_chunks.offset();
1094 self.buffer_chunk = self.buffer_chunks.next().map(|chunk| (chunk_offset, chunk));1002 self.inlay_chunk = self.inlay_chunks.next().map(|chunk| (chunk_offset, chunk));
1095 }1003 }
1096 1004
1097 // Otherwise, take a chunk from the buffer's text.1005 // Otherwise, take a chunk from the buffer's text.
1098 if let Some((buffer_chunk_start, mut chunk)) = self.buffer_chunk {1006 if let Some((buffer_chunk_start, mut chunk)) = self.inlay_chunk {
1099 let buffer_chunk_end = buffer_chunk_start + chunk.text.len();1007 let buffer_chunk_end = buffer_chunk_start + InlayOffset(chunk.text.len());
1100 let transform_end = self.transform_cursor.end(&()).1;1008 let transform_end = self.transform_cursor.end(&()).1;
1101 let chunk_end = buffer_chunk_end1009 let chunk_end = buffer_chunk_end.min(transform_end);
1102 .min(transform_end)
1103 .min(next_highlight_endpoint);
1104 1010
1105 chunk.text = &chunk.text1011 chunk.text = &chunk.text
1106 [self.buffer_offset - buffer_chunk_start..chunk_end - buffer_chunk_start];1012 [(self.inlay_offset - buffer_chunk_start).0..(chunk_end - buffer_chunk_start).0];
1107
1108 if !self.active_highlights.is_empty() {
1109 let mut highlight_style = HighlightStyle::default();
1110 for active_highlight in self.active_highlights.values() {
1111 highlight_style.highlight(*active_highlight);
1112 }
1113 chunk.highlight_style = Some(highlight_style);
1114 }
1115 1013
1116 if chunk_end == transform_end {1014 if chunk_end == transform_end {
1117 self.transform_cursor.next(&());1015 self.transform_cursor.next(&());
1118 } else if chunk_end == buffer_chunk_end {1016 } else if chunk_end == buffer_chunk_end {
1119 self.buffer_chunk.take();1017 self.inlay_chunk.take();
1120 }1018 }
1121 1019
1122 self.buffer_offset = chunk_end;1020 self.inlay_offset = chunk_end;
1123 self.output_offset += chunk.text.len();1021 self.output_offset += chunk.text.len();
1124 return Some(chunk);1022 return Some(chunk);
1125 }1023 }
@@ -1130,7 +1028,7 @@ impl<'a> Iterator for FoldChunks<'a> { · 4 unmodified lines
1130 1028
1131#[derive(Copy, Clone, Eq, PartialEq)]1029#[derive(Copy, Clone, Eq, PartialEq)]
1132struct HighlightEndpoint {1030struct HighlightEndpoint {
1133 offset: usize,1031 offset: InlayOffset,
1134 is_start: bool,1032 is_start: bool,
1135 tag: Option<TypeId>,1033 tag: Option<TypeId>,
1136 style: HighlightStyle,1034 style: HighlightStyle,
@@ -1162,12 +1060,34 @@ impl FoldOffset { · 25 unmodified lines
1162 let overshoot = if cursor.item().map_or(true, |t| t.is_fold()) {1060 let overshoot = if cursor.item().map_or(true, |t| t.is_fold()) {
1163 Point::new(0, (self.0 - cursor.start().0 .0) as u32)1061 Point::new(0, (self.0 - cursor.start().0 .0) as u32)
1164 } else {1062 } else {
1165 let buffer_offset = cursor.start().1.input.len + self.0 - cursor.start().0 .0;1063 let inlay_offset = cursor.start().1.input.len + self.0 - cursor.start().0 .0;
1166 let buffer_point = snapshot.buffer_snapshot.offset_to_point(buffer_offset);1064 let inlay_point = snapshot.inlay_snapshot.to_point(InlayOffset(inlay_offset));
1167 buffer_point - cursor.start().1.input.lines1065 inlay_point.0 - cursor.start().1.input.lines
1168 };1066 };
1169 FoldPoint(cursor.start().1.output.lines + overshoot)1067 FoldPoint(cursor.start().1.output.lines + overshoot)
1170 }1068 }
1069
1070 #[cfg(test)]
1071 pub fn to_inlay_offset(self, snapshot: &FoldSnapshot) -> InlayOffset {
1072 let mut cursor = snapshot.transforms.cursor::<(FoldOffset, InlayOffset)>();
1073 cursor.seek(&self, Bias::Right, &());
1074 let overshoot = self.0 - cursor.start().0 .0;
1075 InlayOffset(cursor.start().1 .0 + overshoot)
1076 }
1077}
1078
1079impl Add for FoldOffset {
1080 type Output = Self;
1081
1082 fn add(self, rhs: Self) -> Self::Output {
1083 Self(self.0 + rhs.0)
1084 }
1085}
1086
1087impl AddAssign for FoldOffset {
1088 fn add_assign(&mut self, rhs: Self) {
1089 self.0 += rhs.0;
1090 }
1171}1091}
1172 1092
1173impl Sub for FoldOffset {1093impl Sub for FoldOffset {
@@ -1184,15 +1104,15 @@ impl<'a> sum_tree::Dimension<'a, TransformSummary> for FoldOffset { · 10 unmodified lines
1184 }1104 }
1185}1105}
1186 1106
1187impl<'a> sum_tree::Dimension<'a, TransformSummary> for Point {1107impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayPoint {
1188 fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {1108 fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
1189 *self += &summary.input.lines;1109 self.0 += &summary.input.lines;
1190 }1110 }
1191}1111}
1192 1112
1193impl<'a> sum_tree::Dimension<'a, TransformSummary> for usize {1113impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayOffset {
1194 fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {1114 fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
1195 *self += &summary.input.len;1115 self.0 += &summary.input.len;
1196 }1116 }
1197}1117}
1198 1118
@@ -1201,12 +1121,12 @@ pub type FoldEdit = Edit<FoldOffset>; · 2 unmodified lines
1201#[cfg(test)]1121#[cfg(test)]
1202mod tests {1122mod tests {
1203 use super::*;1123 use super::*;
1204 use crate::{MultiBuffer, ToPoint};1124 use crate::{display_map::inlay_map::InlayMap, MultiBuffer, ToPoint};
1205 use collections::HashSet;1125 use collections::HashSet;
1206 use rand::prelude::*;1126 use rand::prelude::*;
1207 use settings::SettingsStore;1127 use settings::SettingsStore;
1208 use std::{cmp::Reverse, env, mem, sync::Arc};1128 use std::{env, mem};
1209 use sum_tree::TreeMap;1129 use text::Patch;
1210 use util::test::sample_text;1130 use util::test::sample_text;
1211 use util::RandomCharIter;1131 use util::RandomCharIter;
1212 use Bias::{Left, Right};1132 use Bias::{Left, Right};
@@ -1217,9 +1137,10 @@ mod tests { · 4 unmodified lines
1217 let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);1137 let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
1218 let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());1138 let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
1219 let buffer_snapshot = buffer.read(cx).snapshot(cx);1139 let buffer_snapshot = buffer.read(cx).snapshot(cx);
1220 let mut map = FoldMap::new(buffer_snapshot.clone()).0;1140 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1141 let mut map = FoldMap::new(inlay_snapshot.clone()).0;
1221 1142
1222 let (mut writer, _, _) = map.write(buffer_snapshot, vec![]);1143 let (mut writer, _, _) = map.write(inlay_snapshot, vec![]);
1223 let (snapshot2, edits) = writer.fold(vec![1144 let (snapshot2, edits) = writer.fold(vec![
1224 Point::new(0, 2)..Point::new(2, 2),1145 Point::new(0, 2)..Point::new(2, 2),
1225 Point::new(2, 4)..Point::new(4, 1),1146 Point::new(2, 4)..Point::new(4, 1),
@@ -1250,7 +1171,10 @@ mod tests { · 24 unmodified lines
1250 );1171 );
1251 buffer.snapshot(cx)1172 buffer.snapshot(cx)
1252 });1173 });
1253 let (snapshot3, edits) = map.read(buffer_snapshot, subscription.consume().into_inner());1174
1175 let (inlay_snapshot, inlay_edits) =
1176 inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
1177 let (snapshot3, edits) = map.read(inlay_snapshot, inlay_edits);
1254 assert_eq!(snapshot3.text(), "123a⋯c123c⋯eeeee");1178 assert_eq!(snapshot3.text(), "123a⋯c123c⋯eeeee");
1255 assert_eq!(1179 assert_eq!(
1256 edits,1180 edits,
@@ -1270,17 +1194,19 @@ mod tests { · 13 unmodified lines
1270 buffer.edit([(Point::new(2, 6)..Point::new(4, 3), "456")], None, cx);1194 buffer.edit([(Point::new(2, 6)..Point::new(4, 3), "456")], None, cx);
1271 buffer.snapshot(cx)1195 buffer.snapshot(cx)
1272 });1196 });
1273 let (snapshot4, _) = map.read(buffer_snapshot.clone(), subscription.consume().into_inner());1197 let (inlay_snapshot, inlay_edits) =
1198 inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
1199 let (snapshot4, _) = map.read(inlay_snapshot.clone(), inlay_edits);
1274 assert_eq!(snapshot4.text(), "123a⋯c123456eee");1200 assert_eq!(snapshot4.text(), "123a⋯c123456eee");
1275 1201
1276 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1202 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1277 writer.unfold(Some(Point::new(0, 4)..Point::new(0, 4)), false);1203 writer.unfold(Some(Point::new(0, 4)..Point::new(0, 4)), false);
1278 let (snapshot5, _) = map.read(buffer_snapshot.clone(), vec![]);1204 let (snapshot5, _) = map.read(inlay_snapshot.clone(), vec![]);
1279 assert_eq!(snapshot5.text(), "123a⋯c123456eee");1205 assert_eq!(snapshot5.text(), "123a⋯c123456eee");
1280 1206
1281 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1207 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1282 writer.unfold(Some(Point::new(0, 4)..Point::new(0, 4)), true);1208 writer.unfold(Some(Point::new(0, 4)..Point::new(0, 4)), true);
1283 let (snapshot6, _) = map.read(buffer_snapshot, vec![]);1209 let (snapshot6, _) = map.read(inlay_snapshot, vec![]);
1284 assert_eq!(snapshot6.text(), "123aaaaa\nbbbbbb\nccc123456eee");1210 assert_eq!(snapshot6.text(), "123aaaaa\nbbbbbb\nccc123456eee");
1285 }1211 }
1286 1212
@@ -1290,35 +1216,36 @@ mod tests { · 3 unmodified lines
1290 let buffer = MultiBuffer::build_simple("abcdefghijkl", cx);1216 let buffer = MultiBuffer::build_simple("abcdefghijkl", cx);
1291 let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());1217 let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
1292 let buffer_snapshot = buffer.read(cx).snapshot(cx);1218 let buffer_snapshot = buffer.read(cx).snapshot(cx);
1219 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1293 1220
1294 {1221 {
1295 let mut map = FoldMap::new(buffer_snapshot.clone()).0;1222 let mut map = FoldMap::new(inlay_snapshot.clone()).0;
1296 1223
1297 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1224 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1298 writer.fold(vec![5..8]);1225 writer.fold(vec![5..8]);
1299 let (snapshot, _) = map.read(buffer_snapshot.clone(), vec![]);1226 let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
1300 assert_eq!(snapshot.text(), "abcde⋯ijkl");1227 assert_eq!(snapshot.text(), "abcde⋯ijkl");
1301 1228
1302 // Create an fold adjacent to the start of the first fold.1229 // Create an fold adjacent to the start of the first fold.
1303 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1230 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1304 writer.fold(vec![0..1, 2..5]);1231 writer.fold(vec![0..1, 2..5]);
1305 let (snapshot, _) = map.read(buffer_snapshot.clone(), vec![]);1232 let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
1306 assert_eq!(snapshot.text(), "⋯b⋯ijkl");1233 assert_eq!(snapshot.text(), "⋯b⋯ijkl");
1307 1234
1308 // Create an fold adjacent to the end of the first fold.1235 // Create an fold adjacent to the end of the first fold.
1309 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1236 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1310 writer.fold(vec![11..11, 8..10]);1237 writer.fold(vec![11..11, 8..10]);
1311 let (snapshot, _) = map.read(buffer_snapshot.clone(), vec![]);1238 let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
1312 assert_eq!(snapshot.text(), "⋯b⋯kl");1239 assert_eq!(snapshot.text(), "⋯b⋯kl");
1313 }1240 }
1314 1241
1315 {1242 {
1316 let mut map = FoldMap::new(buffer_snapshot.clone()).0;1243 let mut map = FoldMap::new(inlay_snapshot.clone()).0;
1317 1244
1318 // Create two adjacent folds.1245 // Create two adjacent folds.
1319 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1246 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1320 writer.fold(vec![0..2, 2..5]);1247 writer.fold(vec![0..2, 2..5]);
1321 let (snapshot, _) = map.read(buffer_snapshot, vec![]);1248 let (snapshot, _) = map.read(inlay_snapshot, vec![]);
1322 assert_eq!(snapshot.text(), "⋯fghijkl");1249 assert_eq!(snapshot.text(), "⋯fghijkl");
1323 1250
1324 // Edit within one of the folds.1251 // Edit within one of the folds.
@@ -1326,7 +1253,9 @@ mod tests { · 1 unmodified line
1326 buffer.edit([(0..1, "12345")], None, cx);1253 buffer.edit([(0..1, "12345")], None, cx);
1327 buffer.snapshot(cx)1254 buffer.snapshot(cx)
1328 });1255 });
1329 let (snapshot, _) = map.read(buffer_snapshot, subscription.consume().into_inner());1256 let (inlay_snapshot, inlay_edits) =
1257 inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
1258 let (snapshot, _) = map.read(inlay_snapshot, inlay_edits);
1330 assert_eq!(snapshot.text(), "12345⋯fghijkl");1259 assert_eq!(snapshot.text(), "12345⋯fghijkl");
1331 }1260 }
1332 }1261 }
@@ -1335,15 +1264,16 @@ mod tests { · 2 unmodified lines
1335 fn test_overlapping_folds(cx: &mut gpui::AppContext) {1264 fn test_overlapping_folds(cx: &mut gpui::AppContext) {
1336 let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);1265 let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
1337 let buffer_snapshot = buffer.read(cx).snapshot(cx);1266 let buffer_snapshot = buffer.read(cx).snapshot(cx);
1338 let mut map = FoldMap::new(buffer_snapshot.clone()).0;1267 let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
1339 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1268 let mut map = FoldMap::new(inlay_snapshot.clone()).0;
1269 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1340 writer.fold(vec![1270 writer.fold(vec![
1341 Point::new(0, 2)..Point::new(2, 2),1271 Point::new(0, 2)..Point::new(2, 2),
1342 Point::new(0, 4)..Point::new(1, 0),1272 Point::new(0, 4)..Point::new(1, 0),
1343 Point::new(1, 2)..Point::new(3, 2),1273 Point::new(1, 2)..Point::new(3, 2),
1344 Point::new(3, 1)..Point::new(4, 1),1274 Point::new(3, 1)..Point::new(4, 1),
1345 ]);1275 ]);
1346 let (snapshot, _) = map.read(buffer_snapshot, vec![]);1276 let (snapshot, _) = map.read(inlay_snapshot, vec![]);
1347 assert_eq!(snapshot.text(), "aa⋯eeeee");1277 assert_eq!(snapshot.text(), "aa⋯eeeee");
1348 }1278 }
1349 1279
@@ -1353,21 +1283,24 @@ mod tests { · 3 unmodified lines
1353 let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);1283 let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
1354 let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());1284 let subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
1355 let buffer_snapshot = buffer.read(cx).snapshot(cx);1285 let buffer_snapshot = buffer.read(cx).snapshot(cx);
1356 let mut map = FoldMap::new(buffer_snapshot.clone()).0;1286 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1287 let mut map = FoldMap::new(inlay_snapshot.clone()).0;
1357 1288
1358 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1289 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1359 writer.fold(vec![1290 writer.fold(vec![
1360 Point::new(0, 2)..Point::new(2, 2),1291 Point::new(0, 2)..Point::new(2, 2),
1361 Point::new(3, 1)..Point::new(4, 1),1292 Point::new(3, 1)..Point::new(4, 1),
1362 ]);1293 ]);
1363 let (snapshot, _) = map.read(buffer_snapshot, vec![]);1294 let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
1364 assert_eq!(snapshot.text(), "aa⋯cccc\nd⋯eeeee");1295 assert_eq!(snapshot.text(), "aa⋯cccc\nd⋯eeeee");
1365 1296
1366 let buffer_snapshot = buffer.update(cx, |buffer, cx| {1297 let buffer_snapshot = buffer.update(cx, |buffer, cx| {
1367 buffer.edit([(Point::new(2, 2)..Point::new(3, 1), "")], None, cx);1298 buffer.edit([(Point::new(2, 2)..Point::new(3, 1), "")], None, cx);
1368 buffer.snapshot(cx)1299 buffer.snapshot(cx)
1369 });1300 });
1370 let (snapshot, _) = map.read(buffer_snapshot, subscription.consume().into_inner());1301 let (inlay_snapshot, inlay_edits) =
1302 inlay_map.sync(buffer_snapshot, subscription.consume().into_inner());
1303 let (snapshot, _) = map.read(inlay_snapshot, inlay_edits);
1371 assert_eq!(snapshot.text(), "aa⋯eeeee");1304 assert_eq!(snapshot.text(), "aa⋯eeeee");
1372 }1305 }
1373 1306
@@ -1375,16 +1308,17 @@ mod tests { · 1 unmodified line
1375 fn test_folds_in_range(cx: &mut gpui::AppContext) {1308 fn test_folds_in_range(cx: &mut gpui::AppContext) {
1376 let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);1309 let buffer = MultiBuffer::build_simple(&sample_text(5, 6, 'a'), cx);
1377 let buffer_snapshot = buffer.read(cx).snapshot(cx);1310 let buffer_snapshot = buffer.read(cx).snapshot(cx);
1378 let mut map = FoldMap::new(buffer_snapshot.clone()).0;1311 let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1312 let mut map = FoldMap::new(inlay_snapshot.clone()).0;
1379 1313
1380 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1314 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1381 writer.fold(vec![1315 writer.fold(vec![
1382 Point::new(0, 2)..Point::new(2, 2),1316 Point::new(0, 2)..Point::new(2, 2),
1383 Point::new(0, 4)..Point::new(1, 0),1317 Point::new(0, 4)..Point::new(1, 0),
1384 Point::new(1, 2)..Point::new(3, 2),1318 Point::new(1, 2)..Point::new(3, 2),
1385 Point::new(3, 1)..Point::new(4, 1),1319 Point::new(3, 1)..Point::new(4, 1),
1386 ]);1320 ]);
1387 let (snapshot, _) = map.read(buffer_snapshot.clone(), vec![]);1321 let (snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
1388 let fold_ranges = snapshot1322 let fold_ranges = snapshot
1389 .folds_in_range(Point::new(1, 0)..Point::new(1, 3))1323 .folds_in_range(Point::new(1, 0)..Point::new(1, 3))
1390 .map(|fold| fold.start.to_point(&buffer_snapshot)..fold.end.to_point(&buffer_snapshot))1324 .map(|fold| fold.start.to_point(&buffer_snapshot)..fold.end.to_point(&buffer_snapshot))
@@ -1413,37 +1347,25 @@ mod tests { · 22 unmodified lines
1413 MultiBuffer::build_random(&mut rng, cx)1347 MultiBuffer::build_random(&mut rng, cx)
1414 };1348 };
1415 let mut buffer_snapshot = buffer.read(cx).snapshot(cx);1349 let mut buffer_snapshot = buffer.read(cx).snapshot(cx);
1416 let mut map = FoldMap::new(buffer_snapshot.clone()).0;1350 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1351 let mut map = FoldMap::new(inlay_snapshot.clone()).0;
1417 1352
1418 let (mut initial_snapshot, _) = map.read(buffer_snapshot.clone(), vec![]);1353 let (mut initial_snapshot, _) = map.read(inlay_snapshot.clone(), vec![]);
1419 let mut snapshot_edits = Vec::new();1354 let mut snapshot_edits = Vec::new();
1420 1355
1421 let mut highlights = TreeMap::default();1356 let mut next_inlay_id = 0;
1422 let highlight_count = rng.gen_range(0_usize..10);
1423 let mut highlight_ranges = (0..highlight_count)
1424 .map(|_| buffer_snapshot.random_byte_range(0, &mut rng))
1425 .collect::<Vec<_>>();
1426 highlight_ranges.sort_by_key(|range| (range.start, Reverse(range.end)));
1427 log::info!("highlighting ranges {:?}", highlight_ranges);
1428 let highlight_ranges = highlight_ranges
1429 .into_iter()
1430 .map(|range| {
1431 buffer_snapshot.anchor_before(range.start)..buffer_snapshot.anchor_after(range.end)
1432 })
1433 .collect::<Vec<_>>();
1434
1435 highlights.insert(
1436 Some(TypeId::of::<()>()),
1437 Arc::new((HighlightStyle::default(), highlight_ranges)),
1438 );
1439
1440 for _ in 0..operations {1357 for _ in 0..operations {
1441 log::info!("text: {:?}", buffer_snapshot.text());1358 log::info!("text: {:?}", buffer_snapshot.text());
1442 let mut buffer_edits = Vec::new();1359 let mut buffer_edits = Vec::new();
1360 let mut inlay_edits = Vec::new();
1443 match rng.gen_range(0..=100) {1361 match rng.gen_range(0..=100) {
1444 0..=59 => {1362 0..=39 => {
1445 snapshot_edits.extend(map.randomly_mutate(&mut rng));1363 snapshot_edits.extend(map.randomly_mutate(&mut rng));
1446 }1364 }
1365 40..=59 => {
1366 let (_, edits) = inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
1367 inlay_edits = edits;
1368 }
1447 _ => buffer.update(cx, |buffer, cx| {1369 _ => buffer.update(cx, |buffer, cx| {
1448 let subscription = buffer.subscribe();1370 let subscription = buffer.subscribe();
1449 let edit_count = rng.gen_range(1..=5);1371 let edit_count = rng.gen_range(1..=5);
@@ -1455,12 +1377,21 @@ mod tests { · 5 unmodified lines
1455 }),1377 }),
1456 };1378 };
1457 1379
1458 let (snapshot, edits) = map.read(buffer_snapshot.clone(), buffer_edits);1380 let (inlay_snapshot, new_inlay_edits) =
1381 inlay_map.sync(buffer_snapshot.clone(), buffer_edits);
1382 log::info!("inlay text {:?}", inlay_snapshot.text());
1383
1384 let inlay_edits = Patch::new(inlay_edits)
1385 .compose(new_inlay_edits)
1386 .into_inner();
1387 let (snapshot, edits) = map.read(inlay_snapshot.clone(), inlay_edits);
1459 snapshot_edits.push((snapshot.clone(), edits));1388 snapshot_edits.push((snapshot.clone(), edits));
1460 1389
1461 let mut expected_text: String = buffer_snapshot.text().to_string();1390 let mut expected_text: String = inlay_snapshot.text().to_string();
1462 for fold_range in map.merged_fold_ranges().into_iter().rev() {1391 for fold_range in map.merged_fold_ranges().into_iter().rev() {
1463 expected_text.replace_range(fold_range.start..fold_range.end, "⋯");1392 let fold_inlay_start = inlay_snapshot.to_inlay_offset(fold_range.start);
1393 let fold_inlay_end = inlay_snapshot.to_inlay_offset(fold_range.end);
1394 expected_text.replace_range(fold_inlay_start.0..fold_inlay_end.0, "⋯");
1464 }1395 }
1465 1396
1466 assert_eq!(snapshot.text(), expected_text);1397 assert_eq!(snapshot.text(), expected_text);
@@ -1473,16 +1404,20 @@ mod tests { · 6 unmodified lines
1473 let mut prev_row = 0;1404 let mut prev_row = 0;
1474 let mut expected_buffer_rows = Vec::new();1405 let mut expected_buffer_rows = Vec::new();
1475 for fold_range in map.merged_fold_ranges().into_iter() {1406 for fold_range in map.merged_fold_ranges().into_iter() {
1476 let fold_start = buffer_snapshot.offset_to_point(fold_range.start).row;1407 let fold_start = inlay_snapshot
1477 let fold_end = buffer_snapshot.offset_to_point(fold_range.end).row;1408 .to_point(inlay_snapshot.to_inlay_offset(fold_range.start))
1409 .row();
1410 let fold_end = inlay_snapshot
1411 .to_point(inlay_snapshot.to_inlay_offset(fold_range.end))
1412 .row();
1478 expected_buffer_rows.extend(1413 expected_buffer_rows.extend(
1479 buffer_snapshot1414 inlay_snapshot
1480 .buffer_rows(prev_row)1415 .buffer_rows(prev_row)
1481 .take((1 + fold_start - prev_row) as usize),1416 .take((1 + fold_start - prev_row) as usize),
1482 );1417 );
1483 prev_row = 1 + fold_end;1418 prev_row = 1 + fold_end;
1484 }1419 }
1485 expected_buffer_rows.extend(buffer_snapshot.buffer_rows(prev_row));1420 expected_buffer_rows.extend(inlay_snapshot.buffer_rows(prev_row));
1486 1421
1487 assert_eq!(1422 assert_eq!(
1488 expected_buffer_rows.len(),1423 expected_buffer_rows.len(),
@@ -1508,19 +1443,19 @@ mod tests { · 19 unmodified lines
1508 let mut fold_offset = FoldOffset(0);1443 let mut fold_offset = FoldOffset(0);
1509 let mut char_column = 0;1444 let mut char_column = 0;
1510 for c in expected_text.chars() {1445 for c in expected_text.chars() {
1511 let buffer_point = fold_point.to_buffer_point(&snapshot);1446 let inlay_point = fold_point.to_inlay_point(&snapshot);
1512 let buffer_offset = buffer_point.to_offset(&buffer_snapshot);1447 let inlay_offset = fold_offset.to_inlay_offset(&snapshot);
1513 assert_eq!(1448 assert_eq!(
1514 snapshot.to_fold_point(buffer_point, Right),1449 snapshot.to_fold_point(inlay_point, Right),
1515 fold_point,1450 fold_point,
1516 "{:?} -> fold point",1451 "{:?} -> fold point",
1517 buffer_point,1452 inlay_point,
1518 );1453 );
1519 assert_eq!(1454 assert_eq!(
1520 fold_point.to_buffer_offset(&snapshot),1455 inlay_snapshot.to_offset(inlay_point),
1521 buffer_offset,1456 inlay_offset,
1522 "fold_point.to_buffer_offset({:?})",1457 "inlay_snapshot.to_offset({:?})",
1523 fold_point,1458 inlay_point,
1524 );1459 );
1525 assert_eq!(1460 assert_eq!(
1526 fold_point.to_offset(&snapshot),1461 fold_point.to_offset(&snapshot),
@@ -1561,7 +1496,7 @@ mod tests { · 34 unmodified lines
1561 let text = &expected_text[start.0..end.0];1496 let text = &expected_text[start.0..end.0];
1562 assert_eq!(1497 assert_eq!(
1563 snapshot1498 snapshot
1564 .chunks(start..end, false, Some(&highlights))1499 .chunks(start..end, false, None, None, None)
1565 .map(|c| c.text)1500 .map(|c| c.text)
1566 .collect::<String>(),1501 .collect::<String>(),
1567 text,1502 text,
@@ -1570,9 +1505,6 @@ mod tests { · 2 unmodified lines
1570 1505
1571 let mut fold_row = 0;1506 let mut fold_row = 0;
1572 while fold_row < expected_buffer_rows.len() as u32 {1507 while fold_row < expected_buffer_rows.len() as u32 {
1573 fold_row = snapshot
1574 .clip_point(FoldPoint::new(fold_row, 0), Bias::Right)
1575 .row();
1576 assert_eq!(1508 assert_eq!(
1577 snapshot.buffer_rows(fold_row).collect::<Vec<_>>(),1509 snapshot.buffer_rows(fold_row).collect::<Vec<_>>(),
1578 expected_buffer_rows[(fold_row as usize)..],1510 expected_buffer_rows[(fold_row as usize)..],
@@ -1582,13 +1514,31 @@ mod tests { · 3 unmodified lines
1582 fold_row += 1;1514 fold_row += 1;
1583 }1515 }
1584 1516
1585 let fold_start_rows = map1517 let folded_buffer_rows = map
1586 .merged_fold_ranges()1518 .merged_fold_ranges()
1587 .iter()1519 .iter()
1588 .map(|range| range.start.to_point(&buffer_snapshot).row)1520 .flat_map(|range| {
1521 let start_row = range.start.to_point(&buffer_snapshot).row;
1522 let end = range.end.to_point(&buffer_snapshot);
1523 if end.column == 0 {
1524 start_row..end.row
1525 } else {
1526 start_row..end.row + 1
1527 }
1528 })
1589 .collect::<HashSet<_>>();1529 .collect::<HashSet<_>>();
1590 for row in fold_start_rows {1530 for row in 0..=buffer_snapshot.max_point().row {
1591 assert!(snapshot.is_line_folded(row));1531 assert_eq!(
1532 snapshot.is_line_folded(row),
1533 folded_buffer_rows.contains(&row),
1534 "expected buffer row {}{} to be folded",
1535 row,
1536 if folded_buffer_rows.contains(&row) {
1537 ""
1538 } else {
1539 " not"
1540 }
1541 );
1592 }1542 }
1593 1543
1594 for _ in 0..5 {1544 for _ in 0..5 {
@@ -1596,6 +1546,7 @@ mod tests { · 1 unmodified line
1596 buffer_snapshot.clip_offset(rng.gen_range(0..=buffer_snapshot.len()), Right);1546 buffer_snapshot.clip_offset(rng.gen_range(0..=buffer_snapshot.len()), Right);
1597 let start = buffer_snapshot.clip_offset(rng.gen_range(0..=end), Left);1547 let start = buffer_snapshot.clip_offset(rng.gen_range(0..=end), Left);
1598 let expected_folds = map1548 let expected_folds = map
1549 .snapshot
1599 .folds1550 .folds
1600 .items(&buffer_snapshot)1551 .items(&buffer_snapshot)
1601 .into_iter()1552 .into_iter()
@@ -1659,15 +1610,16 @@ mod tests { · 57 unmodified lines
1659 let buffer = MultiBuffer::build_simple(&text, cx);1610 let buffer = MultiBuffer::build_simple(&text, cx);
1660 1611
1661 let buffer_snapshot = buffer.read(cx).snapshot(cx);1612 let buffer_snapshot = buffer.read(cx).snapshot(cx);
1662 let mut map = FoldMap::new(buffer_snapshot.clone()).0;1613 let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot);
1614 let mut map = FoldMap::new(inlay_snapshot.clone()).0;
1663 1615
1664 let (mut writer, _, _) = map.write(buffer_snapshot.clone(), vec![]);1616 let (mut writer, _, _) = map.write(inlay_snapshot.clone(), vec![]);
1665 writer.fold(vec![1617 writer.fold(vec![
1666 Point::new(0, 2)..Point::new(2, 2),1618 Point::new(0, 2)..Point::new(2, 2),
1667 Point::new(3, 1)..Point::new(4, 1),1619 Point::new(3, 1)..Point::new(4, 1),
1668 ]);1620 ]);
1669 1621
1670 let (snapshot, _) = map.read(buffer_snapshot, vec![]);1622 let (snapshot, _) = map.read(inlay_snapshot, vec![]);
1671 assert_eq!(snapshot.text(), "aa⋯cccc\nd⋯eeeee\nffffff\n");1623 assert_eq!(snapshot.text(), "aa⋯cccc\nd⋯eeeee\nffffff\n");
1672 assert_eq!(1624 assert_eq!(
1673 snapshot.buffer_rows(0).collect::<Vec<_>>(),1625 snapshot.buffer_rows(0).collect::<Vec<_>>(),
@@ -1682,13 +1634,14 @@ mod tests { · 8 unmodified lines
1682 1634
1683 impl FoldMap {1635 impl FoldMap {
1684 fn merged_fold_ranges(&self) -> Vec<Range<usize>> {1636 fn merged_fold_ranges(&self) -> Vec<Range<usize>> {
1685 let buffer = self.buffer.lock().clone();1637 let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
1686 let mut folds = self.folds.items(&buffer);1638 let buffer = &inlay_snapshot.buffer;
1639 let mut folds = self.snapshot.folds.items(buffer);
1687 // Ensure sorting doesn't change how folds get merged and displayed.1640 // Ensure sorting doesn't change how folds get merged and displayed.
1688 folds.sort_by(|a, b| a.0.cmp(&b.0, &buffer));1641 folds.sort_by(|a, b| a.0.cmp(&b.0, buffer));
1689 let mut fold_ranges = folds1642 let mut fold_ranges = folds
1690 .iter()1643 .iter()
1691 .map(|fold| fold.0.start.to_offset(&buffer)..fold.0.end.to_offset(&buffer))1644 .map(|fold| fold.0.start.to_offset(buffer)..fold.0.end.to_offset(buffer))
1692 .peekable();1645 .peekable();
1693 1646
1694 let mut merged_ranges = Vec::new();1647 let mut merged_ranges = Vec::new();
@@ -1716,8 +1669,9 @@ mod tests { · 21 unmodified lines
1716 ) -> Vec<(FoldSnapshot, Vec<FoldEdit>)> {1669 ) -> Vec<(FoldSnapshot, Vec<FoldEdit>)> {
1717 let mut snapshot_edits = Vec::new();1670 let mut snapshot_edits = Vec::new();
1718 match rng.gen_range(0..=100) {1671 match rng.gen_range(0..=100) {
1719 0..=39 if !self.folds.is_empty() => {1672 0..=39 if !self.snapshot.folds.is_empty() => {
1720 let buffer = self.buffer.lock().clone();1673 let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
1674 let buffer = &inlay_snapshot.buffer;
1721 let mut to_unfold = Vec::new();1675 let mut to_unfold = Vec::new();
1722 for _ in 0..rng.gen_range(1..=3) {1676 for _ in 0..rng.gen_range(1..=3) {
1723 let end = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Right);1677 let end = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Right);
@@ -1725,13 +1679,14 @@ mod tests { · 1 unmodified line
1725 to_unfold.push(start..end);1679 to_unfold.push(start..end);
1726 }1680 }
1727 log::info!("unfolding {:?}", to_unfold);1681 log::info!("unfolding {:?}", to_unfold);
1728 let (mut writer, snapshot, edits) = self.write(buffer, vec![]);1682 let (mut writer, snapshot, edits) = self.write(inlay_snapshot, vec![]);
1729 snapshot_edits.push((snapshot, edits));1683 snapshot_edits.push((snapshot, edits));
1730 let (snapshot, edits) = writer.fold(to_unfold);1684 let (snapshot, edits) = writer.fold(to_unfold);
1731 snapshot_edits.push((snapshot, edits));1685 snapshot_edits.push((snapshot, edits));
1732 }1686 }
1733 _ => {1687 _ => {
1734 let buffer = self.buffer.lock().clone();1688 let inlay_snapshot = self.snapshot.inlay_snapshot.clone();
1689 let buffer = &inlay_snapshot.buffer;
1735 let mut to_fold = Vec::new();1690 let mut to_fold = Vec::new();
1736 for _ in 0..rng.gen_range(1..=2) {1691 for _ in 0..rng.gen_range(1..=2) {
1737 let end = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Right);1692 let end = buffer.clip_offset(rng.gen_range(0..=buffer.len()), Right);
@@ -1739,7 +1694,7 @@ mod tests { · 1 unmodified line
1739 to_fold.push(start..end);1694 to_fold.push(start..end);
1740 }1695 }
1741 log::info!("folding {:?}", to_fold);1696 log::info!("folding {:?}", to_fold);
1742 let (mut writer, snapshot, edits) = self.write(buffer, vec![]);1697 let (mut writer, snapshot, edits) = self.write(inlay_snapshot, vec![]);
1743 snapshot_edits.push((snapshot, edits));1698 snapshot_edits.push((snapshot, edits));
1744 let (snapshot, edits) = writer.fold(to_fold);1699 let (snapshot, edits) = writer.fold(to_fold);
1745 snapshot_edits.push((snapshot, edits));1700 snapshot_edits.push((snapshot, edits));
crates/editor/src/display_map/inlay_map.rs+1787−0
@@ -0,0 +1,1787 @@
1use crate::{
2 multi_buffer::{MultiBufferChunks, MultiBufferRows},
3 Anchor, InlayId, MultiBufferSnapshot, ToOffset,
4};
5use collections::{BTreeMap, BTreeSet};
6use gpui::fonts::HighlightStyle;
7use language::{Chunk, Edit, Point, TextSummary};
8use std::{
9 any::TypeId,
10 cmp,
11 iter::Peekable,
12 ops::{Add, AddAssign, Range, Sub, SubAssign},
13 vec,
14};
15use sum_tree::{Bias, Cursor, SumTree};
16use text::{Patch, Rope};
17
18use super::TextHighlights;
19
20pub struct InlayMap {
21 snapshot: InlaySnapshot,
22 inlays: Vec<Inlay>,
23}
24
25#[derive(Clone)]
26pub struct InlaySnapshot {
27 pub buffer: MultiBufferSnapshot,
28 transforms: SumTree<Transform>,
29 pub version: usize,
30}
31
32#[derive(Clone, Debug)]
33enum Transform {
34 Isomorphic(TextSummary),
35 Inlay(Inlay),
36}
37
38#[derive(Debug, Clone)]
39pub struct Inlay {
40 pub id: InlayId,
41 pub position: Anchor,
42 pub text: text::Rope,
43}
44
45impl Inlay {
46 pub fn hint(id: usize, position: Anchor, hint: &project::InlayHint) -> Self {
47 let mut text = hint.text();
48 if hint.padding_right && !text.ends_with(' ') {
49 text.push(' ');
50 }
51 if hint.padding_left && !text.starts_with(' ') {
52 text.insert(0, ' ');
53 }
54 Self {
55 id: InlayId::Hint(id),
56 position,
57 text: text.into(),
58 }
59 }
60
61 pub fn suggestion<T: Into<Rope>>(id: usize, position: Anchor, text: T) -> Self {
62 Self {
63 id: InlayId::Suggestion(id),
64 position,
65 text: text.into(),
66 }
67 }
68}
69
70impl sum_tree::Item for Transform {
71 type Summary = TransformSummary;
72
73 fn summary(&self) -> Self::Summary {
74 match self {
75 Transform::Isomorphic(summary) => TransformSummary {
76 input: summary.clone(),
77 output: summary.clone(),
78 },
79 Transform::Inlay(inlay) => TransformSummary {
80 input: TextSummary::default(),
81 output: inlay.text.summary(),
82 },
83 }
84 }
85}
86
87#[derive(Clone, Debug, Default)]
88struct TransformSummary {
89 input: TextSummary,
90 output: TextSummary,
91}
92
93impl sum_tree::Summary for TransformSummary {
94 type Context = ();
95
96 fn add_summary(&mut self, other: &Self, _: &()) {
97 self.input += &other.input;
98 self.output += &other.output;
99 }
100}
101
102pub type InlayEdit = Edit<InlayOffset>;
103
104#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
105pub struct InlayOffset(pub usize);
106
107impl Add for InlayOffset {
108 type Output = Self;
109
110 fn add(self, rhs: Self) -> Self::Output {
111 Self(self.0 + rhs.0)
112 }
113}
114
115impl Sub for InlayOffset {
116 type Output = Self;
117
118 fn sub(self, rhs: Self) -> Self::Output {
119 Self(self.0 - rhs.0)
120 }
121}
122
123impl AddAssign for InlayOffset {
124 fn add_assign(&mut self, rhs: Self) {
125 self.0 += rhs.0;
126 }
127}
128
129impl SubAssign for InlayOffset {
130 fn sub_assign(&mut self, rhs: Self) {
131 self.0 -= rhs.0;
132 }
133}
134
135impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayOffset {
136 fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
137 self.0 += &summary.output.len;
138 }
139}
140
141#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
142pub struct InlayPoint(pub Point);
143
144impl Add for InlayPoint {
145 type Output = Self;
146
147 fn add(self, rhs: Self) -> Self::Output {
148 Self(self.0 + rhs.0)
149 }
150}
151
152impl Sub for InlayPoint {
153 type Output = Self;
154
155 fn sub(self, rhs: Self) -> Self::Output {
156 Self(self.0 - rhs.0)
157 }
158}
159
160impl<'a> sum_tree::Dimension<'a, TransformSummary> for InlayPoint {
161 fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
162 self.0 += &summary.output.lines;
163 }
164}
165
166impl<'a> sum_tree::Dimension<'a, TransformSummary> for usize {
167 fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
168 *self += &summary.input.len;
169 }
170}
171
172impl<'a> sum_tree::Dimension<'a, TransformSummary> for Point {
173 fn add_summary(&mut self, summary: &'a TransformSummary, _: &()) {
174 *self += &summary.input.lines;
175 }
176}
177
178#[derive(Clone)]
179pub struct InlayBufferRows<'a> {
180 transforms: Cursor<'a, Transform, (InlayPoint, Point)>,
181 buffer_rows: MultiBufferRows<'a>,
182 inlay_row: u32,
183 max_buffer_row: u32,
184}
185
186#[derive(Copy, Clone, Eq, PartialEq)]
187struct HighlightEndpoint {
188 offset: InlayOffset,
189 is_start: bool,
190 tag: Option<TypeId>,
191 style: HighlightStyle,
192}
193
194impl PartialOrd for HighlightEndpoint {
195 fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
196 Some(self.cmp(other))
197 }
198}
199
200impl Ord for HighlightEndpoint {
201 fn cmp(&self, other: &Self) -> cmp::Ordering {
202 self.offset
203 .cmp(&other.offset)
204 .then_with(|| other.is_start.cmp(&self.is_start))
205 }
206}
207
208pub struct InlayChunks<'a> {
209 transforms: Cursor<'a, Transform, (InlayOffset, usize)>,
210 buffer_chunks: MultiBufferChunks<'a>,
211 buffer_chunk: Option<Chunk<'a>>,
212 inlay_chunks: Option<text::Chunks<'a>>,
213 output_offset: InlayOffset,
214 max_output_offset: InlayOffset,
215 hint_highlight_style: Option<HighlightStyle>,
216 suggestion_highlight_style: Option<HighlightStyle>,
217 highlight_endpoints: Peekable<vec::IntoIter<HighlightEndpoint>>,
218 active_highlights: BTreeMap<Option<TypeId>, HighlightStyle>,
219 snapshot: &'a InlaySnapshot,
220}
221
222impl<'a> InlayChunks<'a> {
223 pub fn seek(&mut self, offset: InlayOffset) {
224 self.transforms.seek(&offset, Bias::Right, &());
225
226 let buffer_offset = self.snapshot.to_buffer_offset(offset);
227 self.buffer_chunks.seek(buffer_offset);
228 self.inlay_chunks = None;
229 self.buffer_chunk = None;
230 self.output_offset = offset;
231 }
232
233 pub fn offset(&self) -> InlayOffset {
234 self.output_offset
235 }
236}
237
238impl<'a> Iterator for InlayChunks<'a> {
239 type Item = Chunk<'a>;
240
241 fn next(&mut self) -> Option<Self::Item> {
242 if self.output_offset == self.max_output_offset {
243 return None;
244 }
245
246 let mut next_highlight_endpoint = InlayOffset(usize::MAX);
247 while let Some(endpoint) = self.highlight_endpoints.peek().copied() {
248 if endpoint.offset <= self.output_offset {
249 if endpoint.is_start {
250 self.active_highlights.insert(endpoint.tag, endpoint.style);
251 } else {
252 self.active_highlights.remove(&endpoint.tag);
253 }
254 self.highlight_endpoints.next();
255 } else {
256 next_highlight_endpoint = endpoint.offset;
257 break;
258 }
259 }
260
261 let chunk = match self.transforms.item()? {
262 Transform::Isomorphic(_) => {
263 let chunk = self
264 .buffer_chunk
265 .get_or_insert_with(|| self.buffer_chunks.next().unwrap());
266 if chunk.text.is_empty() {
267 *chunk = self.buffer_chunks.next().unwrap();
268 }
269
270 let (prefix, suffix) = chunk.text.split_at(
271 chunk
272 .text
273 .len()
274 .min(self.transforms.end(&()).0 .0 - self.output_offset.0)
275 .min(next_highlight_endpoint.0 - self.output_offset.0),
276 );
277
278 chunk.text = suffix;
279 self.output_offset.0 += prefix.len();
280 let mut prefix = Chunk {
281 text: prefix,
282 ..chunk.clone()
283 };
284 if !self.active_highlights.is_empty() {
285 let mut highlight_style = HighlightStyle::default();
286 for active_highlight in self.active_highlights.values() {
287 highlight_style.highlight(*active_highlight);
288 }
289 prefix.highlight_style = Some(highlight_style);
290 }
291 prefix
292 }
293 Transform::Inlay(inlay) => {
294 let inlay_chunks = self.inlay_chunks.get_or_insert_with(|| {
295 let start = self.output_offset - self.transforms.start().0;
296 let end = cmp::min(self.max_output_offset, self.transforms.end(&()).0)
297 - self.transforms.start().0;
298 inlay.text.chunks_in_range(start.0..end.0)
299 });
300
301 let chunk = inlay_chunks.next().unwrap();
302 self.output_offset.0 += chunk.len();
303 let highlight_style = match inlay.id {
304 InlayId::Suggestion(_) => self.suggestion_highlight_style,
305 InlayId::Hint(_) => self.hint_highlight_style,
306 };
307 Chunk {
308 text: chunk,
309 highlight_style,
310 ..Default::default()
311 }
312 }
313 };
314
315 if self.output_offset == self.transforms.end(&()).0 {
316 self.inlay_chunks = None;
317 self.transforms.next(&());
318 }
319
320 Some(chunk)
321 }
322}
323
324impl<'a> InlayBufferRows<'a> {
325 pub fn seek(&mut self, row: u32) {
326 let inlay_point = InlayPoint::new(row, 0);
327 self.transforms.seek(&inlay_point, Bias::Left, &());
328
329 let mut buffer_point = self.transforms.start().1;
330 let buffer_row = if row == 0 {
331 0
332 } else {
333 match self.transforms.item() {
334 Some(Transform::Isomorphic(_)) => {
335 buffer_point += inlay_point.0 - self.transforms.start().0 .0;
336 buffer_point.row
337 }
338 _ => cmp::min(buffer_point.row + 1, self.max_buffer_row),
339 }
340 };
341 self.inlay_row = inlay_point.row();
342 self.buffer_rows.seek(buffer_row);
343 }
344}
345
346impl<'a> Iterator for InlayBufferRows<'a> {
347 type Item = Option<u32>;
348
349 fn next(&mut self) -> Option<Self::Item> {
350 let buffer_row = if self.inlay_row == 0 {
351 self.buffer_rows.next().unwrap()
352 } else {
353 match self.transforms.item()? {
354 Transform::Inlay(_) => None,
355 Transform::Isomorphic(_) => self.buffer_rows.next().unwrap(),
356 }
357 };
358
359 self.inlay_row += 1;
360 self.transforms
361 .seek_forward(&InlayPoint::new(self.inlay_row, 0), Bias::Left, &());
362
363 Some(buffer_row)
364 }
365}
366
367impl InlayPoint {
368 pub fn new(row: u32, column: u32) -> Self {
369 Self(Point::new(row, column))
370 }
371
372 pub fn row(self) -> u32 {
373 self.0.row
374 }
375}
376
377impl InlayMap {
378 pub fn new(buffer: MultiBufferSnapshot) -> (Self, InlaySnapshot) {
379 let version = 0;
380 let snapshot = InlaySnapshot {
381 buffer: buffer.clone(),
382 transforms: SumTree::from_iter(Some(Transform::Isomorphic(buffer.text_summary())), &()),
383 version,
384 };
385
386 (
387 Self {
388 snapshot: snapshot.clone(),
389 inlays: Vec::new(),
390 },
391 snapshot,
392 )
393 }
394
395 pub fn sync(
396 &mut self,
397 buffer_snapshot: MultiBufferSnapshot,
398 mut buffer_edits: Vec<text::Edit<usize>>,
399 ) -> (InlaySnapshot, Vec<InlayEdit>) {
400 let mut snapshot = &mut self.snapshot;
401
402 if buffer_edits.is_empty() {
403 if snapshot.buffer.trailing_excerpt_update_count()
404 != buffer_snapshot.trailing_excerpt_update_count()
405 {
406 buffer_edits.push(Edit {
407 old: snapshot.buffer.len()..snapshot.buffer.len(),
408 new: buffer_snapshot.len()..buffer_snapshot.len(),
409 });
410 }
411 }
412
413 if buffer_edits.is_empty() {
414 if snapshot.buffer.edit_count() != buffer_snapshot.edit_count()
415 || snapshot.buffer.parse_count() != buffer_snapshot.parse_count()
416 || snapshot.buffer.diagnostics_update_count()
417 != buffer_snapshot.diagnostics_update_count()
418 || snapshot.buffer.git_diff_update_count()
419 != buffer_snapshot.git_diff_update_count()
420 || snapshot.buffer.trailing_excerpt_update_count()
421 != buffer_snapshot.trailing_excerpt_update_count()
422 {
423 snapshot.version += 1;
424 }
425
426 snapshot.buffer = buffer_snapshot;
427 (snapshot.clone(), Vec::new())
428 } else {
429 let mut inlay_edits = Patch::default();
430 let mut new_transforms = SumTree::new();
431 let mut cursor = snapshot.transforms.cursor::<(usize, InlayOffset)>();
432 let mut buffer_edits_iter = buffer_edits.iter().peekable();
433 while let Some(buffer_edit) = buffer_edits_iter.next() {
434 new_transforms.append(cursor.slice(&buffer_edit.old.start, Bias::Left, &()), &());
435 if let Some(Transform::Isomorphic(transform)) = cursor.item() {
436 if cursor.end(&()).0 == buffer_edit.old.start {
437 push_isomorphic(&mut new_transforms, transform.clone());
438 cursor.next(&());
439 }
440 }
441
442 // Remove all the inlays and transforms contained by the edit.
443 let old_start =
444 cursor.start().1 + InlayOffset(buffer_edit.old.start - cursor.start().0);
445 cursor.seek(&buffer_edit.old.end, Bias::Right, &());
446 let old_end =
447 cursor.start().1 + InlayOffset(buffer_edit.old.end - cursor.start().0);
448
449 // Push the unchanged prefix.
450 let prefix_start = new_transforms.summary().input.len;
451 let prefix_end = buffer_edit.new.start;
452 push_isomorphic(
453 &mut new_transforms,
454 buffer_snapshot.text_summary_for_range(prefix_start..prefix_end),
455 );
456 let new_start = InlayOffset(new_transforms.summary().output.len);
457
458 let start_ix = match self.inlays.binary_search_by(|probe| {
459 probe
460 .position
461 .to_offset(&buffer_snapshot)
462 .cmp(&buffer_edit.new.start)
463 .then(std::cmp::Ordering::Greater)
464 }) {
465 Ok(ix) | Err(ix) => ix,
466 };
467
468 for inlay in &self.inlays[start_ix..] {
469 let buffer_offset = inlay.position.to_offset(&buffer_snapshot);
470 if buffer_offset > buffer_edit.new.end {
471 break;
472 }
473
474 let prefix_start = new_transforms.summary().input.len;
475 let prefix_end = buffer_offset;
476 push_isomorphic(
477 &mut new_transforms,
478 buffer_snapshot.text_summary_for_range(prefix_start..prefix_end),
479 );
480
481 if inlay.position.is_valid(&buffer_snapshot) {
482 new_transforms.push(Transform::Inlay(inlay.clone()), &());
483 }
484 }
485
486 // Apply the rest of the edit.
487 let transform_start = new_transforms.summary().input.len;
488 push_isomorphic(
489 &mut new_transforms,
490 buffer_snapshot.text_summary_for_range(transform_start..buffer_edit.new.end),
491 );
492 let new_end = InlayOffset(new_transforms.summary().output.len);
493 inlay_edits.push(Edit {
494 old: old_start..old_end,
495 new: new_start..new_end,
496 });
497
498 // If the next edit doesn't intersect the current isomorphic transform, then
499 // we can push its remainder.
500 if buffer_edits_iter
501 .peek()
502 .map_or(true, |edit| edit.old.start >= cursor.end(&()).0)
503 {
504 let transform_start = new_transforms.summary().input.len;
505 let transform_end =
506 buffer_edit.new.end + (cursor.end(&()).0 - buffer_edit.old.end);
507 push_isomorphic(
508 &mut new_transforms,
509 buffer_snapshot.text_summary_for_range(transform_start..transform_end),
510 );
511 cursor.next(&());
512 }
513 }
514
515 new_transforms.append(cursor.suffix(&()), &());
516 if new_transforms.is_empty() {
517 new_transforms.push(Transform::Isomorphic(Default::default()), &());
518 }
519
520 drop(cursor);
521 snapshot.transforms = new_transforms;
522 snapshot.version += 1;
523 snapshot.buffer = buffer_snapshot;
524 snapshot.check_invariants();
525
526 (snapshot.clone(), inlay_edits.into_inner())
527 }
528 }
529
530 pub fn splice(
531 &mut self,
532 to_remove: Vec<InlayId>,
533 to_insert: Vec<Inlay>,
534 ) -> (InlaySnapshot, Vec<InlayEdit>) {
535 let snapshot = &mut self.snapshot;
536 let mut edits = BTreeSet::new();
537
538 self.inlays.retain(|inlay| {
539 let retain = !to_remove.contains(&inlay.id);
540 if !retain {
541 let offset = inlay.position.to_offset(&snapshot.buffer);
542 edits.insert(offset);
543 }
544 retain
545 });
546
547 for inlay_to_insert in to_insert {
548 // Avoid inserting empty inlays.
549 if inlay_to_insert.text.is_empty() {
550 continue;
551 }
552
553 let offset = inlay_to_insert.position.to_offset(&snapshot.buffer);
554 match self.inlays.binary_search_by(|probe| {
555 probe
556 .position
557 .cmp(&inlay_to_insert.position, &snapshot.buffer)
558 }) {
559 Ok(ix) | Err(ix) => {
560 self.inlays.insert(ix, inlay_to_insert);
561 }
562 }
563
564 edits.insert(offset);
565 }
566
567 let buffer_edits = edits
568 .into_iter()
569 .map(|offset| Edit {
570 old: offset..offset,
571 new: offset..offset,
572 })
573 .collect();
574 let buffer_snapshot = snapshot.buffer.clone();
575 drop(snapshot);
576 let (snapshot, edits) = self.sync(buffer_snapshot, buffer_edits);
577 (snapshot, edits)
578 }
579
580 pub fn current_inlays(&self) -> impl Iterator<Item = &Inlay> {
581 self.inlays.iter()
582 }
583
584 #[cfg(test)]
585 pub(crate) fn randomly_mutate(
586 &mut self,
587 next_inlay_id: &mut usize,
588 rng: &mut rand::rngs::StdRng,
589 ) -> (InlaySnapshot, Vec<InlayEdit>) {
590 use rand::prelude::*;
591 use util::post_inc;
592
593 let mut to_remove = Vec::new();
594 let mut to_insert = Vec::new();
595 let snapshot = &mut self.snapshot;
596 for i in 0..rng.gen_range(1..=5) {
597 if self.inlays.is_empty() || rng.gen() {
598 let position = snapshot.buffer.random_byte_range(0, rng).start;
599 let bias = if rng.gen() { Bias::Left } else { Bias::Right };
600 let len = if rng.gen_bool(0.01) {
601 0
602 } else {
603 rng.gen_range(1..=5)
604 };
605 let text = util::RandomCharIter::new(&mut *rng)
606 .filter(|ch| *ch != '\r')
607 .take(len)
608 .collect::<String>();
609 log::info!(
610 "creating inlay at buffer offset {} with bias {:?} and text {:?}",
611 position,
612 bias,
613 text
614 );
615
616 let inlay_id = if i % 2 == 0 {
617 InlayId::Hint(post_inc(next_inlay_id))
618 } else {
619 InlayId::Suggestion(post_inc(next_inlay_id))
620 };
621 to_insert.push(Inlay {
622 id: inlay_id,
623 position: snapshot.buffer.anchor_at(position, bias),
624 text: text.into(),
625 });
626 } else {
627 to_remove.push(
628 self.inlays
629 .iter()
630 .choose(rng)
631 .map(|inlay| inlay.id)
632 .unwrap(),
633 );
634 }
635 }
636 log::info!("removing inlays: {:?}", to_remove);
637
638 drop(snapshot);
639 let (snapshot, edits) = self.splice(to_remove, to_insert);
640 (snapshot, edits)
641 }
642}
643
644impl InlaySnapshot {
645 pub fn to_point(&self, offset: InlayOffset) -> InlayPoint {
646 let mut cursor = self
647 .transforms
648 .cursor::<(InlayOffset, (InlayPoint, usize))>();
649 cursor.seek(&offset, Bias::Right, &());
650 let overshoot = offset.0 - cursor.start().0 .0;
651 match cursor.item() {
652 Some(Transform::Isomorphic(_)) => {
653 let buffer_offset_start = cursor.start().1 .1;
654 let buffer_offset_end = buffer_offset_start + overshoot;
655 let buffer_start = self.buffer.offset_to_point(buffer_offset_start);
656 let buffer_end = self.buffer.offset_to_point(buffer_offset_end);
657 InlayPoint(cursor.start().1 .0 .0 + (buffer_end - buffer_start))
658 }
659 Some(Transform::Inlay(inlay)) => {
660 let overshoot = inlay.text.offset_to_point(overshoot);
661 InlayPoint(cursor.start().1 .0 .0 + overshoot)
662 }
663 None => self.max_point(),
664 }
665 }
666
667 pub fn len(&self) -> InlayOffset {
668 InlayOffset(self.transforms.summary().output.len)
669 }
670
671 pub fn max_point(&self) -> InlayPoint {
672 InlayPoint(self.transforms.summary().output.lines)
673 }
674
675 pub fn to_offset(&self, point: InlayPoint) -> InlayOffset {
676 let mut cursor = self
677 .transforms
678 .cursor::<(InlayPoint, (InlayOffset, Point))>();
679 cursor.seek(&point, Bias::Right, &());
680 let overshoot = point.0 - cursor.start().0 .0;
681 match cursor.item() {
682 Some(Transform::Isomorphic(_)) => {
683 let buffer_point_start = cursor.start().1 .1;
684 let buffer_point_end = buffer_point_start + overshoot;
685 let buffer_offset_start = self.buffer.point_to_offset(buffer_point_start);
686 let buffer_offset_end = self.buffer.point_to_offset(buffer_point_end);
687 InlayOffset(cursor.start().1 .0 .0 + (buffer_offset_end - buffer_offset_start))
688 }
689 Some(Transform::Inlay(inlay)) => {
690 let overshoot = inlay.text.point_to_offset(overshoot);
691 InlayOffset(cursor.start().1 .0 .0 + overshoot)
692 }
693 None => self.len(),
694 }
695 }
696
697 pub fn to_buffer_point(&self, point: InlayPoint) -> Point {
698 let mut cursor = self.transforms.cursor::<(InlayPoint, Point)>();
699 cursor.seek(&point, Bias::Right, &());
700 match cursor.item() {
701 Some(Transform::Isomorphic(_)) => {
702 let overshoot = point.0 - cursor.start().0 .0;
703 cursor.start().1 + overshoot
704 }
705 Some(Transform::Inlay(_)) => cursor.start().1,
706 None => self.buffer.max_point(),
707 }
708 }
709
710 pub fn to_buffer_offset(&self, offset: InlayOffset) -> usize {
711 let mut cursor = self.transforms.cursor::<(InlayOffset, usize)>();
712 cursor.seek(&offset, Bias::Right, &());
713 match cursor.item() {
714 Some(Transform::Isomorphic(_)) => {
715 let overshoot = offset - cursor.start().0;
716 cursor.start().1 + overshoot.0
717 }
718 Some(Transform::Inlay(_)) => cursor.start().1,
719 None => self.buffer.len(),
720 }
721 }
722
723 pub fn to_inlay_offset(&self, offset: usize) -> InlayOffset {
724 let mut cursor = self.transforms.cursor::<(usize, InlayOffset)>();
725 cursor.seek(&offset, Bias::Left, &());
726 loop {
727 match cursor.item() {
728 Some(Transform::Isomorphic(_)) => {
729 if offset == cursor.end(&()).0 {
730 while let Some(Transform::Inlay(inlay)) = cursor.next_item() {
731 if inlay.position.bias() == Bias::Right {
732 break;
733 } else {
734 cursor.next(&());
735 }
736 }
737 return cursor.end(&()).1;
738 } else {
739 let overshoot = offset - cursor.start().0;
740 return InlayOffset(cursor.start().1 .0 + overshoot);
741 }
742 }
743 Some(Transform::Inlay(inlay)) => {
744 if inlay.position.bias() == Bias::Left {
745 cursor.next(&());
746 } else {
747 return cursor.start().1;
748 }
749 }
750 None => {
751 return self.len();
752 }
753 }
754 }
755 }
756
757 pub fn to_inlay_point(&self, point: Point) -> InlayPoint {
758 let mut cursor = self.transforms.cursor::<(Point, InlayPoint)>();
759 cursor.seek(&point, Bias::Left, &());
760 loop {
761 match cursor.item() {
762 Some(Transform::Isomorphic(_)) => {
763 if point == cursor.end(&()).0 {
764 while let Some(Transform::Inlay(inlay)) = cursor.next_item() {
765 if inlay.position.bias() == Bias::Right {
766 break;
767 } else {
768 cursor.next(&());
769 }
770 }
771 return cursor.end(&()).1;
772 } else {
773 let overshoot = point - cursor.start().0;
774 return InlayPoint(cursor.start().1 .0 + overshoot);
775 }
776 }
777 Some(Transform::Inlay(inlay)) => {
778 if inlay.position.bias() == Bias::Left {
779 cursor.next(&());
780 } else {
781 return cursor.start().1;
782 }
783 }
784 None => {
785 return self.max_point();
786 }
787 }
788 }
789 }
790
791 pub fn clip_point(&self, mut point: InlayPoint, mut bias: Bias) -> InlayPoint {
792 let mut cursor = self.transforms.cursor::<(InlayPoint, Point)>();
793 cursor.seek(&point, Bias::Left, &());
794 loop {
795 match cursor.item() {
796 Some(Transform::Isomorphic(transform)) => {
797 if cursor.start().0 == point {
798 if let Some(Transform::Inlay(inlay)) = cursor.prev_item() {
799 if inlay.position.bias() == Bias::Left {
800 return point;
801 } else if bias == Bias::Left {
802 cursor.prev(&());
803 } else if transform.first_line_chars == 0 {
804 point.0 += Point::new(1, 0);
805 } else {
806 point.0 += Point::new(0, 1);
807 }
808 } else {
809 return point;
810 }
811 } else if cursor.end(&()).0 == point {
812 if let Some(Transform::Inlay(inlay)) = cursor.next_item() {
813 if inlay.position.bias() == Bias::Right {
814 return point;
815 } else if bias == Bias::Right {
816 cursor.next(&());
817 } else if point.0.column == 0 {
818 point.0.row -= 1;
819 point.0.column = self.line_len(point.0.row);
820 } else {
821 point.0.column -= 1;
822 }
823 } else {
824 return point;
825 }
826 } else {
827 let overshoot = point.0 - cursor.start().0 .0;
828 let buffer_point = cursor.start().1 + overshoot;
829 let clipped_buffer_point = self.buffer.clip_point(buffer_point, bias);
830 let clipped_overshoot = clipped_buffer_point - cursor.start().1;
831 let clipped_point = InlayPoint(cursor.start().0 .0 + clipped_overshoot);
832 if clipped_point == point {
833 return clipped_point;
834 } else {
835 point = clipped_point;
836 }
837 }
838 }
839 Some(Transform::Inlay(inlay)) => {
840 if point == cursor.start().0 && inlay.position.bias() == Bias::Right {
841 match cursor.prev_item() {
842 Some(Transform::Inlay(inlay)) => {
843 if inlay.position.bias() == Bias::Left {
844 return point;
845 }
846 }
847 _ => return point,
848 }
849 } else if point == cursor.end(&()).0 && inlay.position.bias() == Bias::Left {
850 match cursor.next_item() {
851 Some(Transform::Inlay(inlay)) => {
852 if inlay.position.bias() == Bias::Right {
853 return point;
854 }
855 }
856 _ => return point,
857 }
858 }
859
860 if bias == Bias::Left {
861 point = cursor.start().0;
862 cursor.prev(&());
863 } else {
864 cursor.next(&());
865 point = cursor.start().0;
866 }
867 }
868 None => {
869 bias = bias.invert();
870 if bias == Bias::Left {
871 point = cursor.start().0;
872 cursor.prev(&());
873 } else {
874 cursor.next(&());
875 point = cursor.start().0;
876 }
877 }
878 }
879 }
880 }
881
882 pub fn text_summary(&self) -> TextSummary {
883 self.transforms.summary().output.clone()
884 }
885
886 pub fn text_summary_for_range(&self, range: Range<InlayOffset>) -> TextSummary {
887 let mut summary = TextSummary::default();
888
889 let mut cursor = self.transforms.cursor::<(InlayOffset, usize)>();
890 cursor.seek(&range.start, Bias::Right, &());
891
892 let overshoot = range.start.0 - cursor.start().0 .0;
893 match cursor.item() {
894 Some(Transform::Isomorphic(_)) => {
895 let buffer_start = cursor.start().1;
896 let suffix_start = buffer_start + overshoot;
897 let suffix_end =
898 buffer_start + (cmp::min(cursor.end(&()).0, range.end).0 - cursor.start().0 .0);
899 summary = self.buffer.text_summary_for_range(suffix_start..suffix_end);
900 cursor.next(&());
901 }
902 Some(Transform::Inlay(inlay)) => {
903 let suffix_start = overshoot;
904 let suffix_end = cmp::min(cursor.end(&()).0, range.end).0 - cursor.start().0 .0;
905 summary = inlay.text.cursor(suffix_start).summary(suffix_end);
906 cursor.next(&());
907 }
908 None => {}
909 }
910
911 if range.end > cursor.start().0 {
912 summary += cursor
913 .summary::<_, TransformSummary>(&range.end, Bias::Right, &())
914 .output;
915
916 let overshoot = range.end.0 - cursor.start().0 .0;
917 match cursor.item() {
918 Some(Transform::Isomorphic(_)) => {
919 let prefix_start = cursor.start().1;
920 let prefix_end = prefix_start + overshoot;
921 summary += self
922 .buffer
923 .text_summary_for_range::<TextSummary, _>(prefix_start..prefix_end);
924 }
925 Some(Transform::Inlay(inlay)) => {
926 let prefix_end = overshoot;
927 summary += inlay.text.cursor(0).summary::<TextSummary>(prefix_end);
928 }
929 None => {}
930 }
931 }
932
933 summary
934 }
935
936 pub fn buffer_rows<'a>(&'a self, row: u32) -> InlayBufferRows<'a> {
937 let mut cursor = self.transforms.cursor::<(InlayPoint, Point)>();
938 let inlay_point = InlayPoint::new(row, 0);
939 cursor.seek(&inlay_point, Bias::Left, &());
940
941 let max_buffer_row = self.buffer.max_point().row;
942 let mut buffer_point = cursor.start().1;
943 let buffer_row = if row == 0 {
944 0
945 } else {
946 match cursor.item() {
947 Some(Transform::Isomorphic(_)) => {
948 buffer_point += inlay_point.0 - cursor.start().0 .0;
949 buffer_point.row
950 }
951 _ => cmp::min(buffer_point.row + 1, max_buffer_row),
952 }
953 };
954
955 InlayBufferRows {
956 transforms: cursor,
957 inlay_row: inlay_point.row(),
958 buffer_rows: self.buffer.buffer_rows(buffer_row),
959 max_buffer_row,
960 }
961 }
962
963 pub fn line_len(&self, row: u32) -> u32 {
964 let line_start = self.to_offset(InlayPoint::new(row, 0)).0;
965 let line_end = if row >= self.max_point().row() {
966 self.len().0
967 } else {
968 self.to_offset(InlayPoint::new(row + 1, 0)).0 - 1
969 };
970 (line_end - line_start) as u32
971 }
972
973 pub fn chunks<'a>(
974 &'a self,
975 range: Range<InlayOffset>,
976 language_aware: bool,
977 text_highlights: Option<&'a TextHighlights>,
978 hint_highlights: Option<HighlightStyle>,
979 suggestion_highlights: Option<HighlightStyle>,
980 ) -> InlayChunks<'a> {
981 let mut cursor = self.transforms.cursor::<(InlayOffset, usize)>();
982 cursor.seek(&range.start, Bias::Right, &());
983
984 let mut highlight_endpoints = Vec::new();
985 if let Some(text_highlights) = text_highlights {
986 if !text_highlights.is_empty() {
987 while cursor.start().0 < range.end {
988 if true {
989 let transform_start = self.buffer.anchor_after(
990 self.to_buffer_offset(cmp::max(range.start, cursor.start().0)),
991 );
992
993 let transform_end = {
994 let overshoot = InlayOffset(range.end.0 - cursor.start().0 .0);
995 self.buffer.anchor_before(self.to_buffer_offset(cmp::min(
996 cursor.end(&()).0,
997 cursor.start().0 + overshoot,
998 )))
999 };
1000
1001 for (tag, highlights) in text_highlights.iter() {
1002 let style = highlights.0;
1003 let ranges = &highlights.1;
1004
1005 let start_ix = match ranges.binary_search_by(|probe| {
1006 let cmp = probe.end.cmp(&transform_start, &self.buffer);
1007 if cmp.is_gt() {
1008 cmp::Ordering::Greater
1009 } else {
1010 cmp::Ordering::Less
1011 }
1012 }) {
1013 Ok(i) | Err(i) => i,
1014 };
1015 for range in &ranges[start_ix..] {
1016 if range.start.cmp(&transform_end, &self.buffer).is_ge() {
1017 break;
1018 }
1019
1020 highlight_endpoints.push(HighlightEndpoint {
1021 offset: self
1022 .to_inlay_offset(range.start.to_offset(&self.buffer)),
1023 is_start: true,
1024 tag: *tag,
1025 style,
1026 });
1027 highlight_endpoints.push(HighlightEndpoint {
1028 offset: self.to_inlay_offset(range.end.to_offset(&self.buffer)),
1029 is_start: false,
1030 tag: *tag,
1031 style,
1032 });
1033 }
1034 }
1035 }
1036
1037 cursor.next(&());
1038 }
1039 highlight_endpoints.sort();
1040 cursor.seek(&range.start, Bias::Right, &());
1041 }
1042 }
1043
1044 let buffer_range = self.to_buffer_offset(range.start)..self.to_buffer_offset(range.end);
1045 let buffer_chunks = self.buffer.chunks(buffer_range, language_aware);
1046
1047 InlayChunks {
1048 transforms: cursor,
1049 buffer_chunks,
1050 inlay_chunks: None,
1051 buffer_chunk: None,
1052 output_offset: range.start,
1053 max_output_offset: range.end,
1054 hint_highlight_style: hint_highlights,
1055 suggestion_highlight_style: suggestion_highlights,
1056 highlight_endpoints: highlight_endpoints.into_iter().peekable(),
1057 active_highlights: Default::default(),
1058 snapshot: self,
1059 }
1060 }
1061
1062 #[cfg(test)]
1063 pub fn text(&self) -> String {
1064 self.chunks(Default::default()..self.len(), false, None, None, None)
1065 .map(|chunk| chunk.text)
1066 .collect()
1067 }
1068
1069 fn check_invariants(&self) {
1070 #[cfg(any(debug_assertions, feature = "test-support"))]
1071 {
1072 assert_eq!(self.transforms.summary().input, self.buffer.text_summary());
1073 let mut transforms = self.transforms.iter().peekable();
1074 while let Some(transform) = transforms.next() {
1075 let transform_is_isomorphic = matches!(transform, Transform::Isomorphic(_));
1076 if let Some(next_transform) = transforms.peek() {
1077 let next_transform_is_isomorphic =
1078 matches!(next_transform, Transform::Isomorphic(_));
1079 assert!(
1080 !transform_is_isomorphic || !next_transform_is_isomorphic,
1081 "two adjacent isomorphic transforms"
1082 );
1083 }
1084 }
1085 }
1086 }
1087}
1088
1089fn push_isomorphic(sum_tree: &mut SumTree<Transform>, summary: TextSummary) {
1090 if summary.len == 0 {
1091 return;
1092 }
1093
1094 let mut summary = Some(summary);
1095 sum_tree.update_last(
1096 |transform| {
1097 if let Transform::Isomorphic(transform) = transform {
1098 *transform += summary.take().unwrap();
1099 }
1100 },
1101 &(),
1102 );
1103
1104 if let Some(summary) = summary {
1105 sum_tree.push(Transform::Isomorphic(summary), &());
1106 }
1107}
1108
1109#[cfg(test)]
1110mod tests {
1111 use super::*;
1112 use crate::{InlayId, MultiBuffer};
1113 use gpui::AppContext;
1114 use project::{InlayHint, InlayHintLabel};
1115 use rand::prelude::*;
1116 use settings::SettingsStore;
1117 use std::{cmp::Reverse, env, sync::Arc};
1118 use sum_tree::TreeMap;
1119 use text::Patch;
1120 use util::post_inc;
1121
1122 #[test]
1123 fn test_inlay_properties_label_padding() {
1124 assert_eq!(
1125 Inlay::hint(
1126 0,
1127 Anchor::min(),
1128 &InlayHint {
1129 label: InlayHintLabel::String("a".to_string()),
1130 buffer_id: 0,
1131 position: text::Anchor::default(),
1132 padding_left: false,
1133 padding_right: false,
1134 tooltip: None,
1135 kind: None,
1136 },
1137 )
1138 .text
1139 .to_string(),
1140 "a",
1141 "Should not pad label if not requested"
1142 );
1143
1144 assert_eq!(
1145 Inlay::hint(
1146 0,
1147 Anchor::min(),
1148 &InlayHint {
1149 label: InlayHintLabel::String("a".to_string()),
1150 buffer_id: 0,
1151 position: text::Anchor::default(),
1152 padding_left: true,
1153 padding_right: true,
1154 tooltip: None,
1155 kind: None,
1156 },
1157 )
1158 .text
1159 .to_string(),
1160 " a ",
1161 "Should pad label for every side requested"
1162 );
1163
1164 assert_eq!(
1165 Inlay::hint(
1166 0,
1167 Anchor::min(),
1168 &InlayHint {
1169 label: InlayHintLabel::String(" a ".to_string()),
1170 buffer_id: 0,
1171 position: text::Anchor::default(),
1172 padding_left: false,
1173 padding_right: false,
1174 tooltip: None,
1175 kind: None,
1176 },
1177 )
1178 .text
1179 .to_string(),
1180 " a ",
1181 "Should not change already padded label"
1182 );
1183
1184 assert_eq!(
1185 Inlay::hint(
1186 0,
1187 Anchor::min(),
1188 &InlayHint {
1189 label: InlayHintLabel::String(" a ".to_string()),
1190 buffer_id: 0,
1191 position: text::Anchor::default(),
1192 padding_left: true,
1193 padding_right: true,
1194 tooltip: None,
1195 kind: None,
1196 },
1197 )
1198 .text
1199 .to_string(),
1200 " a ",
1201 "Should not change already padded label"
1202 );
1203 }
1204
1205 #[gpui::test]
1206 fn test_basic_inlays(cx: &mut AppContext) {
1207 let buffer = MultiBuffer::build_simple("abcdefghi", cx);
1208 let buffer_edits = buffer.update(cx, |buffer, _| buffer.subscribe());
1209 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer.read(cx).snapshot(cx));
1210 assert_eq!(inlay_snapshot.text(), "abcdefghi");
1211 let mut next_inlay_id = 0;
1212
1213 let (inlay_snapshot, _) = inlay_map.splice(
1214 Vec::new(),
1215 vec![Inlay {
1216 id: InlayId::Hint(post_inc(&mut next_inlay_id)),
1217 position: buffer.read(cx).snapshot(cx).anchor_after(3),
1218 text: "|123|".into(),
1219 }],
1220 );
1221 assert_eq!(inlay_snapshot.text(), "abc|123|defghi");
1222 assert_eq!(
1223 inlay_snapshot.to_inlay_point(Point::new(0, 0)),
1224 InlayPoint::new(0, 0)
1225 );
1226 assert_eq!(
1227 inlay_snapshot.to_inlay_point(Point::new(0, 1)),
1228 InlayPoint::new(0, 1)
1229 );
1230 assert_eq!(
1231 inlay_snapshot.to_inlay_point(Point::new(0, 2)),
1232 InlayPoint::new(0, 2)
1233 );
1234 assert_eq!(
1235 inlay_snapshot.to_inlay_point(Point::new(0, 3)),
1236 InlayPoint::new(0, 3)
1237 );
1238 assert_eq!(
1239 inlay_snapshot.to_inlay_point(Point::new(0, 4)),
1240 InlayPoint::new(0, 9)
1241 );
1242 assert_eq!(
1243 inlay_snapshot.to_inlay_point(Point::new(0, 5)),
1244 InlayPoint::new(0, 10)
1245 );
1246 assert_eq!(
1247 inlay_snapshot.clip_point(InlayPoint::new(0, 0), Bias::Left),
1248 InlayPoint::new(0, 0)
1249 );
1250 assert_eq!(
1251 inlay_snapshot.clip_point(InlayPoint::new(0, 0), Bias::Right),
1252 InlayPoint::new(0, 0)
1253 );
1254 assert_eq!(
1255 inlay_snapshot.clip_point(InlayPoint::new(0, 3), Bias::Left),
1256 InlayPoint::new(0, 3)
1257 );
1258 assert_eq!(
1259 inlay_snapshot.clip_point(InlayPoint::new(0, 3), Bias::Right),
1260 InlayPoint::new(0, 3)
1261 );
1262 assert_eq!(
1263 inlay_snapshot.clip_point(InlayPoint::new(0, 4), Bias::Left),
1264 InlayPoint::new(0, 3)
1265 );
1266 assert_eq!(
1267 inlay_snapshot.clip_point(InlayPoint::new(0, 4), Bias::Right),
1268 InlayPoint::new(0, 9)
1269 );
1270
1271 // Edits before or after the inlay should not affect it.
1272 buffer.update(cx, |buffer, cx| {
1273 buffer.edit([(2..3, "x"), (3..3, "y"), (4..4, "z")], None, cx)
1274 });
1275 let (inlay_snapshot, _) = inlay_map.sync(
1276 buffer.read(cx).snapshot(cx),
1277 buffer_edits.consume().into_inner(),
1278 );
1279 assert_eq!(inlay_snapshot.text(), "abxy|123|dzefghi");
1280
1281 // An edit surrounding the inlay should invalidate it.
1282 buffer.update(cx, |buffer, cx| buffer.edit([(4..5, "D")], None, cx));
1283 let (inlay_snapshot, _) = inlay_map.sync(
1284 buffer.read(cx).snapshot(cx),
1285 buffer_edits.consume().into_inner(),
1286 );
1287 assert_eq!(inlay_snapshot.text(), "abxyDzefghi");
1288
1289 let (inlay_snapshot, _) = inlay_map.splice(
1290 Vec::new(),
1291 vec![
1292 Inlay {
1293 id: InlayId::Hint(post_inc(&mut next_inlay_id)),
1294 position: buffer.read(cx).snapshot(cx).anchor_before(3),
1295 text: "|123|".into(),
1296 },
1297 Inlay {
1298 id: InlayId::Suggestion(post_inc(&mut next_inlay_id)),
1299 position: buffer.read(cx).snapshot(cx).anchor_after(3),
1300 text: "|456|".into(),
1301 },
1302 ],
1303 );
1304 assert_eq!(inlay_snapshot.text(), "abx|123||456|yDzefghi");
1305
1306 // Edits ending where the inlay starts should not move it if it has a left bias.
1307 buffer.update(cx, |buffer, cx| buffer.edit([(3..3, "JKL")], None, cx));
1308 let (inlay_snapshot, _) = inlay_map.sync(
1309 buffer.read(cx).snapshot(cx),
1310 buffer_edits.consume().into_inner(),
1311 );
1312 assert_eq!(inlay_snapshot.text(), "abx|123|JKL|456|yDzefghi");
1313
1314 assert_eq!(
1315 inlay_snapshot.clip_point(InlayPoint::new(0, 0), Bias::Left),
1316 InlayPoint::new(0, 0)
1317 );
1318 assert_eq!(
1319 inlay_snapshot.clip_point(InlayPoint::new(0, 0), Bias::Right),
1320 InlayPoint::new(0, 0)
1321 );
1322
1323 assert_eq!(
1324 inlay_snapshot.clip_point(InlayPoint::new(0, 1), Bias::Left),
1325 InlayPoint::new(0, 1)
1326 );
1327 assert_eq!(
1328 inlay_snapshot.clip_point(InlayPoint::new(0, 1), Bias::Right),
1329 InlayPoint::new(0, 1)
1330 );
1331
1332 assert_eq!(
1333 inlay_snapshot.clip_point(InlayPoint::new(0, 2), Bias::Left),
1334 InlayPoint::new(0, 2)
1335 );
1336 assert_eq!(
1337 inlay_snapshot.clip_point(InlayPoint::new(0, 2), Bias::Right),
1338 InlayPoint::new(0, 2)
1339 );
1340
1341 assert_eq!(
1342 inlay_snapshot.clip_point(InlayPoint::new(0, 3), Bias::Left),
1343 InlayPoint::new(0, 2)
1344 );
1345 assert_eq!(
1346 inlay_snapshot.clip_point(InlayPoint::new(0, 3), Bias::Right),
1347 InlayPoint::new(0, 8)
1348 );
1349
1350 assert_eq!(
1351 inlay_snapshot.clip_point(InlayPoint::new(0, 4), Bias::Left),
1352 InlayPoint::new(0, 2)
1353 );
1354 assert_eq!(
1355 inlay_snapshot.clip_point(InlayPoint::new(0, 4), Bias::Right),
1356 InlayPoint::new(0, 8)
1357 );
1358
1359 assert_eq!(
1360 inlay_snapshot.clip_point(InlayPoint::new(0, 5), Bias::Left),
1361 InlayPoint::new(0, 2)
1362 );
1363 assert_eq!(
1364 inlay_snapshot.clip_point(InlayPoint::new(0, 5), Bias::Right),
1365 InlayPoint::new(0, 8)
1366 );
1367
1368 assert_eq!(
1369 inlay_snapshot.clip_point(InlayPoint::new(0, 6), Bias::Left),
1370 InlayPoint::new(0, 2)
1371 );
1372 assert_eq!(
1373 inlay_snapshot.clip_point(InlayPoint::new(0, 6), Bias::Right),
1374 InlayPoint::new(0, 8)
1375 );
1376
1377 assert_eq!(
1378 inlay_snapshot.clip_point(InlayPoint::new(0, 7), Bias::Left),
1379 InlayPoint::new(0, 2)
1380 );
1381 assert_eq!(
1382 inlay_snapshot.clip_point(InlayPoint::new(0, 7), Bias::Right),
1383 InlayPoint::new(0, 8)
1384 );
1385
1386 assert_eq!(
1387 inlay_snapshot.clip_point(InlayPoint::new(0, 8), Bias::Left),
1388 InlayPoint::new(0, 8)
1389 );
1390 assert_eq!(
1391 inlay_snapshot.clip_point(InlayPoint::new(0, 8), Bias::Right),
1392 InlayPoint::new(0, 8)
1393 );
1394
1395 assert_eq!(
1396 inlay_snapshot.clip_point(InlayPoint::new(0, 9), Bias::Left),
1397 InlayPoint::new(0, 9)
1398 );
1399 assert_eq!(
1400 inlay_snapshot.clip_point(InlayPoint::new(0, 9), Bias::Right),
1401 InlayPoint::new(0, 9)
1402 );
1403
1404 assert_eq!(
1405 inlay_snapshot.clip_point(InlayPoint::new(0, 10), Bias::Left),
1406 InlayPoint::new(0, 10)
1407 );
1408 assert_eq!(
1409 inlay_snapshot.clip_point(InlayPoint::new(0, 10), Bias::Right),
1410 InlayPoint::new(0, 10)
1411 );
1412
1413 assert_eq!(
1414 inlay_snapshot.clip_point(InlayPoint::new(0, 11), Bias::Left),
1415 InlayPoint::new(0, 11)
1416 );
1417 assert_eq!(
1418 inlay_snapshot.clip_point(InlayPoint::new(0, 11), Bias::Right),
1419 InlayPoint::new(0, 11)
1420 );
1421
1422 assert_eq!(
1423 inlay_snapshot.clip_point(InlayPoint::new(0, 12), Bias::Left),
1424 InlayPoint::new(0, 11)
1425 );
1426 assert_eq!(
1427 inlay_snapshot.clip_point(InlayPoint::new(0, 12), Bias::Right),
1428 InlayPoint::new(0, 17)
1429 );
1430
1431 assert_eq!(
1432 inlay_snapshot.clip_point(InlayPoint::new(0, 13), Bias::Left),
1433 InlayPoint::new(0, 11)
1434 );
1435 assert_eq!(
1436 inlay_snapshot.clip_point(InlayPoint::new(0, 13), Bias::Right),
1437 InlayPoint::new(0, 17)
1438 );
1439
1440 assert_eq!(
1441 inlay_snapshot.clip_point(InlayPoint::new(0, 14), Bias::Left),
1442 InlayPoint::new(0, 11)
1443 );
1444 assert_eq!(
1445 inlay_snapshot.clip_point(InlayPoint::new(0, 14), Bias::Right),
1446 InlayPoint::new(0, 17)
1447 );
1448
1449 assert_eq!(
1450 inlay_snapshot.clip_point(InlayPoint::new(0, 15), Bias::Left),
1451 InlayPoint::new(0, 11)
1452 );
1453 assert_eq!(
1454 inlay_snapshot.clip_point(InlayPoint::new(0, 15), Bias::Right),
1455 InlayPoint::new(0, 17)
1456 );
1457
1458 assert_eq!(
1459 inlay_snapshot.clip_point(InlayPoint::new(0, 16), Bias::Left),
1460 InlayPoint::new(0, 11)
1461 );
1462 assert_eq!(
1463 inlay_snapshot.clip_point(InlayPoint::new(0, 16), Bias::Right),
1464 InlayPoint::new(0, 17)
1465 );
1466
1467 assert_eq!(
1468 inlay_snapshot.clip_point(InlayPoint::new(0, 17), Bias::Left),
1469 InlayPoint::new(0, 17)
1470 );
1471 assert_eq!(
1472 inlay_snapshot.clip_point(InlayPoint::new(0, 17), Bias::Right),
1473 InlayPoint::new(0, 17)
1474 );
1475
1476 assert_eq!(
1477 inlay_snapshot.clip_point(InlayPoint::new(0, 18), Bias::Left),
1478 InlayPoint::new(0, 18)
1479 );
1480 assert_eq!(
1481 inlay_snapshot.clip_point(InlayPoint::new(0, 18), Bias::Right),
1482 InlayPoint::new(0, 18)
1483 );
1484
1485 // The inlays can be manually removed.
1486 let (inlay_snapshot, _) = inlay_map.splice(
1487 inlay_map.inlays.iter().map(|inlay| inlay.id).collect(),
1488 Vec::new(),
1489 );
1490 assert_eq!(inlay_snapshot.text(), "abxJKLyDzefghi");
1491 }
1492
1493 #[gpui::test]
1494 fn test_inlay_buffer_rows(cx: &mut AppContext) {
1495 let buffer = MultiBuffer::build_simple("abc\ndef\nghi", cx);
1496 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer.read(cx).snapshot(cx));
1497 assert_eq!(inlay_snapshot.text(), "abc\ndef\nghi");
1498 let mut next_inlay_id = 0;
1499
1500 let (inlay_snapshot, _) = inlay_map.splice(
1501 Vec::new(),
1502 vec![
1503 Inlay {
1504 id: InlayId::Hint(post_inc(&mut next_inlay_id)),
1505 position: buffer.read(cx).snapshot(cx).anchor_before(0),
1506 text: "|123|\n".into(),
1507 },
1508 Inlay {
1509 id: InlayId::Hint(post_inc(&mut next_inlay_id)),
1510 position: buffer.read(cx).snapshot(cx).anchor_before(4),
1511 text: "|456|".into(),
1512 },
1513 Inlay {
1514 id: InlayId::Suggestion(post_inc(&mut next_inlay_id)),
1515 position: buffer.read(cx).snapshot(cx).anchor_before(7),
1516 text: "\n|567|\n".into(),
1517 },
1518 ],
1519 );
1520 assert_eq!(inlay_snapshot.text(), "|123|\nabc\n|456|def\n|567|\n\nghi");
1521 assert_eq!(
1522 inlay_snapshot.buffer_rows(0).collect::<Vec<_>>(),
1523 vec![Some(0), None, Some(1), None, None, Some(2)]
1524 );
1525 }
1526
1527 #[gpui::test(iterations = 100)]
1528 fn test_random_inlays(cx: &mut AppContext, mut rng: StdRng) {
1529 init_test(cx);
1530
1531 let operations = env::var("OPERATIONS")
1532 .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
1533 .unwrap_or(10);
1534
1535 let len = rng.gen_range(0..30);
1536 let buffer = if rng.gen() {
1537 let text = util::RandomCharIter::new(&mut rng)
1538 .take(len)
1539 .collect::<String>();
1540 MultiBuffer::build_simple(&text, cx)
1541 } else {
1542 MultiBuffer::build_random(&mut rng, cx)
1543 };
1544 let mut buffer_snapshot = buffer.read(cx).snapshot(cx);
1545 let mut next_inlay_id = 0;
1546 log::info!("buffer text: {:?}", buffer_snapshot.text());
1547
1548 let mut highlights = TreeMap::default();
1549 let highlight_count = rng.gen_range(0_usize..10);
1550 let mut highlight_ranges = (0..highlight_count)
1551 .map(|_| buffer_snapshot.random_byte_range(0, &mut rng))
1552 .collect::<Vec<_>>();
1553 highlight_ranges.sort_by_key(|range| (range.start, Reverse(range.end)));
1554 log::info!("highlighting ranges {:?}", highlight_ranges);
1555 let highlight_ranges = highlight_ranges
1556 .into_iter()
1557 .map(|range| {
1558 buffer_snapshot.anchor_before(range.start)..buffer_snapshot.anchor_after(range.end)
1559 })
1560 .collect::<Vec<_>>();
1561
1562 highlights.insert(
1563 Some(TypeId::of::<()>()),
1564 Arc::new((HighlightStyle::default(), highlight_ranges)),
1565 );
1566
1567 let (mut inlay_map, mut inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1568 for _ in 0..operations {
1569 let mut inlay_edits = Patch::default();
1570
1571 let mut prev_inlay_text = inlay_snapshot.text();
1572 let mut buffer_edits = Vec::new();
1573 match rng.gen_range(0..=100) {
1574 0..=50 => {
1575 let (snapshot, edits) = inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
1576 log::info!("mutated text: {:?}", snapshot.text());
1577 inlay_edits = Patch::new(edits);
1578 }
1579 _ => buffer.update(cx, |buffer, cx| {
1580 let subscription = buffer.subscribe();
1581 let edit_count = rng.gen_range(1..=5);
1582 buffer.randomly_mutate(&mut rng, edit_count, cx);
1583 buffer_snapshot = buffer.snapshot(cx);
1584 let edits = subscription.consume().into_inner();
1585 log::info!("editing {:?}", edits);
1586 buffer_edits.extend(edits);
1587 }),
1588 };
1589
1590 let (new_inlay_snapshot, new_inlay_edits) =
1591 inlay_map.sync(buffer_snapshot.clone(), buffer_edits);
1592 inlay_snapshot = new_inlay_snapshot;
1593 inlay_edits = inlay_edits.compose(new_inlay_edits);
1594
1595 log::info!("buffer text: {:?}", buffer_snapshot.text());
1596 log::info!("inlay text: {:?}", inlay_snapshot.text());
1597
1598 let inlays = inlay_map
1599 .inlays
1600 .iter()
1601 .filter(|inlay| inlay.position.is_valid(&buffer_snapshot))
1602 .map(|inlay| {
1603 let offset = inlay.position.to_offset(&buffer_snapshot);
1604 (offset, inlay.clone())
1605 })
1606 .collect::<Vec<_>>();
1607 let mut expected_text = Rope::from(buffer_snapshot.text());
1608 for (offset, inlay) in inlays.into_iter().rev() {
1609 expected_text.replace(offset..offset, &inlay.text.to_string());
1610 }
1611 assert_eq!(inlay_snapshot.text(), expected_text.to_string());
1612
1613 let expected_buffer_rows = inlay_snapshot.buffer_rows(0).collect::<Vec<_>>();
1614 assert_eq!(
1615 expected_buffer_rows.len() as u32,
1616 expected_text.max_point().row + 1
1617 );
1618 for row_start in 0..expected_buffer_rows.len() {
1619 assert_eq!(
1620 inlay_snapshot
1621 .buffer_rows(row_start as u32)
1622 .collect::<Vec<_>>(),
1623 &expected_buffer_rows[row_start..],
1624 "incorrect buffer rows starting at {}",
1625 row_start
1626 );
1627 }
1628
1629 for _ in 0..5 {
1630 let mut end = rng.gen_range(0..=inlay_snapshot.len().0);
1631 end = expected_text.clip_offset(end, Bias::Right);
1632 let mut start = rng.gen_range(0..=end);
1633 start = expected_text.clip_offset(start, Bias::Right);
1634
1635 let actual_text = inlay_snapshot
1636 .chunks(
1637 InlayOffset(start)..InlayOffset(end),
1638 false,
1639 Some(&highlights),
1640 None,
1641 None,
1642 )
1643 .map(|chunk| chunk.text)
1644 .collect::<String>();
1645 assert_eq!(
1646 actual_text,
1647 expected_text.slice(start..end).to_string(),
1648 "incorrect text in range {:?}",
1649 start..end
1650 );
1651
1652 assert_eq!(
1653 inlay_snapshot.text_summary_for_range(InlayOffset(start)..InlayOffset(end)),
1654 expected_text.slice(start..end).summary()
1655 );
1656 }
1657
1658 for edit in inlay_edits {
1659 prev_inlay_text.replace_range(
1660 edit.new.start.0..edit.new.start.0 + edit.old_len().0,
1661 &inlay_snapshot.text()[edit.new.start.0..edit.new.end.0],
1662 );
1663 }
1664 assert_eq!(prev_inlay_text, inlay_snapshot.text());
1665
1666 assert_eq!(expected_text.max_point(), inlay_snapshot.max_point().0);
1667 assert_eq!(expected_text.len(), inlay_snapshot.len().0);
1668
1669 let mut buffer_point = Point::default();
1670 let mut inlay_point = inlay_snapshot.to_inlay_point(buffer_point);
1671 let mut buffer_chars = buffer_snapshot.chars_at(0);
1672 loop {
1673 // Ensure conversion from buffer coordinates to inlay coordinates
1674 // is consistent.
1675 let buffer_offset = buffer_snapshot.point_to_offset(buffer_point);
1676 assert_eq!(
1677 inlay_snapshot.to_point(inlay_snapshot.to_inlay_offset(buffer_offset)),
1678 inlay_point
1679 );
1680
1681 // No matter which bias we clip an inlay point with, it doesn't move
1682 // because it was constructed from a buffer point.
1683 assert_eq!(
1684 inlay_snapshot.clip_point(inlay_point, Bias::Left),
1685 inlay_point,
1686 "invalid inlay point for buffer point {:?} when clipped left",
1687 buffer_point
1688 );
1689 assert_eq!(
1690 inlay_snapshot.clip_point(inlay_point, Bias::Right),
1691 inlay_point,
1692 "invalid inlay point for buffer point {:?} when clipped right",
1693 buffer_point
1694 );
1695
1696 if let Some(ch) = buffer_chars.next() {
1697 if ch == '\n' {
1698 buffer_point += Point::new(1, 0);
1699 } else {
1700 buffer_point += Point::new(0, ch.len_utf8() as u32);
1701 }
1702
1703 // Ensure that moving forward in the buffer always moves the inlay point forward as well.
1704 let new_inlay_point = inlay_snapshot.to_inlay_point(buffer_point);
1705 assert!(new_inlay_point > inlay_point);
1706 inlay_point = new_inlay_point;
1707 } else {
1708 break;
1709 }
1710 }
1711
1712 let mut inlay_point = InlayPoint::default();
1713 let mut inlay_offset = InlayOffset::default();
1714 for ch in expected_text.chars() {
1715 assert_eq!(
1716 inlay_snapshot.to_offset(inlay_point),
1717 inlay_offset,
1718 "invalid to_offset({:?})",
1719 inlay_point
1720 );
1721 assert_eq!(
1722 inlay_snapshot.to_point(inlay_offset),
1723 inlay_point,
1724 "invalid to_point({:?})",
1725 inlay_offset
1726 );
1727
1728 let mut bytes = [0; 4];
1729 for byte in ch.encode_utf8(&mut bytes).as_bytes() {
1730 inlay_offset.0 += 1;
1731 if *byte == b'\n' {
1732 inlay_point.0 += Point::new(1, 0);
1733 } else {
1734 inlay_point.0 += Point::new(0, 1);
1735 }
1736
1737 let clipped_left_point = inlay_snapshot.clip_point(inlay_point, Bias::Left);
1738 let clipped_right_point = inlay_snapshot.clip_point(inlay_point, Bias::Right);
1739 assert!(
1740 clipped_left_point <= clipped_right_point,
1741 "inlay point {:?} when clipped left is greater than when clipped right ({:?} > {:?})",
1742 inlay_point,
1743 clipped_left_point,
1744 clipped_right_point
1745 );
1746
1747 // Ensure the clipped points are at valid text locations.
1748 assert_eq!(
1749 clipped_left_point.0,
1750 expected_text.clip_point(clipped_left_point.0, Bias::Left)
1751 );
1752 assert_eq!(
1753 clipped_right_point.0,
1754 expected_text.clip_point(clipped_right_point.0, Bias::Right)
1755 );
1756
1757 // Ensure the clipped points never overshoot the end of the map.
1758 assert!(clipped_left_point <= inlay_snapshot.max_point());
1759 assert!(clipped_right_point <= inlay_snapshot.max_point());
1760
1761 // Ensure the clipped points are at valid buffer locations.
1762 assert_eq!(
1763 inlay_snapshot
1764 .to_inlay_point(inlay_snapshot.to_buffer_point(clipped_left_point)),
1765 clipped_left_point,
1766 "to_buffer_point({:?}) = {:?}",
1767 clipped_left_point,
1768 inlay_snapshot.to_buffer_point(clipped_left_point),
1769 );
1770 assert_eq!(
1771 inlay_snapshot
1772 .to_inlay_point(inlay_snapshot.to_buffer_point(clipped_right_point)),
1773 clipped_right_point,
1774 "to_buffer_point({:?}) = {:?}",
1775 clipped_right_point,
1776 inlay_snapshot.to_buffer_point(clipped_right_point),
1777 );
1778 }
1779 }
1780 }
1781 }
1782
1783 fn init_test(cx: &mut AppContext) {
1784 cx.set_global(SettingsStore::test(cx));
1785 theme::init((), cx);
1786 }
1787}
crates/editor/src/display_map/suggestion_map.rs+0−871
@@ -1,871 +0,0 @@
1use super::{
2 fold_map::{FoldBufferRows, FoldChunks, FoldEdit, FoldOffset, FoldPoint, FoldSnapshot},
3 TextHighlights,
4};
5use crate::{MultiBufferSnapshot, ToPoint};
6use gpui::fonts::HighlightStyle;
7use language::{Bias, Chunk, Edit, Patch, Point, Rope, TextSummary};
8use parking_lot::Mutex;
9use std::{
10 cmp,
11 ops::{Add, AddAssign, Range, Sub},
12};
13use util::post_inc;
14
15pub type SuggestionEdit = Edit<SuggestionOffset>;
16
17#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
18pub struct SuggestionOffset(pub usize);
19
20impl Add for SuggestionOffset {
21 type Output = Self;
22
23 fn add(self, rhs: Self) -> Self::Output {
24 Self(self.0 + rhs.0)
25 }
26}
27
28impl Sub for SuggestionOffset {
29 type Output = Self;
30
31 fn sub(self, rhs: Self) -> Self::Output {
32 Self(self.0 - rhs.0)
33 }
34}
35
36impl AddAssign for SuggestionOffset {
37 fn add_assign(&mut self, rhs: Self) {
38 self.0 += rhs.0;
39 }
40}
41
42#[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
43pub struct SuggestionPoint(pub Point);
44
45impl SuggestionPoint {
46 pub fn new(row: u32, column: u32) -> Self {
47 Self(Point::new(row, column))
48 }
49
50 pub fn row(self) -> u32 {
51 self.0.row
52 }
53
54 pub fn column(self) -> u32 {
55 self.0.column
56 }
57}
58
59#[derive(Clone, Debug)]
60pub struct Suggestion<T> {
61 pub position: T,
62 pub text: Rope,
63}
64
65pub struct SuggestionMap(Mutex<SuggestionSnapshot>);
66
67impl SuggestionMap {
68 pub fn new(fold_snapshot: FoldSnapshot) -> (Self, SuggestionSnapshot) {
69 let snapshot = SuggestionSnapshot {
70 fold_snapshot,
71 suggestion: None,
72 version: 0,
73 };
74 (Self(Mutex::new(snapshot.clone())), snapshot)
75 }
76
77 pub fn replace<T>(
78 &self,
79 new_suggestion: Option<Suggestion<T>>,
80 fold_snapshot: FoldSnapshot,
81 fold_edits: Vec<FoldEdit>,
82 ) -> (
83 SuggestionSnapshot,
84 Vec<SuggestionEdit>,
85 Option<Suggestion<FoldOffset>>,
86 )
87 where
88 T: ToPoint,
89 {
90 let new_suggestion = new_suggestion.map(|new_suggestion| {
91 let buffer_point = new_suggestion
92 .position
93 .to_point(fold_snapshot.buffer_snapshot());
94 let fold_point = fold_snapshot.to_fold_point(buffer_point, Bias::Left);
95 let fold_offset = fold_point.to_offset(&fold_snapshot);
96 Suggestion {
97 position: fold_offset,
98 text: new_suggestion.text,
99 }
100 });
101
102 let (_, edits) = self.sync(fold_snapshot, fold_edits);
103 let mut snapshot = self.0.lock();
104
105 let mut patch = Patch::new(edits);
106 let old_suggestion = snapshot.suggestion.take();
107 if let Some(suggestion) = &old_suggestion {
108 patch = patch.compose([SuggestionEdit {
109 old: SuggestionOffset(suggestion.position.0)
110 ..SuggestionOffset(suggestion.position.0 + suggestion.text.len()),
111 new: SuggestionOffset(suggestion.position.0)
112 ..SuggestionOffset(suggestion.position.0),
113 }]);
114 }
115
116 if let Some(suggestion) = new_suggestion.as_ref() {
117 patch = patch.compose([SuggestionEdit {
118 old: SuggestionOffset(suggestion.position.0)
119 ..SuggestionOffset(suggestion.position.0),
120 new: SuggestionOffset(suggestion.position.0)
121 ..SuggestionOffset(suggestion.position.0 + suggestion.text.len()),
122 }]);
123 }
124
125 snapshot.suggestion = new_suggestion;
126 snapshot.version += 1;
127 (snapshot.clone(), patch.into_inner(), old_suggestion)
128 }
129
130 pub fn sync(
131 &self,
132 fold_snapshot: FoldSnapshot,
133 fold_edits: Vec<FoldEdit>,
134 ) -> (SuggestionSnapshot, Vec<SuggestionEdit>) {
135 let mut snapshot = self.0.lock();
136
137 if snapshot.fold_snapshot.version != fold_snapshot.version {
138 snapshot.version += 1;
139 }
140
141 let mut suggestion_edits = Vec::new();
142
143 let mut suggestion_old_len = 0;
144 let mut suggestion_new_len = 0;
145 for fold_edit in fold_edits {
146 let start = fold_edit.new.start;
147 let end = FoldOffset(start.0 + fold_edit.old_len().0);
148 if let Some(suggestion) = snapshot.suggestion.as_mut() {
149 if end <= suggestion.position {
150 suggestion.position.0 += fold_edit.new_len().0;
151 suggestion.position.0 -= fold_edit.old_len().0;
152 } else if start > suggestion.position {
153 suggestion_old_len = suggestion.text.len();
154 suggestion_new_len = suggestion_old_len;
155 } else {
156 suggestion_old_len = suggestion.text.len();
157 snapshot.suggestion.take();
158 suggestion_edits.push(SuggestionEdit {
159 old: SuggestionOffset(fold_edit.old.start.0)
160 ..SuggestionOffset(fold_edit.old.end.0 + suggestion_old_len),
161 new: SuggestionOffset(fold_edit.new.start.0)
162 ..SuggestionOffset(fold_edit.new.end.0),
163 });
164 continue;
165 }
166 }
167
168 suggestion_edits.push(SuggestionEdit {
169 old: SuggestionOffset(fold_edit.old.start.0 + suggestion_old_len)
170 ..SuggestionOffset(fold_edit.old.end.0 + suggestion_old_len),
171 new: SuggestionOffset(fold_edit.new.start.0 + suggestion_new_len)
172 ..SuggestionOffset(fold_edit.new.end.0 + suggestion_new_len),
173 });
174 }
175 snapshot.fold_snapshot = fold_snapshot;
176
177 (snapshot.clone(), suggestion_edits)
178 }
179
180 pub fn has_suggestion(&self) -> bool {
181 let snapshot = self.0.lock();
182 snapshot.suggestion.is_some()
183 }
184}
185
186#[derive(Clone)]
187pub struct SuggestionSnapshot {
188 pub fold_snapshot: FoldSnapshot,
189 pub suggestion: Option<Suggestion<FoldOffset>>,
190 pub version: usize,
191}
192
193impl SuggestionSnapshot {
194 pub fn buffer_snapshot(&self) -> &MultiBufferSnapshot {
195 self.fold_snapshot.buffer_snapshot()
196 }
197
198 pub fn max_point(&self) -> SuggestionPoint {
199 if let Some(suggestion) = self.suggestion.as_ref() {
200 let suggestion_point = suggestion.position.to_point(&self.fold_snapshot);
201 let mut max_point = suggestion_point.0;
202 max_point += suggestion.text.max_point();
203 max_point += self.fold_snapshot.max_point().0 - suggestion_point.0;
204 SuggestionPoint(max_point)
205 } else {
206 SuggestionPoint(self.fold_snapshot.max_point().0)
207 }
208 }
209
210 pub fn len(&self) -> SuggestionOffset {
211 if let Some(suggestion) = self.suggestion.as_ref() {
212 let mut len = suggestion.position.0;
213 len += suggestion.text.len();
214 len += self.fold_snapshot.len().0 - suggestion.position.0;
215 SuggestionOffset(len)
216 } else {
217 SuggestionOffset(self.fold_snapshot.len().0)
218 }
219 }
220
221 pub fn line_len(&self, row: u32) -> u32 {
222 if let Some(suggestion) = &self.suggestion {
223 let suggestion_start = suggestion.position.to_point(&self.fold_snapshot).0;
224 let suggestion_end = suggestion_start + suggestion.text.max_point();
225
226 if row < suggestion_start.row {
227 self.fold_snapshot.line_len(row)
228 } else if row > suggestion_end.row {
229 self.fold_snapshot
230 .line_len(suggestion_start.row + (row - suggestion_end.row))
231 } else {
232 let mut result = suggestion.text.line_len(row - suggestion_start.row);
233 if row == suggestion_start.row {
234 result += suggestion_start.column;
235 }
236 if row == suggestion_end.row {
237 result +=
238 self.fold_snapshot.line_len(suggestion_start.row) - suggestion_start.column;
239 }
240 result
241 }
242 } else {
243 self.fold_snapshot.line_len(row)
244 }
245 }
246
247 pub fn clip_point(&self, point: SuggestionPoint, bias: Bias) -> SuggestionPoint {
248 if let Some(suggestion) = self.suggestion.as_ref() {
249 let suggestion_start = suggestion.position.to_point(&self.fold_snapshot).0;
250 let suggestion_end = suggestion_start + suggestion.text.max_point();
251 if point.0 <= suggestion_start {
252 SuggestionPoint(self.fold_snapshot.clip_point(FoldPoint(point.0), bias).0)
253 } else if point.0 > suggestion_end {
254 let fold_point = self.fold_snapshot.clip_point(
255 FoldPoint(suggestion_start + (point.0 - suggestion_end)),
256 bias,
257 );
258 let suggestion_point = suggestion_end + (fold_point.0 - suggestion_start);
259 if bias == Bias::Left && suggestion_point == suggestion_end {
260 SuggestionPoint(suggestion_start)
261 } else {
262 SuggestionPoint(suggestion_point)
263 }
264 } else if bias == Bias::Left || suggestion_start == self.fold_snapshot.max_point().0 {
265 SuggestionPoint(suggestion_start)
266 } else {
267 let fold_point = if self.fold_snapshot.line_len(suggestion_start.row)
268 > suggestion_start.column
269 {
270 FoldPoint(suggestion_start + Point::new(0, 1))
271 } else {
272 FoldPoint(suggestion_start + Point::new(1, 0))
273 };
274 let clipped_fold_point = self.fold_snapshot.clip_point(fold_point, bias);
275 SuggestionPoint(suggestion_end + (clipped_fold_point.0 - suggestion_start))
276 }
277 } else {
278 SuggestionPoint(self.fold_snapshot.clip_point(FoldPoint(point.0), bias).0)
279 }
280 }
281
282 pub fn to_offset(&self, point: SuggestionPoint) -> SuggestionOffset {
283 if let Some(suggestion) = self.suggestion.as_ref() {
284 let suggestion_start = suggestion.position.to_point(&self.fold_snapshot).0;
285 let suggestion_end = suggestion_start + suggestion.text.max_point();
286
287 if point.0 <= suggestion_start {
288 SuggestionOffset(FoldPoint(point.0).to_offset(&self.fold_snapshot).0)
289 } else if point.0 > suggestion_end {
290 let fold_offset = FoldPoint(suggestion_start + (point.0 - suggestion_end))
291 .to_offset(&self.fold_snapshot);
292 SuggestionOffset(fold_offset.0 + suggestion.text.len())
293 } else {
294 let offset_in_suggestion =
295 suggestion.text.point_to_offset(point.0 - suggestion_start);
296 SuggestionOffset(suggestion.position.0 + offset_in_suggestion)
297 }
298 } else {
299 SuggestionOffset(FoldPoint(point.0).to_offset(&self.fold_snapshot).0)
300 }
301 }
302
303 pub fn to_point(&self, offset: SuggestionOffset) -> SuggestionPoint {
304 if let Some(suggestion) = self.suggestion.as_ref() {
305 let suggestion_point_start = suggestion.position.to_point(&self.fold_snapshot).0;
306 if offset.0 <= suggestion.position.0 {
307 SuggestionPoint(FoldOffset(offset.0).to_point(&self.fold_snapshot).0)
308 } else if offset.0 > (suggestion.position.0 + suggestion.text.len()) {
309 let fold_point = FoldOffset(offset.0 - suggestion.text.len())
310 .to_point(&self.fold_snapshot)
311 .0;
312
313 SuggestionPoint(
314 suggestion_point_start
315 + suggestion.text.max_point()
316 + (fold_point - suggestion_point_start),
317 )
318 } else {
319 let point_in_suggestion = suggestion
320 .text
321 .offset_to_point(offset.0 - suggestion.position.0);
322 SuggestionPoint(suggestion_point_start + point_in_suggestion)
323 }
324 } else {
325 SuggestionPoint(FoldOffset(offset.0).to_point(&self.fold_snapshot).0)
326 }
327 }
328
329 pub fn to_fold_point(&self, point: SuggestionPoint) -> FoldPoint {
330 if let Some(suggestion) = self.suggestion.as_ref() {
331 let suggestion_start = suggestion.position.to_point(&self.fold_snapshot).0;
332 let suggestion_end = suggestion_start + suggestion.text.max_point();
333
334 if point.0 <= suggestion_start {
335 FoldPoint(point.0)
336 } else if point.0 > suggestion_end {
337 FoldPoint(suggestion_start + (point.0 - suggestion_end))
338 } else {
339 FoldPoint(suggestion_start)
340 }
341 } else {
342 FoldPoint(point.0)
343 }
344 }
345
346 pub fn to_suggestion_point(&self, point: FoldPoint) -> SuggestionPoint {
347 if let Some(suggestion) = self.suggestion.as_ref() {
348 let suggestion_start = suggestion.position.to_point(&self.fold_snapshot).0;
349
350 if point.0 <= suggestion_start {
351 SuggestionPoint(point.0)
352 } else {
353 let suggestion_end = suggestion_start + suggestion.text.max_point();
354 SuggestionPoint(suggestion_end + (point.0 - suggestion_start))
355 }
356 } else {
357 SuggestionPoint(point.0)
358 }
359 }
360
361 pub fn text_summary_for_range(&self, range: Range<SuggestionPoint>) -> TextSummary {
362 if let Some(suggestion) = self.suggestion.as_ref() {
363 let suggestion_start = suggestion.position.to_point(&self.fold_snapshot).0;
364 let suggestion_end = suggestion_start + suggestion.text.max_point();
365 let mut summary = TextSummary::default();
366
367 let prefix_range =
368 cmp::min(range.start.0, suggestion_start)..cmp::min(range.end.0, suggestion_start);
369 if prefix_range.start < prefix_range.end {
370 summary += self.fold_snapshot.text_summary_for_range(
371 FoldPoint(prefix_range.start)..FoldPoint(prefix_range.end),
372 );
373 }
374
375 let suggestion_range =
376 cmp::max(range.start.0, suggestion_start)..cmp::min(range.end.0, suggestion_end);
377 if suggestion_range.start < suggestion_range.end {
378 let point_range = suggestion_range.start - suggestion_start
379 ..suggestion_range.end - suggestion_start;
380 let offset_range = suggestion.text.point_to_offset(point_range.start)
381 ..suggestion.text.point_to_offset(point_range.end);
382 summary += suggestion
383 .text
384 .cursor(offset_range.start)
385 .summary::<TextSummary>(offset_range.end);
386 }
387
388 let suffix_range = cmp::max(range.start.0, suggestion_end)..range.end.0;
389 if suffix_range.start < suffix_range.end {
390 let start = suggestion_start + (suffix_range.start - suggestion_end);
391 let end = suggestion_start + (suffix_range.end - suggestion_end);
392 summary += self
393 .fold_snapshot
394 .text_summary_for_range(FoldPoint(start)..FoldPoint(end));
395 }
396
397 summary
398 } else {
399 self.fold_snapshot
400 .text_summary_for_range(FoldPoint(range.start.0)..FoldPoint(range.end.0))
401 }
402 }
403
404 pub fn chars_at(&self, start: SuggestionPoint) -> impl '_ + Iterator<Item = char> {
405 let start = self.to_offset(start);
406 self.chunks(start..self.len(), false, None, None)
407 .flat_map(|chunk| chunk.text.chars())
408 }
409
410 pub fn chunks<'a>(
411 &'a self,
412 range: Range<SuggestionOffset>,
413 language_aware: bool,
414 text_highlights: Option<&'a TextHighlights>,
415 suggestion_highlight: Option<HighlightStyle>,
416 ) -> SuggestionChunks<'a> {
417 if let Some(suggestion) = self.suggestion.as_ref() {
418 let suggestion_range =
419 suggestion.position.0..suggestion.position.0 + suggestion.text.len();
420
421 let prefix_chunks = if range.start.0 < suggestion_range.start {
422 Some(self.fold_snapshot.chunks(
423 FoldOffset(range.start.0)
424 ..cmp::min(FoldOffset(suggestion_range.start), FoldOffset(range.end.0)),
425 language_aware,
426 text_highlights,
427 ))
428 } else {
429 None
430 };
431
432 let clipped_suggestion_range = cmp::max(range.start.0, suggestion_range.start)
433 ..cmp::min(range.end.0, suggestion_range.end);
434 let suggestion_chunks = if clipped_suggestion_range.start < clipped_suggestion_range.end
435 {
436 let start = clipped_suggestion_range.start - suggestion_range.start;
437 let end = clipped_suggestion_range.end - suggestion_range.start;
438 Some(suggestion.text.chunks_in_range(start..end))
439 } else {
440 None
441 };
442
443 let suffix_chunks = if range.end.0 > suggestion_range.end {
444 let start = cmp::max(suggestion_range.end, range.start.0) - suggestion_range.len();
445 let end = range.end.0 - suggestion_range.len();
446 Some(self.fold_snapshot.chunks(
447 FoldOffset(start)..FoldOffset(end),
448 language_aware,
449 text_highlights,
450 ))
451 } else {
452 None
453 };
454
455 SuggestionChunks {
456 prefix_chunks,
457 suggestion_chunks,
458 suffix_chunks,
459 highlight_style: suggestion_highlight,
460 }
461 } else {
462 SuggestionChunks {
463 prefix_chunks: Some(self.fold_snapshot.chunks(
464 FoldOffset(range.start.0)..FoldOffset(range.end.0),
465 language_aware,
466 text_highlights,
467 )),
468 suggestion_chunks: None,
469 suffix_chunks: None,
470 highlight_style: None,
471 }
472 }
473 }
474
475 pub fn buffer_rows<'a>(&'a self, row: u32) -> SuggestionBufferRows<'a> {
476 let suggestion_range = if let Some(suggestion) = self.suggestion.as_ref() {
477 let start = suggestion.position.to_point(&self.fold_snapshot).0;
478 let end = start + suggestion.text.max_point();
479 start.row..end.row
480 } else {
481 u32::MAX..u32::MAX
482 };
483
484 let fold_buffer_rows = if row <= suggestion_range.start {
485 self.fold_snapshot.buffer_rows(row)
486 } else if row > suggestion_range.end {
487 self.fold_snapshot
488 .buffer_rows(row - (suggestion_range.end - suggestion_range.start))
489 } else {
490 let mut rows = self.fold_snapshot.buffer_rows(suggestion_range.start);
491 rows.next();
492 rows
493 };
494
495 SuggestionBufferRows {
496 current_row: row,
497 suggestion_row_start: suggestion_range.start,
498 suggestion_row_end: suggestion_range.end,
499 fold_buffer_rows,
500 }
501 }
502
503 #[cfg(test)]
504 pub fn text(&self) -> String {
505 self.chunks(Default::default()..self.len(), false, None, None)
506 .map(|chunk| chunk.text)
507 .collect()
508 }
509}
510
511pub struct SuggestionChunks<'a> {
512 prefix_chunks: Option<FoldChunks<'a>>,
513 suggestion_chunks: Option<text::Chunks<'a>>,
514 suffix_chunks: Option<FoldChunks<'a>>,
515 highlight_style: Option<HighlightStyle>,
516}
517
518impl<'a> Iterator for SuggestionChunks<'a> {
519 type Item = Chunk<'a>;
520
521 fn next(&mut self) -> Option<Self::Item> {
522 if let Some(chunks) = self.prefix_chunks.as_mut() {
523 if let Some(chunk) = chunks.next() {
524 return Some(chunk);
525 } else {
526 self.prefix_chunks = None;
527 }
528 }
529
530 if let Some(chunks) = self.suggestion_chunks.as_mut() {
531 if let Some(chunk) = chunks.next() {
532 return Some(Chunk {
533 text: chunk,
534 highlight_style: self.highlight_style,
535 ..Default::default()
536 });
537 } else {
538 self.suggestion_chunks = None;
539 }
540 }
541
542 if let Some(chunks) = self.suffix_chunks.as_mut() {
543 if let Some(chunk) = chunks.next() {
544 return Some(chunk);
545 } else {
546 self.suffix_chunks = None;
547 }
548 }
549
550 None
551 }
552}
553
554#[derive(Clone)]
555pub struct SuggestionBufferRows<'a> {
556 current_row: u32,
557 suggestion_row_start: u32,
558 suggestion_row_end: u32,
559 fold_buffer_rows: FoldBufferRows<'a>,
560}
561
562impl<'a> Iterator for SuggestionBufferRows<'a> {
563 type Item = Option<u32>;
564
565 fn next(&mut self) -> Option<Self::Item> {
566 let row = post_inc(&mut self.current_row);
567 if row <= self.suggestion_row_start || row > self.suggestion_row_end {
568 self.fold_buffer_rows.next()
569 } else {
570 Some(None)
571 }
572 }
573}
574
575#[cfg(test)]
576mod tests {
577 use super::*;
578 use crate::{display_map::fold_map::FoldMap, MultiBuffer};
579 use gpui::AppContext;
580 use rand::{prelude::StdRng, Rng};
581 use settings::SettingsStore;
582 use std::{
583 env,
584 ops::{Bound, RangeBounds},
585 };
586
587 #[gpui::test]
588 fn test_basic(cx: &mut AppContext) {
589 let buffer = MultiBuffer::build_simple("abcdefghi", cx);
590 let buffer_edits = buffer.update(cx, |buffer, _| buffer.subscribe());
591 let (mut fold_map, fold_snapshot) = FoldMap::new(buffer.read(cx).snapshot(cx));
592 let (suggestion_map, suggestion_snapshot) = SuggestionMap::new(fold_snapshot.clone());
593 assert_eq!(suggestion_snapshot.text(), "abcdefghi");
594
595 let (suggestion_snapshot, _, _) = suggestion_map.replace(
596 Some(Suggestion {
597 position: 3,
598 text: "123\n456".into(),
599 }),
600 fold_snapshot,
601 Default::default(),
602 );
603 assert_eq!(suggestion_snapshot.text(), "abc123\n456defghi");
604
605 buffer.update(cx, |buffer, cx| {
606 buffer.edit(
607 [(0..0, "ABC"), (3..3, "DEF"), (4..4, "GHI"), (9..9, "JKL")],
608 None,
609 cx,
610 )
611 });
612 let (fold_snapshot, fold_edits) = fold_map.read(
613 buffer.read(cx).snapshot(cx),
614 buffer_edits.consume().into_inner(),
615 );
616 let (suggestion_snapshot, _) = suggestion_map.sync(fold_snapshot.clone(), fold_edits);
617 assert_eq!(suggestion_snapshot.text(), "ABCabcDEF123\n456dGHIefghiJKL");
618
619 let (mut fold_map_writer, _, _) =
620 fold_map.write(buffer.read(cx).snapshot(cx), Default::default());
621 let (fold_snapshot, fold_edits) = fold_map_writer.fold([0..3]);
622 let (suggestion_snapshot, _) = suggestion_map.sync(fold_snapshot, fold_edits);
623 assert_eq!(suggestion_snapshot.text(), "⋯abcDEF123\n456dGHIefghiJKL");
624
625 let (mut fold_map_writer, _, _) =
626 fold_map.write(buffer.read(cx).snapshot(cx), Default::default());
627 let (fold_snapshot, fold_edits) = fold_map_writer.fold([6..10]);
628 let (suggestion_snapshot, _) = suggestion_map.sync(fold_snapshot, fold_edits);
629 assert_eq!(suggestion_snapshot.text(), "⋯abc⋯GHIefghiJKL");
630 }
631
632 #[gpui::test(iterations = 100)]
633 fn test_random_suggestions(cx: &mut AppContext, mut rng: StdRng) {
634 init_test(cx);
635
636 let operations = env::var("OPERATIONS")
637 .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
638 .unwrap_or(10);
639
640 let len = rng.gen_range(0..30);
641 let buffer = if rng.gen() {
642 let text = util::RandomCharIter::new(&mut rng)
643 .take(len)
644 .collect::<String>();
645 MultiBuffer::build_simple(&text, cx)
646 } else {
647 MultiBuffer::build_random(&mut rng, cx)
648 };
649 let mut buffer_snapshot = buffer.read(cx).snapshot(cx);
650 log::info!("buffer text: {:?}", buffer_snapshot.text());
651
652 let (mut fold_map, mut fold_snapshot) = FoldMap::new(buffer_snapshot.clone());
653 let (suggestion_map, mut suggestion_snapshot) = SuggestionMap::new(fold_snapshot.clone());
654
655 for _ in 0..operations {
656 let mut suggestion_edits = Patch::default();
657
658 let mut prev_suggestion_text = suggestion_snapshot.text();
659 let mut buffer_edits = Vec::new();
660 match rng.gen_range(0..=100) {
661 0..=29 => {
662 let (_, edits) = suggestion_map.randomly_mutate(&mut rng);
663 suggestion_edits = suggestion_edits.compose(edits);
664 }
665 30..=59 => {
666 for (new_fold_snapshot, fold_edits) in fold_map.randomly_mutate(&mut rng) {
667 fold_snapshot = new_fold_snapshot;
668 let (_, edits) = suggestion_map.sync(fold_snapshot.clone(), fold_edits);
669 suggestion_edits = suggestion_edits.compose(edits);
670 }
671 }
672 _ => buffer.update(cx, |buffer, cx| {
673 let subscription = buffer.subscribe();
674 let edit_count = rng.gen_range(1..=5);
675 buffer.randomly_mutate(&mut rng, edit_count, cx);
676 buffer_snapshot = buffer.snapshot(cx);
677 let edits = subscription.consume().into_inner();
678 log::info!("editing {:?}", edits);
679 buffer_edits.extend(edits);
680 }),
681 };
682
683 let (new_fold_snapshot, fold_edits) =
684 fold_map.read(buffer_snapshot.clone(), buffer_edits);
685 fold_snapshot = new_fold_snapshot;
686 let (new_suggestion_snapshot, edits) =
687 suggestion_map.sync(fold_snapshot.clone(), fold_edits);
688 suggestion_snapshot = new_suggestion_snapshot;
689 suggestion_edits = suggestion_edits.compose(edits);
690
691 log::info!("buffer text: {:?}", buffer_snapshot.text());
692 log::info!("folds text: {:?}", fold_snapshot.text());
693 log::info!("suggestions text: {:?}", suggestion_snapshot.text());
694
695 let mut expected_text = Rope::from(fold_snapshot.text().as_str());
696 let mut expected_buffer_rows = fold_snapshot.buffer_rows(0).collect::<Vec<_>>();
697 if let Some(suggestion) = suggestion_snapshot.suggestion.as_ref() {
698 expected_text.replace(
699 suggestion.position.0..suggestion.position.0,
700 &suggestion.text.to_string(),
701 );
702 let suggestion_start = suggestion.position.to_point(&fold_snapshot).0;
703 let suggestion_end = suggestion_start + suggestion.text.max_point();
704 expected_buffer_rows.splice(
705 (suggestion_start.row + 1) as usize..(suggestion_start.row + 1) as usize,
706 (0..suggestion_end.row - suggestion_start.row).map(|_| None),
707 );
708 }
709 assert_eq!(suggestion_snapshot.text(), expected_text.to_string());
710 for row_start in 0..expected_buffer_rows.len() {
711 assert_eq!(
712 suggestion_snapshot
713 .buffer_rows(row_start as u32)
714 .collect::<Vec<_>>(),
715 &expected_buffer_rows[row_start..],
716 "incorrect buffer rows starting at {}",
717 row_start
718 );
719 }
720
721 for _ in 0..5 {
722 let mut end = rng.gen_range(0..=suggestion_snapshot.len().0);
723 end = expected_text.clip_offset(end, Bias::Right);
724 let mut start = rng.gen_range(0..=end);
725 start = expected_text.clip_offset(start, Bias::Right);
726
727 let actual_text = suggestion_snapshot
728 .chunks(
729 SuggestionOffset(start)..SuggestionOffset(end),
730 false,
731 None,
732 None,
733 )
734 .map(|chunk| chunk.text)
735 .collect::<String>();
736 assert_eq!(
737 actual_text,
738 expected_text.slice(start..end).to_string(),
739 "incorrect text in range {:?}",
740 start..end
741 );
742
743 let start_point = SuggestionPoint(expected_text.offset_to_point(start));
744 let end_point = SuggestionPoint(expected_text.offset_to_point(end));
745 assert_eq!(
746 suggestion_snapshot.text_summary_for_range(start_point..end_point),
747 expected_text.slice(start..end).summary()
748 );
749 }
750
751 for edit in suggestion_edits.into_inner() {
752 prev_suggestion_text.replace_range(
753 edit.new.start.0..edit.new.start.0 + edit.old_len().0,
754 &suggestion_snapshot.text()[edit.new.start.0..edit.new.end.0],
755 );
756 }
757 assert_eq!(prev_suggestion_text, suggestion_snapshot.text());
758
759 assert_eq!(expected_text.max_point(), suggestion_snapshot.max_point().0);
760 assert_eq!(expected_text.len(), suggestion_snapshot.len().0);
761
762 let mut suggestion_point = SuggestionPoint::default();
763 let mut suggestion_offset = SuggestionOffset::default();
764 for ch in expected_text.chars() {
765 assert_eq!(
766 suggestion_snapshot.to_offset(suggestion_point),
767 suggestion_offset,
768 "invalid to_offset({:?})",
769 suggestion_point
770 );
771 assert_eq!(
772 suggestion_snapshot.to_point(suggestion_offset),
773 suggestion_point,
774 "invalid to_point({:?})",
775 suggestion_offset
776 );
777 assert_eq!(
778 suggestion_snapshot
779 .to_suggestion_point(suggestion_snapshot.to_fold_point(suggestion_point)),
780 suggestion_snapshot.clip_point(suggestion_point, Bias::Left),
781 );
782
783 let mut bytes = [0; 4];
784 for byte in ch.encode_utf8(&mut bytes).as_bytes() {
785 suggestion_offset.0 += 1;
786 if *byte == b'\n' {
787 suggestion_point.0 += Point::new(1, 0);
788 } else {
789 suggestion_point.0 += Point::new(0, 1);
790 }
791
792 let clipped_left_point =
793 suggestion_snapshot.clip_point(suggestion_point, Bias::Left);
794 let clipped_right_point =
795 suggestion_snapshot.clip_point(suggestion_point, Bias::Right);
796 assert!(
797 clipped_left_point <= clipped_right_point,
798 "clipped left point {:?} is greater than clipped right point {:?}",
799 clipped_left_point,
800 clipped_right_point
801 );
802 assert_eq!(
803 clipped_left_point.0,
804 expected_text.clip_point(clipped_left_point.0, Bias::Left)
805 );
806 assert_eq!(
807 clipped_right_point.0,
808 expected_text.clip_point(clipped_right_point.0, Bias::Right)
809 );
810 assert!(clipped_left_point <= suggestion_snapshot.max_point());
811 assert!(clipped_right_point <= suggestion_snapshot.max_point());
812
813 if let Some(suggestion) = suggestion_snapshot.suggestion.as_ref() {
814 let suggestion_start = suggestion.position.to_point(&fold_snapshot).0;
815 let suggestion_end = suggestion_start + suggestion.text.max_point();
816 let invalid_range = (
817 Bound::Excluded(suggestion_start),
818 Bound::Included(suggestion_end),
819 );
820 assert!(
821 !invalid_range.contains(&clipped_left_point.0),
822 "clipped left point {:?} is inside invalid suggestion range {:?}",
823 clipped_left_point,
824 invalid_range
825 );
826 assert!(
827 !invalid_range.contains(&clipped_right_point.0),
828 "clipped right point {:?} is inside invalid suggestion range {:?}",
829 clipped_right_point,
830 invalid_range
831 );
832 }
833 }
834 }
835 }
836 }
837
838 fn init_test(cx: &mut AppContext) {
839 cx.set_global(SettingsStore::test(cx));
840 theme::init((), cx);
841 }
842
843 impl SuggestionMap {
844 pub fn randomly_mutate(
845 &self,
846 rng: &mut impl Rng,
847 ) -> (SuggestionSnapshot, Vec<SuggestionEdit>) {
848 let fold_snapshot = self.0.lock().fold_snapshot.clone();
849 let new_suggestion = if rng.gen_bool(0.3) {
850 None
851 } else {
852 let index = rng.gen_range(0..=fold_snapshot.buffer_snapshot().len());
853 let len = rng.gen_range(0..30);
854 Some(Suggestion {
855 position: index,
856 text: util::RandomCharIter::new(rng)
857 .take(len)
858 .filter(|ch| *ch != '\r')
859 .collect::<String>()
860 .as_str()
861 .into(),
862 })
863 };
864
865 log::info!("replacing suggestion with {:?}", new_suggestion);
866 let (snapshot, edits, _) =
867 self.replace(new_suggestion, fold_snapshot, Default::default());
868 (snapshot, edits)
869 }
870 }
871}
crates/editor/src/display_map/tab_map.rs+105−119
@@ -1,80 +1,76 @@
1use super::{1use super::{
2 suggestion_map::{self, SuggestionChunks, SuggestionEdit, SuggestionPoint, SuggestionSnapshot},2 fold_map::{self, FoldChunks, FoldEdit, FoldPoint, FoldSnapshot},
3 TextHighlights,3 TextHighlights,
4};4};
5use crate::MultiBufferSnapshot;5use crate::MultiBufferSnapshot;
6use gpui::fonts::HighlightStyle;6use gpui::fonts::HighlightStyle;
7use language::{Chunk, Point};7use language::{Chunk, Point};
8use parking_lot::Mutex;
9use std::{cmp, mem, num::NonZeroU32, ops::Range};8use std::{cmp, mem, num::NonZeroU32, ops::Range};
10use sum_tree::Bias;9use sum_tree::Bias;
11 10
12const MAX_EXPANSION_COLUMN: u32 = 256;11const MAX_EXPANSION_COLUMN: u32 = 256;
13 12
14pub struct TabMap(Mutex<TabSnapshot>);13pub struct TabMap(TabSnapshot);
15 14
16impl TabMap {15impl TabMap {
17 pub fn new(input: SuggestionSnapshot, tab_size: NonZeroU32) -> (Self, TabSnapshot) {16 pub fn new(fold_snapshot: FoldSnapshot, tab_size: NonZeroU32) -> (Self, TabSnapshot) {
18 let snapshot = TabSnapshot {17 let snapshot = TabSnapshot {
19 suggestion_snapshot: input,18 fold_snapshot,
20 tab_size,19 tab_size,
21 max_expansion_column: MAX_EXPANSION_COLUMN,20 max_expansion_column: MAX_EXPANSION_COLUMN,
22 version: 0,21 version: 0,
23 };22 };
24 (Self(Mutex::new(snapshot.clone())), snapshot)23 (Self(snapshot.clone()), snapshot)
25 }24 }
26 25
27 #[cfg(test)]26 #[cfg(test)]
28 pub fn set_max_expansion_column(&self, column: u32) -> TabSnapshot {27 pub fn set_max_expansion_column(&mut self, column: u32) -> TabSnapshot {
29 self.0.lock().max_expansion_column = column;28 self.0.max_expansion_column = column;
30 self.0.lock().clone()29 self.0.clone()
31 }30 }
32 31
33 pub fn sync(32 pub fn sync(
34 &self,33 &mut self,
35 suggestion_snapshot: SuggestionSnapshot,34 fold_snapshot: FoldSnapshot,
36 mut suggestion_edits: Vec<SuggestionEdit>,35 mut fold_edits: Vec<FoldEdit>,
37 tab_size: NonZeroU32,36 tab_size: NonZeroU32,
38 ) -> (TabSnapshot, Vec<TabEdit>) {37 ) -> (TabSnapshot, Vec<TabEdit>) {
39 let mut old_snapshot = self.0.lock();38 let old_snapshot = &mut self.0;
40 let mut new_snapshot = TabSnapshot {39 let mut new_snapshot = TabSnapshot {
41 suggestion_snapshot,40 fold_snapshot,
42 tab_size,41 tab_size,
43 max_expansion_column: old_snapshot.max_expansion_column,42 max_expansion_column: old_snapshot.max_expansion_column,
44 version: old_snapshot.version,43 version: old_snapshot.version,
45 };44 };
46 45
47 if old_snapshot.suggestion_snapshot.version != new_snapshot.suggestion_snapshot.version {46 if old_snapshot.fold_snapshot.version != new_snapshot.fold_snapshot.version {
48 new_snapshot.version += 1;47 new_snapshot.version += 1;
49 }48 }
50 49
51 let mut tab_edits = Vec::with_capacity(suggestion_edits.len());50 let mut tab_edits = Vec::with_capacity(fold_edits.len());
52 51
53 if old_snapshot.tab_size == new_snapshot.tab_size {52 if old_snapshot.tab_size == new_snapshot.tab_size {
54 // Expand each edit to include the next tab on the same line as the edit,53 // Expand each edit to include the next tab on the same line as the edit,
55 // and any subsequent tabs on that line that moved across the tab expansion54 // and any subsequent tabs on that line that moved across the tab expansion
56 // boundary.55 // boundary.
57 for suggestion_edit in &mut suggestion_edits {56 for fold_edit in &mut fold_edits {
58 let old_end = old_snapshot57 let old_end = fold_edit.old.end.to_point(&old_snapshot.fold_snapshot);
59 .suggestion_snapshot58 let old_end_row_successor_offset = cmp::min(
60 .to_point(suggestion_edit.old.end);59 FoldPoint::new(old_end.row() + 1, 0),
61 let old_end_row_successor_offset =60 old_snapshot.fold_snapshot.max_point(),
62 old_snapshot.suggestion_snapshot.to_offset(cmp::min(61 )
63 SuggestionPoint::new(old_end.row() + 1, 0),62 .to_offset(&old_snapshot.fold_snapshot);
64 old_snapshot.suggestion_snapshot.max_point(),63 let new_end = fold_edit.new.end.to_point(&new_snapshot.fold_snapshot);
65 ));
66 let new_end = new_snapshot
67 .suggestion_snapshot
68 .to_point(suggestion_edit.new.end);
69 64
70 let mut offset_from_edit = 0;65 let mut offset_from_edit = 0;
71 let mut first_tab_offset = None;66 let mut first_tab_offset = None;
72 let mut last_tab_with_changed_expansion_offset = None;67 let mut last_tab_with_changed_expansion_offset = None;
73 'outer: for chunk in old_snapshot.suggestion_snapshot.chunks(68 'outer: for chunk in old_snapshot.fold_snapshot.chunks(
74 suggestion_edit.old.end..old_end_row_successor_offset,69 fold_edit.old.end..old_end_row_successor_offset,
75 false,70 false,
76 None,71 None,
77 None,72 None,
73 None,
78 ) {74 ) {
79 for (ix, _) in chunk.text.match_indices('\t') {75 for (ix, _) in chunk.text.match_indices('\t') {
80 let offset_from_edit = offset_from_edit + (ix as u32);76 let offset_from_edit = offset_from_edit + (ix as u32);
@@ -102,39 +98,31 @@ impl TabMap { · 21 unmodified lines
102 }98 }
103 99
104 if let Some(offset) = last_tab_with_changed_expansion_offset.or(first_tab_offset) {100 if let Some(offset) = last_tab_with_changed_expansion_offset.or(first_tab_offset) {
105 suggestion_edit.old.end.0 += offset as usize + 1;101 fold_edit.old.end.0 += offset as usize + 1;
106 suggestion_edit.new.end.0 += offset as usize + 1;102 fold_edit.new.end.0 += offset as usize + 1;
107 }103 }
108 }104 }
109 105
110 // Combine any edits that overlap due to the expansion.106 // Combine any edits that overlap due to the expansion.
111 let mut ix = 1;107 let mut ix = 1;
112 while ix < suggestion_edits.len() {108 while ix < fold_edits.len() {
113 let (prev_edits, next_edits) = suggestion_edits.split_at_mut(ix);109 let (prev_edits, next_edits) = fold_edits.split_at_mut(ix);
114 let prev_edit = prev_edits.last_mut().unwrap();110 let prev_edit = prev_edits.last_mut().unwrap();
115 let edit = &next_edits[0];111 let edit = &next_edits[0];
116 if prev_edit.old.end >= edit.old.start {112 if prev_edit.old.end >= edit.old.start {
117 prev_edit.old.end = edit.old.end;113 prev_edit.old.end = edit.old.end;
118 prev_edit.new.end = edit.new.end;114 prev_edit.new.end = edit.new.end;
119 suggestion_edits.remove(ix);115 fold_edits.remove(ix);
120 } else {116 } else {
121 ix += 1;117 ix += 1;
122 }118 }
123 }119 }
124 120
125 for suggestion_edit in suggestion_edits {121 for fold_edit in fold_edits {
126 let old_start = old_snapshot122 let old_start = fold_edit.old.start.to_point(&old_snapshot.fold_snapshot);
127 .suggestion_snapshot123 let old_end = fold_edit.old.end.to_point(&old_snapshot.fold_snapshot);
128 .to_point(suggestion_edit.old.start);124 let new_start = fold_edit.new.start.to_point(&new_snapshot.fold_snapshot);
129 let old_end = old_snapshot125 let new_end = fold_edit.new.end.to_point(&new_snapshot.fold_snapshot);
130 .suggestion_snapshot
131 .to_point(suggestion_edit.old.end);
132 let new_start = new_snapshot
133 .suggestion_snapshot
134 .to_point(suggestion_edit.new.start);
135 let new_end = new_snapshot
136 .suggestion_snapshot
137 .to_point(suggestion_edit.new.end);
138 tab_edits.push(TabEdit {126 tab_edits.push(TabEdit {
139 old: old_snapshot.to_tab_point(old_start)..old_snapshot.to_tab_point(old_end),127 old: old_snapshot.to_tab_point(old_start)..old_snapshot.to_tab_point(old_end),
140 new: new_snapshot.to_tab_point(new_start)..new_snapshot.to_tab_point(new_end),128 new: new_snapshot.to_tab_point(new_start)..new_snapshot.to_tab_point(new_end),
@@ -155,7 +143,7 @@ impl TabMap { · 14 unmodified lines
155 143
156#[derive(Clone)]144#[derive(Clone)]
157pub struct TabSnapshot {145pub struct TabSnapshot {
158 pub suggestion_snapshot: SuggestionSnapshot,146 pub fold_snapshot: FoldSnapshot,
159 pub tab_size: NonZeroU32,147 pub tab_size: NonZeroU32,
160 pub max_expansion_column: u32,148 pub max_expansion_column: u32,
161 pub version: usize,149 pub version: usize,
@@ -163,18 +151,15 @@ pub struct TabSnapshot { · 1 unmodified line
163 151
164impl TabSnapshot {152impl TabSnapshot {
165 pub fn buffer_snapshot(&self) -> &MultiBufferSnapshot {153 pub fn buffer_snapshot(&self) -> &MultiBufferSnapshot {
166 self.suggestion_snapshot.buffer_snapshot()154 &self.fold_snapshot.inlay_snapshot.buffer
167 }155 }
168 156
169 pub fn line_len(&self, row: u32) -> u32 {157 pub fn line_len(&self, row: u32) -> u32 {
170 let max_point = self.max_point();158 let max_point = self.max_point();
171 if row < max_point.row() {159 if row < max_point.row() {
172 self.to_tab_point(SuggestionPoint::new(160 self.to_tab_point(FoldPoint::new(row, self.fold_snapshot.line_len(row)))
173 row,161 .0
174 self.suggestion_snapshot.line_len(row),162 .column
175 ))
176 .0
177 .column
178 } else {163 } else {
179 max_point.column()164 max_point.column()
180 }165 }
@@ -185,10 +170,10 @@ impl TabSnapshot { · 4 unmodified lines
185 }170 }
186 171
187 pub fn text_summary_for_range(&self, range: Range<TabPoint>) -> TextSummary {172 pub fn text_summary_for_range(&self, range: Range<TabPoint>) -> TextSummary {
188 let input_start = self.to_suggestion_point(range.start, Bias::Left).0;173 let input_start = self.to_fold_point(range.start, Bias::Left).0;
189 let input_end = self.to_suggestion_point(range.end, Bias::Right).0;174 let input_end = self.to_fold_point(range.end, Bias::Right).0;
190 let input_summary = self175 let input_summary = self
191 .suggestion_snapshot176 .fold_snapshot
192 .text_summary_for_range(input_start..input_end);177 .text_summary_for_range(input_start..input_end);
193 178
194 let mut first_line_chars = 0;179 let mut first_line_chars = 0;
@@ -198,7 +183,7 @@ impl TabSnapshot { · 3 unmodified lines
198 self.max_point()183 self.max_point()
199 };184 };
200 for c in self185 for c in self
201 .chunks(range.start..line_end, false, None, None)186 .chunks(range.start..line_end, false, None, None, None)
202 .flat_map(|chunk| chunk.text.chars())187 .flat_map(|chunk| chunk.text.chars())
203 {188 {
204 if c == '\n' {189 if c == '\n' {
@@ -217,6 +202,7 @@ impl TabSnapshot { · 12 unmodified lines
217 false,202 false,
218 None,203 None,
219 None,204 None,
205 None,
220 )206 )
221 .flat_map(|chunk| chunk.text.chars())207 .flat_map(|chunk| chunk.text.chars())
222 {208 {
@@ -238,15 +224,17 @@ impl TabSnapshot { · 15 unmodified lines
238 range: Range<TabPoint>,224 range: Range<TabPoint>,
239 language_aware: bool,225 language_aware: bool,
240 text_highlights: Option<&'a TextHighlights>,226 text_highlights: Option<&'a TextHighlights>,
241 suggestion_highlight: Option<HighlightStyle>,227 hint_highlights: Option<HighlightStyle>,
228 suggestion_highlights: Option<HighlightStyle>,
242 ) -> TabChunks<'a> {229 ) -> TabChunks<'a> {
243 let (input_start, expanded_char_column, to_next_stop) =230 let (input_start, expanded_char_column, to_next_stop) =
244 self.to_suggestion_point(range.start, Bias::Left);231 self.to_fold_point(range.start, Bias::Left);
245 let input_column = input_start.column();232 let input_column = input_start.column();
246 let input_start = self.suggestion_snapshot.to_offset(input_start);233 let input_start = input_start.to_offset(&self.fold_snapshot);
247 let input_end = self234 let input_end = self
248 .suggestion_snapshot235 .to_fold_point(range.end, Bias::Right)
249 .to_offset(self.to_suggestion_point(range.end, Bias::Right).0);236 .0
237 .to_offset(&self.fold_snapshot);
250 let to_next_stop = if range.start.0 + Point::new(0, to_next_stop) > range.end.0 {238 let to_next_stop = if range.start.0 + Point::new(0, to_next_stop) > range.end.0 {
251 range.end.column() - range.start.column()239 range.end.column() - range.start.column()
252 } else {240 } else {
@@ -254,11 +242,12 @@ impl TabSnapshot { · 1 unmodified line
254 };242 };
255 243
256 TabChunks {244 TabChunks {
257 suggestion_chunks: self.suggestion_snapshot.chunks(245 fold_chunks: self.fold_snapshot.chunks(
258 input_start..input_end,246 input_start..input_end,
259 language_aware,247 language_aware,
260 text_highlights,248 text_highlights,
261 suggestion_highlight,249 hint_highlights,
250 suggestion_highlights,
262 ),251 ),
263 input_column,252 input_column,
264 column: expanded_char_column,253 column: expanded_char_column,
@@ -275,63 +264,58 @@ impl TabSnapshot { · 10 unmodified lines
275 }264 }
276 }265 }
277 266
278 pub fn buffer_rows(&self, row: u32) -> suggestion_map::SuggestionBufferRows {267 pub fn buffer_rows(&self, row: u32) -> fold_map::FoldBufferRows<'_> {
279 self.suggestion_snapshot.buffer_rows(row)268 self.fold_snapshot.buffer_rows(row)
280 }269 }
281 270
282 #[cfg(test)]271 #[cfg(test)]
283 pub fn text(&self) -> String {272 pub fn text(&self) -> String {
284 self.chunks(TabPoint::zero()..self.max_point(), false, None, None)273 self.chunks(TabPoint::zero()..self.max_point(), false, None, None, None)
285 .map(|chunk| chunk.text)274 .map(|chunk| chunk.text)
286 .collect()275 .collect()
287 }276 }
288 277
289 pub fn max_point(&self) -> TabPoint {278 pub fn max_point(&self) -> TabPoint {
290 self.to_tab_point(self.suggestion_snapshot.max_point())279 self.to_tab_point(self.fold_snapshot.max_point())
291 }280 }
292 281
293 pub fn clip_point(&self, point: TabPoint, bias: Bias) -> TabPoint {282 pub fn clip_point(&self, point: TabPoint, bias: Bias) -> TabPoint {
294 self.to_tab_point(283 self.to_tab_point(
295 self.suggestion_snapshot284 self.fold_snapshot
296 .clip_point(self.to_suggestion_point(point, bias).0, bias),285 .clip_point(self.to_fold_point(point, bias).0, bias),
297 )286 )
298 }287 }
299 288
300 pub fn to_tab_point(&self, input: SuggestionPoint) -> TabPoint {289 pub fn to_tab_point(&self, input: FoldPoint) -> TabPoint {
301 let chars = self290 let chars = self.fold_snapshot.chars_at(FoldPoint::new(input.row(), 0));
302 .suggestion_snapshot
303 .chars_at(SuggestionPoint::new(input.row(), 0));
304 let expanded = self.expand_tabs(chars, input.column());291 let expanded = self.expand_tabs(chars, input.column());
305 TabPoint::new(input.row(), expanded)292 TabPoint::new(input.row(), expanded)
306 }293 }
307 294
308 pub fn to_suggestion_point(&self, output: TabPoint, bias: Bias) -> (SuggestionPoint, u32, u32) {295 pub fn to_fold_point(&self, output: TabPoint, bias: Bias) -> (FoldPoint, u32, u32) {
309 let chars = self296 let chars = self.fold_snapshot.chars_at(FoldPoint::new(output.row(), 0));
310 .suggestion_snapshot
311 .chars_at(SuggestionPoint::new(output.row(), 0));
312 let expanded = output.column();297 let expanded = output.column();
313 let (collapsed, expanded_char_column, to_next_stop) =298 let (collapsed, expanded_char_column, to_next_stop) =
314 self.collapse_tabs(chars, expanded, bias);299 self.collapse_tabs(chars, expanded, bias);
315 (300 (
316 SuggestionPoint::new(output.row(), collapsed as u32),301 FoldPoint::new(output.row(), collapsed as u32),
317 expanded_char_column,302 expanded_char_column,
318 to_next_stop,303 to_next_stop,
319 )304 )
320 }305 }
321 306
322 pub fn make_tab_point(&self, point: Point, bias: Bias) -> TabPoint {307 pub fn make_tab_point(&self, point: Point, bias: Bias) -> TabPoint {
323 let fold_point = self308 let inlay_point = self.fold_snapshot.inlay_snapshot.to_inlay_point(point);
324 .suggestion_snapshot309 let fold_point = self.fold_snapshot.to_fold_point(inlay_point, bias);
325 .fold_snapshot310 self.to_tab_point(fold_point)
326 .to_fold_point(point, bias);
327 let suggestion_point = self.suggestion_snapshot.to_suggestion_point(fold_point);
328 self.to_tab_point(suggestion_point)
329 }311 }
330 312
331 pub fn to_point(&self, point: TabPoint, bias: Bias) -> Point {313 pub fn to_point(&self, point: TabPoint, bias: Bias) -> Point {
332 let suggestion_point = self.to_suggestion_point(point, bias).0;314 let fold_point = self.to_fold_point(point, bias).0;
333 let fold_point = self.suggestion_snapshot.to_fold_point(suggestion_point);315 let inlay_point = fold_point.to_inlay_point(&self.fold_snapshot);
334 fold_point.to_buffer_point(&self.suggestion_snapshot.fold_snapshot)316 self.fold_snapshot
317 .inlay_snapshot
318 .to_buffer_point(inlay_point)
335 }319 }
336 320
337 fn expand_tabs(&self, chars: impl Iterator<Item = char>, column: u32) -> u32 {321 fn expand_tabs(&self, chars: impl Iterator<Item = char>, column: u32) -> u32 {
@@ -490,7 +474,7 @@ impl<'a> std::ops::AddAssign<&'a Self> for TextSummary { · 152 unmodified lines
490const SPACES: &str = " ";474const SPACES: &str = " ";
491 475
492pub struct TabChunks<'a> {476pub struct TabChunks<'a> {
493 suggestion_chunks: SuggestionChunks<'a>,477 fold_chunks: FoldChunks<'a>,
494 chunk: Chunk<'a>,478 chunk: Chunk<'a>,
495 column: u32,479 column: u32,
496 max_expansion_column: u32,480 max_expansion_column: u32,
@@ -506,7 +490,7 @@ impl<'a> Iterator for TabChunks<'a> { · 9 unmodified lines
506 490
507 fn next(&mut self) -> Option<Self::Item> {491 fn next(&mut self) -> Option<Self::Item> {
508 if self.chunk.text.is_empty() {492 if self.chunk.text.is_empty() {
509 if let Some(chunk) = self.suggestion_chunks.next() {493 if let Some(chunk) = self.fold_chunks.next() {
510 self.chunk = chunk;494 self.chunk = chunk;
511 if self.inside_leading_tab {495 if self.inside_leading_tab {
512 self.chunk.text = &self.chunk.text[1..];496 self.chunk.text = &self.chunk.text[1..];
@@ -574,7 +558,7 @@ impl<'a> Iterator for TabChunks<'a> { · 61 unmodified lines
574mod tests {558mod tests {
575 use super::*;559 use super::*;
576 use crate::{560 use crate::{
577 display_map::{fold_map::FoldMap, suggestion_map::SuggestionMap},561 display_map::{fold_map::FoldMap, inlay_map::InlayMap},
578 MultiBuffer,562 MultiBuffer,
579 };563 };
580 use rand::{prelude::StdRng, Rng};564 use rand::{prelude::StdRng, Rng};
@@ -583,9 +567,9 @@ mod tests { · 2 unmodified lines
583 fn test_expand_tabs(cx: &mut gpui::AppContext) {567 fn test_expand_tabs(cx: &mut gpui::AppContext) {
584 let buffer = MultiBuffer::build_simple("", cx);568 let buffer = MultiBuffer::build_simple("", cx);
585 let buffer_snapshot = buffer.read(cx).snapshot(cx);569 let buffer_snapshot = buffer.read(cx).snapshot(cx);
586 let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone());570 let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
587 let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot);571 let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
588 let (_, tab_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap());572 let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
589 573
590 assert_eq!(tab_snapshot.expand_tabs("\t".chars(), 0), 0);574 assert_eq!(tab_snapshot.expand_tabs("\t".chars(), 0), 0);
591 assert_eq!(tab_snapshot.expand_tabs("\t".chars(), 1), 4);575 assert_eq!(tab_snapshot.expand_tabs("\t".chars(), 1), 4);
@@ -600,9 +584,9 @@ mod tests { · 8 unmodified lines
600 584
601 let buffer = MultiBuffer::build_simple(input, cx);585 let buffer = MultiBuffer::build_simple(input, cx);
602 let buffer_snapshot = buffer.read(cx).snapshot(cx);586 let buffer_snapshot = buffer.read(cx).snapshot(cx);
603 let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone());587 let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
604 let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot);588 let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
605 let (_, mut tab_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap());589 let (_, mut tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
606 590
607 tab_snapshot.max_expansion_column = max_expansion_column;591 tab_snapshot.max_expansion_column = max_expansion_column;
608 assert_eq!(tab_snapshot.text(), output);592 assert_eq!(tab_snapshot.text(), output);
@@ -615,6 +599,7 @@ mod tests { · 6 unmodified lines
615 false,599 false,
616 None,600 None,
617 None,601 None,
602 None,
618 )603 )
619 .map(|c| c.text)604 .map(|c| c.text)
620 .collect::<String>(),605 .collect::<String>(),
@@ -626,16 +611,16 @@ mod tests { · 5 unmodified lines
626 let input_point = Point::new(0, ix as u32);611 let input_point = Point::new(0, ix as u32);
627 let output_point = Point::new(0, output.find(c).unwrap() as u32);612 let output_point = Point::new(0, output.find(c).unwrap() as u32);
628 assert_eq!(613 assert_eq!(
629 tab_snapshot.to_tab_point(SuggestionPoint(input_point)),614 tab_snapshot.to_tab_point(FoldPoint(input_point)),
630 TabPoint(output_point),615 TabPoint(output_point),
631 "to_tab_point({input_point:?})"616 "to_tab_point({input_point:?})"
632 );617 );
633 assert_eq!(618 assert_eq!(
634 tab_snapshot619 tab_snapshot
635 .to_suggestion_point(TabPoint(output_point), Bias::Left)620 .to_fold_point(TabPoint(output_point), Bias::Left)
636 .0,621 .0,
637 SuggestionPoint(input_point),622 FoldPoint(input_point),
638 "to_suggestion_point({output_point:?})"623 "to_fold_point({output_point:?})"
639 );624 );
640 }625 }
641 }626 }
@@ -648,9 +633,9 @@ mod tests { · 6 unmodified lines
648 633
649 let buffer = MultiBuffer::build_simple(input, cx);634 let buffer = MultiBuffer::build_simple(input, cx);
650 let buffer_snapshot = buffer.read(cx).snapshot(cx);635 let buffer_snapshot = buffer.read(cx).snapshot(cx);
651 let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone());636 let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
652 let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot);637 let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
653 let (_, mut tab_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap());638 let (_, mut tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
654 639
655 tab_snapshot.max_expansion_column = max_expansion_column;640 tab_snapshot.max_expansion_column = max_expansion_column;
656 assert_eq!(tab_snapshot.text(), input);641 assert_eq!(tab_snapshot.text(), input);
@@ -662,9 +647,9 @@ mod tests { · 5 unmodified lines
662 647
663 let buffer = MultiBuffer::build_simple(&input, cx);648 let buffer = MultiBuffer::build_simple(&input, cx);
664 let buffer_snapshot = buffer.read(cx).snapshot(cx);649 let buffer_snapshot = buffer.read(cx).snapshot(cx);
665 let (_, fold_snapshot) = FoldMap::new(buffer_snapshot.clone());650 let (_, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
666 let (_, suggestion_snapshot) = SuggestionMap::new(fold_snapshot);651 let (_, fold_snapshot) = FoldMap::new(inlay_snapshot);
667 let (_, tab_snapshot) = TabMap::new(suggestion_snapshot, 4.try_into().unwrap());652 let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
668 653
669 assert_eq!(654 assert_eq!(
670 chunks(&tab_snapshot, TabPoint::zero()),655 chunks(&tab_snapshot, TabPoint::zero()),
@@ -689,7 +674,7 @@ mod tests { · 18 unmodified lines
689 let mut chunks = Vec::new();674 let mut chunks = Vec::new();
690 let mut was_tab = false;675 let mut was_tab = false;
691 let mut text = String::new();676 let mut text = String::new();
692 for chunk in snapshot.chunks(start..snapshot.max_point(), false, None, None) {677 for chunk in snapshot.chunks(start..snapshot.max_point(), false, None, None, None) {
693 if chunk.is_tab != was_tab {678 if chunk.is_tab != was_tab {
694 if !text.is_empty() {679 if !text.is_empty() {
695 chunks.push((mem::take(&mut text), was_tab));680 chunks.push((mem::take(&mut text), was_tab));
@@ -721,15 +706,16 @@ mod tests { · 25 unmodified lines
721 let buffer_snapshot = buffer.read(cx).snapshot(cx);706 let buffer_snapshot = buffer.read(cx).snapshot(cx);
722 log::info!("Buffer text: {:?}", buffer_snapshot.text());707 log::info!("Buffer text: {:?}", buffer_snapshot.text());
723 708
724 let (mut fold_map, _) = FoldMap::new(buffer_snapshot.clone());709 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
710 log::info!("InlayMap text: {:?}", inlay_snapshot.text());
711 let (mut fold_map, _) = FoldMap::new(inlay_snapshot.clone());
725 fold_map.randomly_mutate(&mut rng);712 fold_map.randomly_mutate(&mut rng);
726 let (fold_snapshot, _) = fold_map.read(buffer_snapshot, vec![]);713 let (fold_snapshot, _) = fold_map.read(inlay_snapshot, vec![]);
727 log::info!("FoldMap text: {:?}", fold_snapshot.text());714 log::info!("FoldMap text: {:?}", fold_snapshot.text());
728 let (suggestion_map, _) = SuggestionMap::new(fold_snapshot);715 let (inlay_snapshot, _) = inlay_map.randomly_mutate(&mut 0, &mut rng);
729 let (suggestion_snapshot, _) = suggestion_map.randomly_mutate(&mut rng);716 log::info!("InlayMap text: {:?}", inlay_snapshot.text());
730 log::info!("SuggestionMap text: {:?}", suggestion_snapshot.text());
731 717
732 let (tab_map, _) = TabMap::new(suggestion_snapshot.clone(), tab_size);718 let (mut tab_map, _) = TabMap::new(fold_snapshot.clone(), tab_size);
733 let tabs_snapshot = tab_map.set_max_expansion_column(32);719 let tabs_snapshot = tab_map.set_max_expansion_column(32);
734 720
735 let text = text::Rope::from(tabs_snapshot.text().as_str());721 let text = text::Rope::from(tabs_snapshot.text().as_str());
@@ -757,7 +743,7 @@ mod tests { · 21 unmodified lines
757 let expected_summary = TextSummary::from(expected_text.as_str());743 let expected_summary = TextSummary::from(expected_text.as_str());
758 assert_eq!(744 assert_eq!(
759 tabs_snapshot745 tabs_snapshot
760 .chunks(start..end, false, None, None)746 .chunks(start..end, false, None, None, None)
761 .map(|c| c.text)747 .map(|c| c.text)
762 .collect::<String>(),748 .collect::<String>(),
763 expected_text,749 expected_text,
@@ -767,7 +753,7 @@ mod tests { · 3 unmodified lines
767 );753 );
768 754
769 let mut actual_summary = tabs_snapshot.text_summary_for_range(start..end);755 let mut actual_summary = tabs_snapshot.text_summary_for_range(start..end);
770 if tab_size.get() > 1 && suggestion_snapshot.text().contains('\t') {756 if tab_size.get() > 1 && inlay_snapshot.text().contains('\t') {
771 actual_summary.longest_row = expected_summary.longest_row;757 actual_summary.longest_row = expected_summary.longest_row;
772 actual_summary.longest_row_chars = expected_summary.longest_row_chars;758 actual_summary.longest_row_chars = expected_summary.longest_row_chars;
773 }759 }
crates/editor/src/display_map/wrap_map.rs+42−44
@@ -1,5 +1,5 @@
1use super::{1use super::{
2 suggestion_map::SuggestionBufferRows,2 fold_map::FoldBufferRows,
3 tab_map::{self, TabEdit, TabPoint, TabSnapshot},3 tab_map::{self, TabEdit, TabPoint, TabSnapshot},
4 TextHighlights,4 TextHighlights,
5};5};
@@ -65,7 +65,7 @@ pub struct WrapChunks<'a> { · 59 unmodified lines
65 65
66#[derive(Clone)]66#[derive(Clone)]
67pub struct WrapBufferRows<'a> {67pub struct WrapBufferRows<'a> {
68 input_buffer_rows: SuggestionBufferRows<'a>,68 input_buffer_rows: FoldBufferRows<'a>,
69 input_buffer_row: Option<u32>,69 input_buffer_row: Option<u32>,
70 output_row: u32,70 output_row: u32,
71 soft_wrapped: bool,71 soft_wrapped: bool,
@@ -353,7 +353,7 @@ impl WrapSnapshot { · 281 unmodified lines
353 }353 }
354 354
355 old_cursor.next(&());355 old_cursor.next(&());
356 new_transforms.push_tree(356 new_transforms.append(
357 old_cursor.slice(&next_edit.old.start, Bias::Right, &()),357 old_cursor.slice(&next_edit.old.start, Bias::Right, &()),
358 &(),358 &(),
359 );359 );
@@ -366,7 +366,7 @@ impl WrapSnapshot { · 6 unmodified lines
366 new_transforms.push_or_extend(Transform::isomorphic(summary));366 new_transforms.push_or_extend(Transform::isomorphic(summary));
367 }367 }
368 old_cursor.next(&());368 old_cursor.next(&());
369 new_transforms.push_tree(old_cursor.suffix(&()), &());369 new_transforms.append(old_cursor.suffix(&()), &());
370 }370 }
371 }371 }
372 }372 }
@@ -446,6 +446,7 @@ impl WrapSnapshot { · 73 unmodified lines
446 false,446 false,
447 None,447 None,
448 None,448 None,
449 None,
449 );450 );
450 let mut edit_transforms = Vec::<Transform>::new();451 let mut edit_transforms = Vec::<Transform>::new();
451 for _ in edit.new_rows.start..edit.new_rows.end {452 for _ in edit.new_rows.start..edit.new_rows.end {
@@ -500,7 +501,7 @@ impl WrapSnapshot { · 48 unmodified lines
500 new_transforms.push_or_extend(Transform::isomorphic(summary));501 new_transforms.push_or_extend(Transform::isomorphic(summary));
501 }502 }
502 old_cursor.next(&());503 old_cursor.next(&());
503 new_transforms.push_tree(504 new_transforms.append(
504 old_cursor.slice(505 old_cursor.slice(
505 &TabPoint::new(next_edit.old_rows.start, 0),506 &TabPoint::new(next_edit.old_rows.start, 0),
506 Bias::Right,507 Bias::Right,
@@ -517,7 +518,7 @@ impl WrapSnapshot { · 10 unmodified lines
517 new_transforms.push_or_extend(Transform::isomorphic(summary));518 new_transforms.push_or_extend(Transform::isomorphic(summary));
518 }519 }
519 old_cursor.next(&());520 old_cursor.next(&());
520 new_transforms.push_tree(old_cursor.suffix(&()), &());521 new_transforms.append(old_cursor.suffix(&()), &());
521 }522 }
522 }523 }
523 }524 }
@@ -575,7 +576,8 @@ impl WrapSnapshot { · 51 unmodified lines
575 rows: Range<u32>,576 rows: Range<u32>,
576 language_aware: bool,577 language_aware: bool,
577 text_highlights: Option<&'a TextHighlights>,578 text_highlights: Option<&'a TextHighlights>,
578 suggestion_highlight: Option<HighlightStyle>,579 hint_highlights: Option<HighlightStyle>,
580 suggestion_highlights: Option<HighlightStyle>,
579 ) -> WrapChunks<'a> {581 ) -> WrapChunks<'a> {
580 let output_start = WrapPoint::new(rows.start, 0);582 let output_start = WrapPoint::new(rows.start, 0);
581 let output_end = WrapPoint::new(rows.end, 0);583 let output_end = WrapPoint::new(rows.end, 0);
@@ -593,7 +595,8 @@ impl WrapSnapshot { · 11 unmodified lines
593 input_start..input_end,595 input_start..input_end,
594 language_aware,596 language_aware,
595 text_highlights,597 text_highlights,
596 suggestion_highlight,598 hint_highlights,
599 suggestion_highlights,
597 ),600 ),
598 input_chunk: Default::default(),601 input_chunk: Default::default(),
599 output_position: output_start,602 output_position: output_start,
@@ -757,28 +760,18 @@ impl WrapSnapshot { · 157 unmodified lines
757 }760 }
758 761
759 let text = language::Rope::from(self.text().as_str());762 let text = language::Rope::from(self.text().as_str());
760 let input_buffer_rows = self.buffer_snapshot().buffer_rows(0).collect::<Vec<_>>();763 let mut input_buffer_rows = self.tab_snapshot.buffer_rows(0);
761 let mut expected_buffer_rows = Vec::new();764 let mut expected_buffer_rows = Vec::new();
762 let mut prev_fold_row = 0;765 let mut prev_tab_row = 0;
763 for display_row in 0..=self.max_point().row() {766 for display_row in 0..=self.max_point().row() {
764 let tab_point = self.to_tab_point(WrapPoint::new(display_row, 0));767 let tab_point = self.to_tab_point(WrapPoint::new(display_row, 0));
765 let suggestion_point = self768 if tab_point.row() == prev_tab_row && display_row != 0 {
766 .tab_snapshot
767 .to_suggestion_point(tab_point, Bias::Left)
768 .0;
769 let fold_point = self
770 .tab_snapshot
771 .suggestion_snapshot
772 .to_fold_point(suggestion_point);
773 if fold_point.row() == prev_fold_row && display_row != 0 {
774 expected_buffer_rows.push(None);769 expected_buffer_rows.push(None);
775 } else {770 } else {
776 let buffer_point = fold_point771 expected_buffer_rows.push(input_buffer_rows.next().unwrap());
777 .to_buffer_point(&self.tab_snapshot.suggestion_snapshot.fold_snapshot);
778 expected_buffer_rows.push(input_buffer_rows[buffer_point.row as usize]);
779 prev_fold_row = fold_point.row();
780 }772 }
781 773
774 prev_tab_row = tab_point.row();
782 assert_eq!(self.line_len(display_row), text.line_len(display_row));775 assert_eq!(self.line_len(display_row), text.line_len(display_row));
783 }776 }
784 777
@@ -1038,7 +1031,7 @@ fn consolidate_wrap_edits(edits: &mut Vec<WrapEdit>) { · 253 unmodified lines
1038mod tests {1031mod tests {
1039 use super::*;1032 use super::*;
1040 use crate::{1033 use crate::{
1041 display_map::{fold_map::FoldMap, suggestion_map::SuggestionMap, tab_map::TabMap},1034 display_map::{fold_map::FoldMap, inlay_map::InlayMap, tab_map::TabMap},
1042 MultiBuffer,1035 MultiBuffer,
1043 };1036 };
1044 use gpui::test::observe;1037 use gpui::test::observe;
@@ -1089,11 +1082,11 @@ mod tests { · 44 unmodified lines
1089 });1082 });
1090 let mut buffer_snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));1083 let mut buffer_snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
1091 log::info!("Buffer text: {:?}", buffer_snapshot.text());1084 log::info!("Buffer text: {:?}", buffer_snapshot.text());
1092 let (mut fold_map, fold_snapshot) = FoldMap::new(buffer_snapshot.clone());1085 let (mut inlay_map, inlay_snapshot) = InlayMap::new(buffer_snapshot.clone());
1086 log::info!("InlayMap text: {:?}", inlay_snapshot.text());
1087 let (mut fold_map, fold_snapshot) = FoldMap::new(inlay_snapshot.clone());
1093 log::info!("FoldMap text: {:?}", fold_snapshot.text());1088 log::info!("FoldMap text: {:?}", fold_snapshot.text());
1094 let (suggestion_map, suggestion_snapshot) = SuggestionMap::new(fold_snapshot.clone());1089 let (mut tab_map, _) = TabMap::new(fold_snapshot.clone(), tab_size);
1095 log::info!("SuggestionMap text: {:?}", suggestion_snapshot.text());
1096 let (tab_map, _) = TabMap::new(suggestion_snapshot.clone(), tab_size);
1097 let tabs_snapshot = tab_map.set_max_expansion_column(32);1090 let tabs_snapshot = tab_map.set_max_expansion_column(32);
1098 log::info!("TabMap text: {:?}", tabs_snapshot.text());1091 log::info!("TabMap text: {:?}", tabs_snapshot.text());
1099 1092
@@ -1122,6 +1115,7 @@ mod tests { · 22 unmodified lines
1122 );1115 );
1123 log::info!("Wrapped text: {:?}", actual_text);1116 log::info!("Wrapped text: {:?}", actual_text);
1124 1117
1118 let mut next_inlay_id = 0;
1125 let mut edits = Vec::new();1119 let mut edits = Vec::new();
1126 for _i in 0..operations {1120 for _i in 0..operations {
1127 log::info!("{} ==============================================", _i);1121 log::info!("{} ==============================================", _i);
@@ -1139,10 +1133,8 @@ mod tests { · 11 unmodified lines
1139 }1133 }
1140 20..=39 => {1134 20..=39 => {
1141 for (fold_snapshot, fold_edits) in fold_map.randomly_mutate(&mut rng) {1135 for (fold_snapshot, fold_edits) in fold_map.randomly_mutate(&mut rng) {
1142 let (suggestion_snapshot, suggestion_edits) =
1143 suggestion_map.sync(fold_snapshot, fold_edits);
1144 let (tabs_snapshot, tab_edits) =1136 let (tabs_snapshot, tab_edits) =
1145 tab_map.sync(suggestion_snapshot, suggestion_edits, tab_size);1137 tab_map.sync(fold_snapshot, fold_edits, tab_size);
1146 let (mut snapshot, wrap_edits) =1138 let (mut snapshot, wrap_edits) =
1147 wrap_map.update(cx, |map, cx| map.sync(tabs_snapshot, tab_edits, cx));1139 wrap_map.update(cx, |map, cx| map.sync(tabs_snapshot, tab_edits, cx));
1148 snapshot.check_invariants();1140 snapshot.check_invariants();
@@ -1151,10 +1143,11 @@ mod tests { · 2 unmodified lines
1151 }1143 }
1152 }1144 }
1153 40..=59 => {1145 40..=59 => {
1154 let (suggestion_snapshot, suggestion_edits) =1146 let (inlay_snapshot, inlay_edits) =
1155 suggestion_map.randomly_mutate(&mut rng);1147 inlay_map.randomly_mutate(&mut next_inlay_id, &mut rng);
1148 let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
1156 let (tabs_snapshot, tab_edits) =1149 let (tabs_snapshot, tab_edits) =
1157 tab_map.sync(suggestion_snapshot, suggestion_edits, tab_size);1150 tab_map.sync(fold_snapshot, fold_edits, tab_size);
1158 let (mut snapshot, wrap_edits) =1151 let (mut snapshot, wrap_edits) =
1159 wrap_map.update(cx, |map, cx| map.sync(tabs_snapshot, tab_edits, cx));1152 wrap_map.update(cx, |map, cx| map.sync(tabs_snapshot, tab_edits, cx));
1160 snapshot.check_invariants();1153 snapshot.check_invariants();
@@ -1173,13 +1166,12 @@ mod tests { · 12 unmodified lines
1173 }1166 }
1174 1167
1175 log::info!("Buffer text: {:?}", buffer_snapshot.text());1168 log::info!("Buffer text: {:?}", buffer_snapshot.text());
1176 let (fold_snapshot, fold_edits) = fold_map.read(buffer_snapshot.clone(), buffer_edits);1169 let (inlay_snapshot, inlay_edits) =
1170 inlay_map.sync(buffer_snapshot.clone(), buffer_edits);
1171 log::info!("InlayMap text: {:?}", inlay_snapshot.text());
1172 let (fold_snapshot, fold_edits) = fold_map.read(inlay_snapshot, inlay_edits);
1177 log::info!("FoldMap text: {:?}", fold_snapshot.text());1173 log::info!("FoldMap text: {:?}", fold_snapshot.text());
1178 let (suggestion_snapshot, suggestion_edits) =1174 let (tabs_snapshot, tab_edits) = tab_map.sync(fold_snapshot, fold_edits, tab_size);
1179 suggestion_map.sync(fold_snapshot, fold_edits);
1180 log::info!("SuggestionMap text: {:?}", suggestion_snapshot.text());
1181 let (tabs_snapshot, tab_edits) =
1182 tab_map.sync(suggestion_snapshot, suggestion_edits, tab_size);
1183 log::info!("TabMap text: {:?}", tabs_snapshot.text());1175 log::info!("TabMap text: {:?}", tabs_snapshot.text());
1184 1176
1185 let unwrapped_text = tabs_snapshot.text();1177 let unwrapped_text = tabs_snapshot.text();
@@ -1227,7 +1219,7 @@ mod tests { · 41 unmodified lines
1227 if tab_size.get() == 11219 if tab_size.get() == 1
1228 || !wrapped_snapshot1220 || !wrapped_snapshot
1229 .tab_snapshot1221 .tab_snapshot
1230 .suggestion_snapshot1222 .fold_snapshot
1231 .text()1223 .text()
1232 .contains('\t')1224 .contains('\t')
1233 {1225 {
@@ -1328,8 +1320,14 @@ mod tests { · 94 unmodified lines
1328 }1320 }
1329 1321
1330 pub fn text_chunks(&self, wrap_row: u32) -> impl Iterator<Item = &str> {1322 pub fn text_chunks(&self, wrap_row: u32) -> impl Iterator<Item = &str> {
1331 self.chunks(wrap_row..self.max_point().row() + 1, false, None, None)1323 self.chunks(
1332 .map(|h| h.text)1324 wrap_row..self.max_point().row() + 1,
1325 false,
1326 None,
1327 None,
1328 None,
1329 )
1330 .map(|h| h.text)
1333 }1331 }
1334 1332
1335 fn verify_chunks(&mut self, rng: &mut impl Rng) {1333 fn verify_chunks(&mut self, rng: &mut impl Rng) {
@@ -1352,7 +1350,7 @@ mod tests { · 16 unmodified lines
1352 }1350 }
1353 1351
1354 let actual_text = self1352 let actual_text = self
1355 .chunks(start_row..end_row, true, None, None)1353 .chunks(start_row..end_row, true, None, None, None)
1356 .map(|c| c.text)1354 .map(|c| c.text)
1357 .collect::<String>();1355 .collect::<String>();
1358 assert_eq!(1356 assert_eq!(
crates/editor/src/editor.rs+362−56
@@ -2,6 +2,7 @@ mod blink_manager; · 1 unmodified line
2pub mod display_map;2pub mod display_map;
3mod editor_settings;3mod editor_settings;
4mod element;4mod element;
5mod inlay_hint_cache;
5 6
6mod git;7mod git;
7mod highlight_matching_bracket;8mod highlight_matching_bracket;
@@ -25,7 +26,7 @@ use aho_corasick::AhoCorasick; · 17 unmodified lines
25use anyhow::{anyhow, Result};26use anyhow::{anyhow, Result};
26use blink_manager::BlinkManager;27use blink_manager::BlinkManager;
27use client::{ClickhouseEvent, TelemetrySettings};28use client::{ClickhouseEvent, TelemetrySettings};
28use clock::ReplicaId;29use clock::{Global, ReplicaId};
29use collections::{BTreeMap, Bound, HashMap, HashSet, VecDeque};30use collections::{BTreeMap, Bound, HashMap, HashSet, VecDeque};
30use copilot::Copilot;31use copilot::Copilot;
31pub use display_map::DisplayPoint;32pub use display_map::DisplayPoint;
@@ -52,11 +53,12 @@ use gpui::{ · 20 unmodified lines
52};53};
53use highlight_matching_bracket::refresh_matching_bracket_highlights;54use highlight_matching_bracket::refresh_matching_bracket_highlights;
54use hover_popover::{hide_hover, HoverState};55use hover_popover::{hide_hover, HoverState};
56use inlay_hint_cache::{InlayHintCache, InlaySplice, InvalidationStrategy};
55pub use items::MAX_TAB_TITLE_LEN;57pub use items::MAX_TAB_TITLE_LEN;
56use itertools::Itertools;58use itertools::Itertools;
57pub use language::{char_kind, CharKind};59pub use language::{char_kind, CharKind};
58use language::{60use language::{
59 language_settings::{self, all_language_settings},61 language_settings::{self, all_language_settings, InlayHintSettings},
60 AutoindentMode, BracketPair, Buffer, CodeAction, CodeLabel, Completion, CursorShape,62 AutoindentMode, BracketPair, Buffer, CodeAction, CodeLabel, Completion, CursorShape,
61 Diagnostic, DiagnosticSeverity, File, IndentKind, IndentSize, Language, OffsetRangeExt,63 Diagnostic, DiagnosticSeverity, File, IndentKind, IndentSize, Language, OffsetRangeExt,
62 OffsetUtf16, Point, Selection, SelectionGoal, TransactionId,64 OffsetUtf16, Point, Selection, SelectionGoal, TransactionId,
@@ -64,11 +66,12 @@ use language::{ · 1 unmodified line
64use link_go_to_definition::{66use link_go_to_definition::{
65 hide_link_definition, show_link_definition, LinkDefinitionKind, LinkGoToDefinitionState,67 hide_link_definition, show_link_definition, LinkDefinitionKind, LinkGoToDefinitionState,
66};68};
69use log::error;
70use multi_buffer::ToOffsetUtf16;
67pub use multi_buffer::{71pub use multi_buffer::{
68 Anchor, AnchorRangeExt, ExcerptId, ExcerptRange, MultiBuffer, MultiBufferSnapshot, ToOffset,72 Anchor, AnchorRangeExt, ExcerptId, ExcerptRange, MultiBuffer, MultiBufferSnapshot, ToOffset,
69 ToPoint,73 ToPoint,
70};74};
71use multi_buffer::{MultiBufferChunks, ToOffsetUtf16};
72use ordered_float::OrderedFloat;75use ordered_float::OrderedFloat;
73use project::{FormatTrigger, Location, LocationLink, Project, ProjectPath, ProjectTransaction};76use project::{FormatTrigger, Location, LocationLink, Project, ProjectPath, ProjectTransaction};
74use scroll::{77use scroll::{
@@ -85,12 +88,13 @@ use std::{ · 10 unmodified lines
85 cmp::{self, Ordering, Reverse},88 cmp::{self, Ordering, Reverse},
86 mem,89 mem,
87 num::NonZeroU32,90 num::NonZeroU32,
88 ops::{Deref, DerefMut, Range},91 ops::{ControlFlow, Deref, DerefMut, Range},
89 path::Path,92 path::Path,
90 sync::Arc,93 sync::Arc,
91 time::{Duration, Instant},94 time::{Duration, Instant},
92};95};
93pub use sum_tree::Bias;96pub use sum_tree::Bias;
97use text::Rope;
94use theme::{DiagnosticStyle, Theme, ThemeSettings};98use theme::{DiagnosticStyle, Theme, ThemeSettings};
95use util::{post_inc, RangeExt, ResultExt, TryFutureExt};99use util::{post_inc, RangeExt, ResultExt, TryFutureExt};
96use workspace::{ItemNavHistory, ViewId, Workspace};100use workspace::{ItemNavHistory, ViewId, Workspace};
@@ -180,6 +184,21 @@ pub struct GutterHover { · 83 unmodified lines
180 pub hovered: bool,184 pub hovered: bool,
181}185}
182 186
187#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
188pub enum InlayId {
189 Suggestion(usize),
190 Hint(usize),
191}
192
193impl InlayId {
194 fn id(&self) -> usize {
195 match self {
196 Self::Suggestion(id) => *id,
197 Self::Hint(id) => *id,
198 }
199 }
200}
201
183actions!(202actions!(
184 editor,203 editor,
185 [204 [
@@ -206,6 +225,7 @@ actions!( · 20 unmodified lines
206 DuplicateLine,225 DuplicateLine,
207 MoveLineUp,226 MoveLineUp,
208 MoveLineDown,227 MoveLineDown,
228 JoinLines,
209 Transpose,229 Transpose,
210 Cut,230 Cut,
211 Copy,231 Copy,
@@ -321,6 +341,7 @@ pub fn init(cx: &mut AppContext) { · 109 unmodified lines
321 cx.add_action(Editor::indent);341 cx.add_action(Editor::indent);
322 cx.add_action(Editor::outdent);342 cx.add_action(Editor::outdent);
323 cx.add_action(Editor::delete_line);343 cx.add_action(Editor::delete_line);
344 cx.add_action(Editor::join_lines);
324 cx.add_action(Editor::delete_to_previous_word_start);345 cx.add_action(Editor::delete_to_previous_word_start);
325 cx.add_action(Editor::delete_to_previous_subword_start);346 cx.add_action(Editor::delete_to_previous_subword_start);
326 cx.add_action(Editor::delete_to_next_word_end);347 cx.add_action(Editor::delete_to_next_word_end);
@@ -533,6 +554,8 @@ pub struct Editor { · 206 unmodified lines
533 gutter_hovered: bool,554 gutter_hovered: bool,
534 link_go_to_definition_state: LinkGoToDefinitionState,555 link_go_to_definition_state: LinkGoToDefinitionState,
535 copilot_state: CopilotState,556 copilot_state: CopilotState,
557 inlay_hint_cache: InlayHintCache,
558 next_inlay_id: usize,
536 _subscriptions: Vec<Subscription>,559 _subscriptions: Vec<Subscription>,
537}560}
538 561
@@ -1054,6 +1077,7 @@ pub struct CopilotState { · 515 unmodified lines
1054 cycled: bool,1077 cycled: bool,
1055 completions: Vec<copilot::Completion>,1078 completions: Vec<copilot::Completion>,
1056 active_completion_index: usize,1079 active_completion_index: usize,
1080 suggestion: Option<Inlay>,
1057}1081}
1058 1082
1059impl Default for CopilotState {1083impl Default for CopilotState {
@@ -1065,6 +1089,7 @@ impl Default for CopilotState { · 5 unmodified lines
1065 completions: Default::default(),1089 completions: Default::default(),
1066 active_completion_index: 0,1090 active_completion_index: 0,
1067 cycled: false,1091 cycled: false,
1092 suggestion: None,
1068 }1093 }
1069 }1094 }
1070}1095}
@@ -1179,6 +1204,14 @@ enum GotoDefinitionKind { · 108 unmodified lines
1179 Type,1204 Type,
1180}1205}
1181 1206
1207#[derive(Debug, Clone)]
1208enum InlayRefreshReason {
1209 SettingsChange(InlayHintSettings),
1210 NewLinesShown,
1211 BufferEdited(HashSet<Arc<Language>>),
1212 RefreshRequested,
1213}
1214
1182impl Editor {1215impl Editor {
1183 pub fn single_line(1216 pub fn single_line(
1184 field_editor_style: Option<Arc<GetFieldEditorTheme>>,1217 field_editor_style: Option<Arc<GetFieldEditorTheme>>,
@@ -1280,15 +1313,28 @@ impl Editor { · 95 unmodified lines
1280 let soft_wrap_mode_override =1313 let soft_wrap_mode_override =
1281 (mode == EditorMode::SingleLine).then(|| language_settings::SoftWrap::None);1314 (mode == EditorMode::SingleLine).then(|| language_settings::SoftWrap::None);
1282 1315
1283 let mut project_subscription = None;1316 let mut project_subscriptions = Vec::new();
1284 if mode == EditorMode::Full && buffer.read(cx).is_singleton() {1317 if mode == EditorMode::Full {
1285 if let Some(project) = project.as_ref() {1318 if let Some(project) = project.as_ref() {
1286 project_subscription = Some(cx.observe(project, |_, _, cx| {1319 if buffer.read(cx).is_singleton() {
1287 cx.emit(Event::TitleChanged);1320 project_subscriptions.push(cx.observe(project, |_, _, cx| {
1288 }))1321 cx.emit(Event::TitleChanged);
1322 }));
1323 }
1324 project_subscriptions.push(cx.subscribe(project, |editor, _, event, cx| {
1325 if let project::Event::RefreshInlays = event {
1326 editor.refresh_inlays(InlayRefreshReason::RefreshRequested, cx);
1327 };
1328 }));
1289 }1329 }
1290 }1330 }
1291 1331
1332 let inlay_hint_settings = inlay_hint_settings(
1333 selections.newest_anchor().head(),
1334 &buffer.read(cx).snapshot(cx),
1335 cx,
1336 );
1337
1292 let mut this = Self {1338 let mut this = Self {
1293 handle: cx.weak_handle(),1339 handle: cx.weak_handle(),
1294 buffer: buffer.clone(),1340 buffer: buffer.clone(),
@@ -1322,6 +1368,7 @@ impl Editor { · 27 unmodified lines
1322 .add_view(|cx| context_menu::ContextMenu::new(editor_view_id, cx)),1368 .add_view(|cx| context_menu::ContextMenu::new(editor_view_id, cx)),
1323 completion_tasks: Default::default(),1369 completion_tasks: Default::default(),
1324 next_completion_id: 0,1370 next_completion_id: 0,
1371 next_inlay_id: 0,
1325 available_code_actions: Default::default(),1372 available_code_actions: Default::default(),
1326 code_actions_task: Default::default(),1373 code_actions_task: Default::default(),
1327 document_highlights_task: Default::default(),1374 document_highlights_task: Default::default(),
@@ -1338,6 +1385,7 @@ impl Editor { · 10 unmodified lines
1338 hover_state: Default::default(),1385 hover_state: Default::default(),
1339 link_go_to_definition_state: Default::default(),1386 link_go_to_definition_state: Default::default(),
1340 copilot_state: Default::default(),1387 copilot_state: Default::default(),
1388 inlay_hint_cache: InlayHintCache::new(inlay_hint_settings),
1341 gutter_hovered: false,1389 gutter_hovered: false,
1342 _subscriptions: vec![1390 _subscriptions: vec![
1343 cx.observe(&buffer, Self::on_buffer_changed),1391 cx.observe(&buffer, Self::on_buffer_changed),
@@ -1348,9 +1396,7 @@ impl Editor { · 4 unmodified lines
1348 ],1396 ],
1349 };1397 };
1350 1398
1351 if let Some(project_subscription) = project_subscription {1399 this._subscriptions.extend(project_subscriptions);
1352 this._subscriptions.push(project_subscription);
1353 }
1354 1400
1355 this.end_selection(cx);1401 this.end_selection(cx);
1356 this.scroll_manager.show_scrollbar(cx);1402 this.scroll_manager.show_scrollbar(cx);
@@ -1871,7 +1917,7 @@ impl Editor { · 514 unmodified lines
1871 s.set_pending(pending, mode);1917 s.set_pending(pending, mode);
1872 });1918 });
1873 } else {1919 } else {
1874 log::error!("update_selection dispatched with no pending selection");1920 error!("update_selection dispatched with no pending selection");
1875 return;1921 return;
1876 }1922 }
1877 1923
@@ -1989,6 +2035,7 @@ impl Editor { · 111 unmodified lines
1989 }2035 }
1990 2036
1991 let selections = self.selections.all_adjusted(cx);2037 let selections = self.selections.all_adjusted(cx);
2038 let mut brace_inserted = false;
1992 let mut edits = Vec::new();2039 let mut edits = Vec::new();
1993 let mut new_selections = Vec::with_capacity(selections.len());2040 let mut new_selections = Vec::with_capacity(selections.len());
1994 let mut new_autoclose_regions = Vec::new();2041 let mut new_autoclose_regions = Vec::new();
@@ -2047,6 +2094,7 @@ impl Editor { · 52 unmodified lines
2047 selection.range(),2094 selection.range(),
2048 format!("{}{}", text, bracket_pair.end).into(),2095 format!("{}{}", text, bracket_pair.end).into(),
2049 ));2096 ));
2097 brace_inserted = true;
2050 continue;2098 continue;
2051 }2099 }
2052 }2100 }
@@ -2073,6 +2121,7 @@ impl Editor { · 20 unmodified lines
2073 selection.end..selection.end,2121 selection.end..selection.end,
2074 bracket_pair.end.as_str().into(),2122 bracket_pair.end.as_str().into(),
2075 ));2123 ));
2124 brace_inserted = true;
2076 new_selections.push((2125 new_selections.push((
2077 Selection {2126 Selection {
2078 id: selection.id,2127 id: selection.id,
@@ -2140,8 +2189,7 @@ impl Editor { · 61 unmodified lines
2140 let had_active_copilot_suggestion = this.has_active_copilot_suggestion(cx);2189 let had_active_copilot_suggestion = this.has_active_copilot_suggestion(cx);
2141 this.change_selections(Some(Autoscroll::fit()), cx, |s| s.select(new_selections));2190 this.change_selections(Some(Autoscroll::fit()), cx, |s| s.select(new_selections));
2142 2191
2143 // When buffer contents is updated and caret is moved, try triggering on type formatting.2192 if !brace_inserted && settings::get::<EditorSettings>(cx).use_on_type_format {
2144 if settings::get::<EditorSettings>(cx).use_on_type_format {
2145 if let Some(on_type_format_task) =2193 if let Some(on_type_format_task) =
2146 this.trigger_on_type_formatting(text.to_string(), cx)2194 this.trigger_on_type_formatting(text.to_string(), cx)
2147 {2195 {
@@ -2575,6 +2623,108 @@ impl Editor { · 427 unmodified lines
2575 }2623 }
2576 }2624 }
2577 2625
2626 fn refresh_inlays(&mut self, reason: InlayRefreshReason, cx: &mut ViewContext<Self>) {
2627 if self.project.is_none() || self.mode != EditorMode::Full {
2628 return;
2629 }
2630
2631 let (invalidate_cache, required_languages) = match reason {
2632 InlayRefreshReason::SettingsChange(new_settings) => {
2633 match self.inlay_hint_cache.update_settings(
2634 &self.buffer,
2635 new_settings,
2636 self.visible_inlay_hints(cx),
2637 cx,
2638 ) {
2639 ControlFlow::Break(Some(InlaySplice {
2640 to_remove,
2641 to_insert,
2642 })) => {
2643 self.splice_inlay_hints(to_remove, to_insert, cx);
2644 return;
2645 }
2646 ControlFlow::Break(None) => return,
2647 ControlFlow::Continue(()) => (InvalidationStrategy::RefreshRequested, None),
2648 }
2649 }
2650 InlayRefreshReason::NewLinesShown => (InvalidationStrategy::None, None),
2651 InlayRefreshReason::BufferEdited(buffer_languages) => {
2652 (InvalidationStrategy::BufferEdited, Some(buffer_languages))
2653 }
2654 InlayRefreshReason::RefreshRequested => (InvalidationStrategy::RefreshRequested, None),
2655 };
2656
2657 self.inlay_hint_cache.refresh_inlay_hints(
2658 self.excerpt_visible_offsets(required_languages.as_ref(), cx),
2659 invalidate_cache,
2660 cx,
2661 )
2662 }
2663
2664 fn visible_inlay_hints(&self, cx: &ViewContext<'_, '_, Editor>) -> Vec<Inlay> {
2665 self.display_map
2666 .read(cx)
2667 .current_inlays()
2668 .filter(move |inlay| {
2669 Some(inlay.id) != self.copilot_state.suggestion.as_ref().map(|h| h.id)
2670 })
2671 .cloned()
2672 .collect()
2673 }
2674
2675 fn excerpt_visible_offsets(
2676 &self,
2677 restrict_to_languages: Option<&HashSet<Arc<Language>>>,
2678 cx: &mut ViewContext<'_, '_, Editor>,
2679 ) -> HashMap<ExcerptId, (ModelHandle<Buffer>, Global, Range<usize>)> {
2680 let multi_buffer = self.buffer().read(cx);
2681 let multi_buffer_snapshot = multi_buffer.snapshot(cx);
2682 let multi_buffer_visible_start = self
2683 .scroll_manager
2684 .anchor()
2685 .anchor
2686 .to_point(&multi_buffer_snapshot);
2687 let multi_buffer_visible_end = multi_buffer_snapshot.clip_point(
2688 multi_buffer_visible_start
2689 + Point::new(self.visible_line_count().unwrap_or(0.).ceil() as u32, 0),
2690 Bias::Left,
2691 );
2692 let multi_buffer_visible_range = multi_buffer_visible_start..multi_buffer_visible_end;
2693 multi_buffer
2694 .range_to_buffer_ranges(multi_buffer_visible_range, cx)
2695 .into_iter()
2696 .filter(|(_, excerpt_visible_range, _)| !excerpt_visible_range.is_empty())
2697 .filter_map(|(buffer_handle, excerpt_visible_range, excerpt_id)| {
2698 let buffer = buffer_handle.read(cx);
2699 let language = buffer.language()?;
2700 if let Some(restrict_to_languages) = restrict_to_languages {
2701 if !restrict_to_languages.contains(language) {
2702 return None;
2703 }
2704 }
2705 Some((
2706 excerpt_id,
2707 (
2708 buffer_handle,
2709 buffer.version().clone(),
2710 excerpt_visible_range,
2711 ),
2712 ))
2713 })
2714 .collect()
2715 }
2716
2717 fn splice_inlay_hints(
2718 &self,
2719 to_remove: Vec<InlayId>,
2720 to_insert: Vec<Inlay>,
2721 cx: &mut ViewContext<Self>,
2722 ) {
2723 self.display_map.update(cx, |display_map, cx| {
2724 display_map.splice_inlays(to_remove, to_insert, cx);
2725 });
2726 }
2727
2578 fn trigger_on_type_formatting(2728 fn trigger_on_type_formatting(
2579 &self,2729 &self,
2580 input: String,2730 input: String,
@@ -3225,10 +3375,7 @@ impl Editor { · 644 unmodified lines
3225 }3375 }
3226 3376
3227 fn accept_copilot_suggestion(&mut self, cx: &mut ViewContext<Self>) -> bool {3377 fn accept_copilot_suggestion(&mut self, cx: &mut ViewContext<Self>) -> bool {
3228 if let Some(suggestion) = self3378 if let Some(suggestion) = self.take_active_copilot_suggestion(cx) {
3229 .display_map
3230 .update(cx, |map, cx| map.replace_suggestion::<usize>(None, cx))
3231 {
3232 if let Some((copilot, completion)) =3379 if let Some((copilot, completion)) =
3233 Copilot::global(cx).zip(self.copilot_state.active_completion())3380 Copilot::global(cx).zip(self.copilot_state.active_completion())
3234 {3381 {
@@ -3247,7 +3394,7 @@ impl Editor { · 12 unmodified lines
3247 }3394 }
3248 3395
3249 fn discard_copilot_suggestion(&mut self, cx: &mut ViewContext<Self>) -> bool {3396 fn discard_copilot_suggestion(&mut self, cx: &mut ViewContext<Self>) -> bool {
3250 if self.has_active_copilot_suggestion(cx) {3397 if let Some(suggestion) = self.take_active_copilot_suggestion(cx) {
3251 if let Some(copilot) = Copilot::global(cx) {3398 if let Some(copilot) = Copilot::global(cx) {
3252 copilot3399 copilot
3253 .update(cx, |copilot, cx| {3400 .update(cx, |copilot, cx| {
@@ -3258,8 +3405,9 @@ impl Editor { · 4 unmodified lines
3258 self.report_copilot_event(None, false, cx)3405 self.report_copilot_event(None, false, cx)
3259 }3406 }
3260 3407
3261 self.display_map3408 self.display_map.update(cx, |map, cx| {
3262 .update(cx, |map, cx| map.replace_suggestion::<usize>(None, cx));3409 map.splice_inlays(vec![suggestion.id], Vec::new(), cx)
3410 });
3263 cx.notify();3411 cx.notify();
3264 true3412 true
3265 } else {3413 } else {
@@ -3280,7 +3428,26 @@ impl Editor { · 14 unmodified lines
3280 }3428 }
3281 3429
3282 fn has_active_copilot_suggestion(&self, cx: &AppContext) -> bool {3430 fn has_active_copilot_suggestion(&self, cx: &AppContext) -> bool {
3283 self.display_map.read(cx).has_suggestion()3431 if let Some(suggestion) = self.copilot_state.suggestion.as_ref() {
3432 let buffer = self.buffer.read(cx).read(cx);
3433 suggestion.position.is_valid(&buffer)
3434 } else {
3435 false
3436 }
3437 }
3438
3439 fn take_active_copilot_suggestion(&mut self, cx: &mut ViewContext<Self>) -> Option<Inlay> {
3440 let suggestion = self.copilot_state.suggestion.take()?;
3441 self.display_map.update(cx, |map, cx| {
3442 map.splice_inlays(vec![suggestion.id], Default::default(), cx);
3443 });
3444 let buffer = self.buffer.read(cx).read(cx);
3445
3446 if suggestion.position.is_valid(&buffer) {
3447 Some(suggestion)
3448 } else {
3449 None
3450 }
3284 }3451 }
3285 3452
3286 fn update_visible_copilot_suggestion(&mut self, cx: &mut ViewContext<Self>) {3453 fn update_visible_copilot_suggestion(&mut self, cx: &mut ViewContext<Self>) {
@@ -3297,14 +3464,17 @@ impl Editor { · 10 unmodified lines
3297 .copilot_state3464 .copilot_state
3298 .text_for_active_completion(cursor, &snapshot)3465 .text_for_active_completion(cursor, &snapshot)
3299 {3466 {
3467 let text = Rope::from(text);
3468 let mut to_remove = Vec::new();
3469 if let Some(suggestion) = self.copilot_state.suggestion.take() {
3470 to_remove.push(suggestion.id);
3471 }
3472
3473 let suggestion_inlay =
3474 Inlay::suggestion(post_inc(&mut self.next_inlay_id), cursor, text);
3475 self.copilot_state.suggestion = Some(suggestion_inlay.clone());
3300 self.display_map.update(cx, move |map, cx| {3476 self.display_map.update(cx, move |map, cx| {
3301 map.replace_suggestion(3477 map.splice_inlays(to_remove, vec![suggestion_inlay], cx)
3302 Some(Suggestion {
3303 position: cursor,
3304 text: text.trim_end().into(),
3305 }),
3306 cx,
3307 )
3308 });3478 });
3309 cx.notify();3479 cx.notify();
3310 } else {3480 } else {
@@ -3320,15 +3490,21 @@ impl Editor { · 9 unmodified lines
3320 pub fn render_code_actions_indicator(3490 pub fn render_code_actions_indicator(
3321 &self,3491 &self,
3322 style: &EditorStyle,3492 style: &EditorStyle,
3323 active: bool,3493 is_active: bool,
3324 cx: &mut ViewContext<Self>,3494 cx: &mut ViewContext<Self>,
3325 ) -> Option<AnyElement<Self>> {3495 ) -> Option<AnyElement<Self>> {
3326 if self.available_code_actions.is_some() {3496 if self.available_code_actions.is_some() {
3327 enum CodeActions {}3497 enum CodeActions {}
3328 Some(3498 Some(
3329 MouseEventHandler::<CodeActions, _>::new(0, cx, |state, _| {3499 MouseEventHandler::<CodeActions, _>::new(0, cx, |state, _| {
3330 Svg::new("icons/bolt_8.svg")3500 Svg::new("icons/bolt_8.svg").with_color(
3331 .with_color(style.code_actions.indicator.style_for(state, active).color)3501 style
3502 .code_actions
3503 .indicator
3504 .in_state(is_active)
3505 .style_for(state)
3506 .color,
3507 )
3332 })3508 })
3333 .with_cursor_style(CursorStyle::PointingHand)3509 .with_cursor_style(CursorStyle::PointingHand)
3334 .with_padding(Padding::uniform(3.))3510 .with_padding(Padding::uniform(3.))
@@ -3378,10 +3554,8 @@ impl Editor { · 43 unmodified lines
3378 .with_color(3554 .with_color(
3379 style3555 style
3380 .indicator3556 .indicator
3381 .style_for(3557 .in_state(fold_status == FoldStatus::Folded)
3382 mouse_state,3558 .style_for(mouse_state)
3383 fold_status == FoldStatus::Folded,
3384 )
3385 .color,3559 .color,
3386 )3560 )
3387 .constrained()3561 .constrained()
@@ -3952,6 +4126,60 @@ impl Editor { · 564 unmodified lines
3952 });4126 });
3953 }4127 }
3954 4128
4129 pub fn join_lines(&mut self, _: &JoinLines, cx: &mut ViewContext<Self>) {
4130 let mut row_ranges = Vec::<Range<u32>>::new();
4131 for selection in self.selections.all::<Point>(cx) {
4132 let start = selection.start.row;
4133 let end = if selection.start.row == selection.end.row {
4134 selection.start.row + 1
4135 } else {
4136 selection.end.row
4137 };
4138
4139 if let Some(last_row_range) = row_ranges.last_mut() {
4140 if start <= last_row_range.end {
4141 last_row_range.end = end;
4142 continue;
4143 }
4144 }
4145 row_ranges.push(start..end);
4146 }
4147
4148 let snapshot = self.buffer.read(cx).snapshot(cx);
4149 let mut cursor_positions = Vec::new();
4150 for row_range in &row_ranges {
4151 let anchor = snapshot.anchor_before(Point::new(
4152 row_range.end - 1,
4153 snapshot.line_len(row_range.end - 1),
4154 ));
4155 cursor_positions.push(anchor.clone()..anchor);
4156 }
4157
4158 self.transact(cx, |this, cx| {
4159 for row_range in row_ranges.into_iter().rev() {
4160 for row in row_range.rev() {
4161 let end_of_line = Point::new(row, snapshot.line_len(row));
4162 let indent = snapshot.indent_size_for_line(row + 1);
4163 let start_of_next_line = Point::new(row + 1, indent.len);
4164
4165 let replace = if snapshot.line_len(row + 1) > indent.len {
4166 " "
4167 } else {
4168 ""
4169 };
4170
4171 this.buffer.update(cx, |buffer, cx| {
4172 buffer.edit([(end_of_line..start_of_next_line, replace)], None, cx)
4173 });
4174 }
4175 }
4176
4177 this.change_selections(Some(Autoscroll::fit()), cx, |s| {
4178 s.select_anchor_ranges(cursor_positions)
4179 });
4180 });
4181 }
4182
3955 pub fn duplicate_line(&mut self, _: &DuplicateLine, cx: &mut ViewContext<Self>) {4183 pub fn duplicate_line(&mut self, _: &DuplicateLine, cx: &mut ViewContext<Self>) {
3956 let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));4184 let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
3957 let buffer = &display_map.buffer_snapshot;4185 let buffer = &display_map.buffer_snapshot;
@@ -6581,7 +6809,7 @@ impl Editor { · 2623 unmodified lines
6581 if let Some((_, end_selections)) = self.selection_history.transaction_mut(tx_id) {6809 if let Some((_, end_selections)) = self.selection_history.transaction_mut(tx_id) {
6582 *end_selections = Some(self.selections.disjoint_anchors());6810 *end_selections = Some(self.selections.disjoint_anchors());
6583 } else {6811 } else {
6584 log::error!("unexpectedly ended a transaction that wasn't started by this editor");6812 error!("unexpectedly ended a transaction that wasn't started by this editor");
6585 }6813 }
6586 6814
6587 cx.emit(Event::Edited);6815 cx.emit(Event::Edited);
@@ -7031,7 +7259,7 @@ impl Editor { · 443 unmodified lines
7031 7259
7032 fn on_buffer_event(7260 fn on_buffer_event(
7033 &mut self,7261 &mut self,
7034 _: ModelHandle<MultiBuffer>,7262 multibuffer: ModelHandle<MultiBuffer>,
7035 event: &multi_buffer::Event,7263 event: &multi_buffer::Event,
7036 cx: &mut ViewContext<Self>,7264 cx: &mut ViewContext<Self>,
7037 ) {7265 ) {
@@ -7043,6 +7271,33 @@ impl Editor { · 5 unmodified lines
7043 self.update_visible_copilot_suggestion(cx);7271 self.update_visible_copilot_suggestion(cx);
7044 }7272 }
7045 cx.emit(Event::BufferEdited);7273 cx.emit(Event::BufferEdited);
7274
7275 if let Some(project) = &self.project {
7276 let project = project.read(cx);
7277 let languages_affected = multibuffer
7278 .read(cx)
7279 .all_buffers()
7280 .into_iter()
7281 .filter_map(|buffer| {
7282 let buffer = buffer.read(cx);
7283 let language = buffer.language()?;
7284 if project.is_local()
7285 && project.language_servers_for_buffer(buffer, cx).count() == 0
7286 {
7287 None
7288 } else {
7289 Some(language)
7290 }
7291 })
7292 .cloned()
7293 .collect::<HashSet<_>>();
7294 if !languages_affected.is_empty() {
7295 self.refresh_inlays(
7296 InlayRefreshReason::BufferEdited(languages_affected),
7297 cx,
7298 );
7299 }
7300 }
7046 }7301 }
7047 multi_buffer::Event::ExcerptsAdded {7302 multi_buffer::Event::ExcerptsAdded {
7048 buffer,7303 buffer,
@@ -7067,7 +7322,7 @@ impl Editor { · 18 unmodified lines
7067 self.refresh_active_diagnostics(cx);7322 self.refresh_active_diagnostics(cx);
7068 }7323 }
7069 _ => {}7324 _ => {}
7070 }7325 };
7071 }7326 }
7072 7327
7073 fn on_display_map_changed(&mut self, _: ModelHandle<DisplayMap>, cx: &mut ViewContext<Self>) {7328 fn on_display_map_changed(&mut self, _: ModelHandle<DisplayMap>, cx: &mut ViewContext<Self>) {
@@ -7076,6 +7331,14 @@ impl Editor { · 2 unmodified lines
7076 7331
7077 fn settings_changed(&mut self, cx: &mut ViewContext<Self>) {7332 fn settings_changed(&mut self, cx: &mut ViewContext<Self>) {
7078 self.refresh_copilot_suggestions(true, cx);7333 self.refresh_copilot_suggestions(true, cx);
7334 self.refresh_inlays(
7335 InlayRefreshReason::SettingsChange(inlay_hint_settings(
7336 self.selections.newest_anchor().head(),
7337 &self.buffer.read(cx).snapshot(cx),
7338 cx,
7339 )),
7340 cx,
7341 );
7079 }7342 }
7080 7343
7081 pub fn set_searchable(&mut self, searchable: bool) {7344 pub fn set_searchable(&mut self, searchable: bool) {
@@ -7365,6 +7628,23 @@ impl Editor { · 283 unmodified lines
7365 let Some(lines) = serde_json::to_string_pretty(&lines).log_err() else { return; };7628 let Some(lines) = serde_json::to_string_pretty(&lines).log_err() else { return; };
7366 cx.write_to_clipboard(ClipboardItem::new(lines));7629 cx.write_to_clipboard(ClipboardItem::new(lines));
7367 }7630 }
7631
7632 pub fn inlay_hint_cache(&self) -> &InlayHintCache {
7633 &self.inlay_hint_cache
7634 }
7635}
7636
7637fn inlay_hint_settings(
7638 location: Anchor,
7639 snapshot: &MultiBufferSnapshot,
7640 cx: &mut ViewContext<'_, '_, Editor>,
7641) -> InlayHintSettings {
7642 let file = snapshot.file_at(location);
7643 let language = snapshot.language_at(location);
7644 let settings = all_language_settings(file, cx);
7645 settings
7646 .language(language.map(|l| l.name()).as_deref())
7647 .inlay_hints
7368}7648}
7369 7649
7370fn consume_contiguous_rows(7650fn consume_contiguous_rows(
@@ -7581,8 +7861,14 @@ impl View for Editor { · 210 unmodified lines
7581 keymap.add_identifier("renaming");7861 keymap.add_identifier("renaming");
7582 }7862 }
7583 match self.context_menu.as_ref() {7863 match self.context_menu.as_ref() {
7584 Some(ContextMenu::Completions(_)) => keymap.add_identifier("showing_completions"),7864 Some(ContextMenu::Completions(_)) => {
7585 Some(ContextMenu::CodeActions(_)) => keymap.add_identifier("showing_code_actions"),7865 keymap.add_identifier("menu");
7866 keymap.add_identifier("showing_completions")
7867 }
7868 Some(ContextMenu::CodeActions(_)) => {
7869 keymap.add_identifier("menu");
7870 keymap.add_identifier("showing_code_actions")
7871 }
7586 None => {}7872 None => {}
7587 }7873 }
7588 for layer in self.keymap_context_layers.values() {7874 for layer in self.keymap_context_layers.values() {
@@ -7949,6 +8235,7 @@ impl Deref for EditorStyle { · 360 unmodified lines
7949 8235
7950pub fn diagnostic_block_renderer(diagnostic: Diagnostic, is_valid: bool) -> RenderBlock {8236pub fn diagnostic_block_renderer(diagnostic: Diagnostic, is_valid: bool) -> RenderBlock {
7951 let mut highlighted_lines = Vec::new();8237 let mut highlighted_lines = Vec::new();
8238
7952 for (index, line) in diagnostic.message.lines().enumerate() {8239 for (index, line) in diagnostic.message.lines().enumerate() {
7953 let line = match &diagnostic.source {8240 let line = match &diagnostic.source {
7954 Some(source) if index == 0 => {8241 Some(source) if index == 0 => {
@@ -7960,25 +8247,44 @@ pub fn diagnostic_block_renderer(diagnostic: Diagnostic, is_valid: bool) -> Rend · 5 unmodified lines
7960 };8247 };
7961 highlighted_lines.push(line);8248 highlighted_lines.push(line);
7962 }8249 }
7963 8250 let message = diagnostic.message;
7964 Arc::new(move |cx: &mut BlockContext| {8251 Arc::new(move |cx: &mut BlockContext| {
8252 let message = message.clone();
7965 let settings = settings::get::<ThemeSettings>(cx);8253 let settings = settings::get::<ThemeSettings>(cx);
8254 let tooltip_style = settings.theme.tooltip.clone();
7966 let theme = &settings.theme.editor;8255 let theme = &settings.theme.editor;
7967 let style = diagnostic_style(diagnostic.severity, is_valid, theme);8256 let style = diagnostic_style(diagnostic.severity, is_valid, theme);
7968 let font_size = (style.text_scale_factor * settings.buffer_font_size(cx)).round();8257 let font_size = (style.text_scale_factor * settings.buffer_font_size(cx)).round();
7969 Flex::column()8258 let anchor_x = cx.anchor_x;
7970 .with_children(highlighted_lines.iter().map(|(line, highlights)| {8259 enum BlockContextToolip {}
7971 Label::new(8260 MouseEventHandler::<BlockContext, _>::new(cx.block_id, cx, |_, _| {
7972 line.clone(),8261 Flex::column()
7973 style.message.clone().with_font_size(font_size),8262 .with_children(highlighted_lines.iter().map(|(line, highlights)| {
7974 )8263 Label::new(
7975 .with_highlights(highlights.clone())8264 line.clone(),
7976 .contained()8265 style.message.clone().with_font_size(font_size),
7977 .with_margin_left(cx.anchor_x)8266 )
7978 }))8267 .with_highlights(highlights.clone())
7979 .aligned()8268 .contained()
7980 .left()8269 .with_margin_left(anchor_x)
7981 .into_any()8270 }))
8271 .aligned()
8272 .left()
8273 .into_any()
8274 })
8275 .with_cursor_style(CursorStyle::PointingHand)
8276 .on_click(MouseButton::Left, move |_, _, cx| {
8277 cx.write_to_clipboard(ClipboardItem::new(message.clone()));
8278 })
8279 // We really need to rethink this ID system...
8280 .with_tooltip::<BlockContextToolip>(
8281 cx.block_id,
8282 "Copy diagnostic message".to_string(),
8283 None,
8284 tooltip_style,
8285 cx,
8286 )
8287 .into_any()
7982 })8288 })
7983}8289}
7984 8290
crates/editor/src/editor_tests.rs+280−3
@@ -1,7 +1,11 @@
1use super::*;1use super::*;
2use crate::test::{2use crate::{
3 assert_text_with_selections, build_editor, editor_lsp_test_context::EditorLspTestContext,3 scroll::scroll_amount::ScrollAmount,
4 editor_test_context::EditorTestContext, select_ranges,4 test::{
5 assert_text_with_selections, build_editor, editor_lsp_test_context::EditorLspTestContext,
6 editor_test_context::EditorTestContext, select_ranges,
7 },
8 JoinLines,
5};9};
6use drag_and_drop::DragAndDrop;10use drag_and_drop::DragAndDrop;
7use futures::StreamExt;11use futures::StreamExt;
@@ -1356,6 +1360,43 @@ async fn test_move_start_of_paragraph_end_of_paragraph(cx: &mut gpui::TestAppCon · 1348 unmodified lines
1356 );1360 );
1357}1361}
1358 1362
1363#[gpui::test]
1364async fn test_scroll_page_up_page_down(cx: &mut gpui::TestAppContext) {
1365 init_test(cx, |_| {});
1366 let mut cx = EditorTestContext::new(cx).await;
1367 let line_height = cx.editor(|editor, cx| editor.style(cx).text.line_height(cx.font_cache()));
1368 cx.simulate_window_resize(cx.window_id, vec2f(1000., 4. * line_height + 0.5));
1369
1370 cx.set_state(
1371 &r#"ˇone
1372 two
1373 three
1374 four
1375 five
1376 six
1377 seven
1378 eight
1379 nine
1380 ten
1381 "#,
1382 );
1383
1384 cx.update_editor(|editor, cx| {
1385 assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 0.));
1386 editor.scroll_screen(&ScrollAmount::Page(1.), cx);
1387 assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 3.));
1388 editor.scroll_screen(&ScrollAmount::Page(1.), cx);
1389 assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 6.));
1390 editor.scroll_screen(&ScrollAmount::Page(-1.), cx);
1391 assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 3.));
1392
1393 editor.scroll_screen(&ScrollAmount::Page(-0.5), cx);
1394 assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 2.));
1395 editor.scroll_screen(&ScrollAmount::Page(0.5), cx);
1396 assert_eq!(editor.snapshot(cx).scroll_position(), vec2f(0., 3.));
1397 });
1398}
1399
1359#[gpui::test]1400#[gpui::test]
1360async fn test_move_page_up_page_down(cx: &mut gpui::TestAppContext) {1401async fn test_move_page_up_page_down(cx: &mut gpui::TestAppContext) {
1361 init_test(cx, |_| {});1402 init_test(cx, |_| {});
@@ -2325,6 +2366,137 @@ fn test_delete_line(cx: &mut TestAppContext) { · 963 unmodified lines
2325 });2366 });
2326}2367}
2327 2368
2369#[gpui::test]
2370fn test_join_lines_with_single_selection(cx: &mut TestAppContext) {
2371 init_test(cx, |_| {});
2372
2373 cx.add_window(|cx| {
2374 let buffer = MultiBuffer::build_simple("aaa\nbbb\nccc\nddd\n\n", cx);
2375 let mut editor = build_editor(buffer.clone(), cx);
2376 let buffer = buffer.read(cx).as_singleton().unwrap();
2377
2378 assert_eq!(
2379 editor.selections.ranges::<Point>(cx),
2380 &[Point::new(0, 0)..Point::new(0, 0)]
2381 );
2382
2383 // When on single line, replace newline at end by space
2384 editor.join_lines(&JoinLines, cx);
2385 assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd\n\n");
2386 assert_eq!(
2387 editor.selections.ranges::<Point>(cx),
2388 &[Point::new(0, 3)..Point::new(0, 3)]
2389 );
2390
2391 // When multiple lines are selected, remove newlines that are spanned by the selection
2392 editor.change_selections(None, cx, |s| {
2393 s.select_ranges([Point::new(0, 5)..Point::new(2, 2)])
2394 });
2395 editor.join_lines(&JoinLines, cx);
2396 assert_eq!(buffer.read(cx).text(), "aaa bbb ccc ddd\n\n");
2397 assert_eq!(
2398 editor.selections.ranges::<Point>(cx),
2399 &[Point::new(0, 11)..Point::new(0, 11)]
2400 );
2401
2402 // Undo should be transactional
2403 editor.undo(&Undo, cx);
2404 assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd\n\n");
2405 assert_eq!(
2406 editor.selections.ranges::<Point>(cx),
2407 &[Point::new(0, 5)..Point::new(2, 2)]
2408 );
2409
2410 // When joining an empty line don't insert a space
2411 editor.change_selections(None, cx, |s| {
2412 s.select_ranges([Point::new(2, 1)..Point::new(2, 2)])
2413 });
2414 editor.join_lines(&JoinLines, cx);
2415 assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd\n");
2416 assert_eq!(
2417 editor.selections.ranges::<Point>(cx),
2418 [Point::new(2, 3)..Point::new(2, 3)]
2419 );
2420
2421 // We can remove trailing newlines
2422 editor.join_lines(&JoinLines, cx);
2423 assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd");
2424 assert_eq!(
2425 editor.selections.ranges::<Point>(cx),
2426 [Point::new(2, 3)..Point::new(2, 3)]
2427 );
2428
2429 // We don't blow up on the last line
2430 editor.join_lines(&JoinLines, cx);
2431 assert_eq!(buffer.read(cx).text(), "aaa bbb\nccc\nddd");
2432 assert_eq!(
2433 editor.selections.ranges::<Point>(cx),
2434 [Point::new(2, 3)..Point::new(2, 3)]
2435 );
2436
2437 // reset to test indentation
2438 editor.buffer.update(cx, |buffer, cx| {
2439 buffer.edit(
2440 [
2441 (Point::new(1, 0)..Point::new(1, 2), " "),
2442 (Point::new(2, 0)..Point::new(2, 3), " \n\td"),
2443 ],
2444 None,
2445 cx,
2446 )
2447 });
2448
2449 // We remove any leading spaces
2450 assert_eq!(buffer.read(cx).text(), "aaa bbb\n c\n \n\td");
2451 editor.change_selections(None, cx, |s| {
2452 s.select_ranges([Point::new(0, 1)..Point::new(0, 1)])
2453 });
2454 editor.join_lines(&JoinLines, cx);
2455 assert_eq!(buffer.read(cx).text(), "aaa bbb c\n \n\td");
2456
2457 // We don't insert a space for a line containing only spaces
2458 editor.join_lines(&JoinLines, cx);
2459 assert_eq!(buffer.read(cx).text(), "aaa bbb c\n\td");
2460
2461 // We ignore any leading tabs
2462 editor.join_lines(&JoinLines, cx);
2463 assert_eq!(buffer.read(cx).text(), "aaa bbb c d");
2464
2465 editor
2466 });
2467}
2468
2469#[gpui::test]
2470fn test_join_lines_with_multi_selection(cx: &mut TestAppContext) {
2471 init_test(cx, |_| {});
2472
2473 cx.add_window(|cx| {
2474 let buffer = MultiBuffer::build_simple("aaa\nbbb\nccc\nddd\n\n", cx);
2475 let mut editor = build_editor(buffer.clone(), cx);
2476 let buffer = buffer.read(cx).as_singleton().unwrap();
2477
2478 editor.change_selections(None, cx, |s| {
2479 s.select_ranges([
2480 Point::new(0, 2)..Point::new(1, 1),
2481 Point::new(1, 2)..Point::new(1, 2),
2482 Point::new(3, 1)..Point::new(3, 2),
2483 ])
2484 });
2485
2486 editor.join_lines(&JoinLines, cx);
2487 assert_eq!(buffer.read(cx).text(), "aaa bbb ccc\nddd\n");
2488
2489 assert_eq!(
2490 editor.selections.ranges::<Point>(cx),
2491 [
2492 Point::new(0, 7)..Point::new(0, 7),
2493 Point::new(1, 3)..Point::new(1, 3)
2494 ]
2495 );
2496 editor
2497 });
2498}
2499
2328#[gpui::test]2500#[gpui::test]
2329fn test_duplicate_line(cx: &mut TestAppContext) {2501fn test_duplicate_line(cx: &mut TestAppContext) {
2330 init_test(cx, |_| {});2502 init_test(cx, |_| {});
@@ -6807,6 +6979,111 @@ async fn test_copilot_disabled_globs( · 4476 unmodified lines
6807 assert!(copilot_requests.try_next().is_ok());6979 assert!(copilot_requests.try_next().is_ok());
6808}6980}
6809 6981
6982#[gpui::test]
6983async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
6984 init_test(cx, |_| {});
6985
6986 let mut language = Language::new(
6987 LanguageConfig {
6988 name: "Rust".into(),
6989 path_suffixes: vec!["rs".to_string()],
6990 brackets: BracketPairConfig {
6991 pairs: vec![BracketPair {
6992 start: "{".to_string(),
6993 end: "}".to_string(),
6994 close: true,
6995 newline: true,
6996 }],
6997 disabled_scopes_by_bracket_ix: Vec::new(),
6998 },
6999 ..Default::default()
7000 },
7001 Some(tree_sitter_rust::language()),
7002 );
7003 let mut fake_servers = language
7004 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
7005 capabilities: lsp::ServerCapabilities {
7006 document_on_type_formatting_provider: Some(lsp::DocumentOnTypeFormattingOptions {
7007 first_trigger_character: "{".to_string(),
7008 more_trigger_character: None,
7009 }),
7010 ..Default::default()
7011 },
7012 ..Default::default()
7013 }))
7014 .await;
7015
7016 let fs = FakeFs::new(cx.background());
7017 fs.insert_tree(
7018 "/a",
7019 json!({
7020 "main.rs": "fn main() { let a = 5; }",
7021 "other.rs": "// Test file",
7022 }),
7023 )
7024 .await;
7025 let project = Project::test(fs, ["/a".as_ref()], cx).await;
7026 project.update(cx, |project, _| project.languages().add(Arc::new(language)));
7027 let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
7028 let worktree_id = workspace.update(cx, |workspace, cx| {
7029 workspace.project().read_with(cx, |project, cx| {
7030 project.worktrees(cx).next().unwrap().read(cx).id()
7031 })
7032 });
7033
7034 let buffer = project
7035 .update(cx, |project, cx| {
7036 project.open_local_buffer("/a/main.rs", cx)
7037 })
7038 .await
7039 .unwrap();
7040 cx.foreground().run_until_parked();
7041 cx.foreground().start_waiting();
7042 let fake_server = fake_servers.next().await.unwrap();
7043 let editor_handle = workspace
7044 .update(cx, |workspace, cx| {
7045 workspace.open_path((worktree_id, "main.rs"), None, true, cx)
7046 })
7047 .await
7048 .unwrap()
7049 .downcast::<Editor>()
7050 .unwrap();
7051
7052 fake_server.handle_request::<lsp::request::OnTypeFormatting, _, _>(|params, _| async move {
7053 assert_eq!(
7054 params.text_document_position.text_document.uri,
7055 lsp::Url::from_file_path("/a/main.rs").unwrap(),
7056 );
7057 assert_eq!(
7058 params.text_document_position.position,
7059 lsp::Position::new(0, 21),
7060 );
7061
7062 Ok(Some(vec![lsp::TextEdit {
7063 new_text: "]".to_string(),
7064 range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
7065 }]))
7066 });
7067
7068 editor_handle.update(cx, |editor, cx| {
7069 cx.focus(&editor_handle);
7070 editor.change_selections(None, cx, |s| {
7071 s.select_ranges([Point::new(0, 21)..Point::new(0, 20)])
7072 });
7073 editor.handle_input("{", cx);
7074 });
7075
7076 cx.foreground().run_until_parked();
7077
7078 buffer.read_with(cx, |buffer, _| {
7079 assert_eq!(
7080 buffer.text(),
7081 "fn main() { let a = {5}; }",
7082 "No extra braces from on type formatting should appear in the buffer"
7083 )
7084 });
7085}
7086
6810fn empty_range(row: usize, column: usize) -> Range<DisplayPoint> {7087fn empty_range(row: usize, column: usize) -> Range<DisplayPoint> {
6811 let point = DisplayPoint::new(row as u32, column as u32);7088 let point = DisplayPoint::new(row as u32, column as u32);
6812 point..point7089 point..point
crates/editor/src/element.rs+16−7
@@ -1433,7 +1433,12 @@ impl EditorElement { · 1432 unmodified lines
1433 } else {1433 } else {
1434 let style = &self.style;1434 let style = &self.style;
1435 let chunks = snapshot1435 let chunks = snapshot
1436 .chunks(rows.clone(), true, Some(style.theme.suggestion))1436 .chunks(
1437 rows.clone(),
1438 true,
1439 Some(style.theme.hint),
1440 Some(style.theme.suggestion),
1441 )
1437 .map(|chunk| {1442 .map(|chunk| {
1438 let mut highlight_style = chunk1443 let mut highlight_style = chunk
1439 .syntax_highlight_id1444 .syntax_highlight_id
@@ -1508,6 +1513,7 @@ impl EditorElement { · 68 unmodified lines
1508 editor: &mut Editor,1513 editor: &mut Editor,
1509 cx: &mut LayoutContext<Editor>,1514 cx: &mut LayoutContext<Editor>,
1510 ) -> (f32, Vec<BlockLayout>) {1515 ) -> (f32, Vec<BlockLayout>) {
1516 let mut block_id = 0;
1511 let scroll_x = snapshot.scroll_anchor.offset.x();1517 let scroll_x = snapshot.scroll_anchor.offset.x();
1512 let (fixed_blocks, non_fixed_blocks) = snapshot1518 let (fixed_blocks, non_fixed_blocks) = snapshot
1513 .blocks_in_range(rows.clone())1519 .blocks_in_range(rows.clone())
@@ -1515,7 +1521,7 @@ impl EditorElement { · 1 unmodified line
1515 TransformBlock::ExcerptHeader { .. } => false,1521 TransformBlock::ExcerptHeader { .. } => false,
1516 TransformBlock::Custom(block) => block.style() == BlockStyle::Fixed,1522 TransformBlock::Custom(block) => block.style() == BlockStyle::Fixed,
1517 });1523 });
1518 let mut render_block = |block: &TransformBlock, width: f32| {1524 let mut render_block = |block: &TransformBlock, width: f32, block_id: usize| {
1519 let mut element = match block {1525 let mut element = match block {
1520 TransformBlock::Custom(block) => {1526 TransformBlock::Custom(block) => {
1521 let align_to = block1527 let align_to = block
@@ -1540,6 +1546,7 @@ impl EditorElement { · 18 unmodified lines
1540 scroll_x,1546 scroll_x,
1541 gutter_width,1547 gutter_width,
1542 em_width,1548 em_width,
1549 block_id,
1543 })1550 })
1544 }1551 }
1545 TransformBlock::ExcerptHeader {1552 TransformBlock::ExcerptHeader {
@@ -1568,7 +1575,7 @@ impl EditorElement { · 22 unmodified lines
1568 1575
1569 enum JumpIcon {}1576 enum JumpIcon {}
1570 MouseEventHandler::<JumpIcon, _>::new((*id).into(), cx, |state, _| {1577 MouseEventHandler::<JumpIcon, _>::new((*id).into(), cx, |state, _| {
1571 let style = style.jump_icon.style_for(state, false);1578 let style = style.jump_icon.style_for(state);
1572 Svg::new("icons/arrow_up_right_8.svg")1579 Svg::new("icons/arrow_up_right_8.svg")
1573 .with_color(style.color)1580 .with_color(style.color)
1574 .constrained()1581 .constrained()
@@ -1675,7 +1682,8 @@ impl EditorElement { · 100 unmodified lines
1675 let mut fixed_block_max_width = 0f32;1682 let mut fixed_block_max_width = 0f32;
1676 let mut blocks = Vec::new();1683 let mut blocks = Vec::new();
1677 for (row, block) in fixed_blocks {1684 for (row, block) in fixed_blocks {
1678 let element = render_block(block, f32::INFINITY);1685 let element = render_block(block, f32::INFINITY, block_id);
1686 block_id += 1;
1679 fixed_block_max_width = fixed_block_max_width.max(element.size().x() + em_width);1687 fixed_block_max_width = fixed_block_max_width.max(element.size().x() + em_width);
1680 blocks.push(BlockLayout {1688 blocks.push(BlockLayout {
1681 row,1689 row,
@@ -1695,7 +1703,8 @@ impl EditorElement { · 13 unmodified lines
1695 .max(gutter_width + scroll_width),1703 .max(gutter_width + scroll_width),
1696 BlockStyle::Fixed => unreachable!(),1704 BlockStyle::Fixed => unreachable!(),
1697 };1705 };
1698 let element = render_block(block, width);1706 let element = render_block(block, width, block_id);
1707 block_id += 1;
1699 blocks.push(BlockLayout {1708 blocks.push(BlockLayout {
1700 row,1709 row,
1701 element,1710 element,
@@ -1958,7 +1967,7 @@ impl Element<Editor> for EditorElement { · 256 unmodified lines
1958 let em_advance = style.text.em_advance(cx.font_cache());1967 let em_advance = style.text.em_advance(cx.font_cache());
1959 let overscroll = vec2f(em_width, 0.);1968 let overscroll = vec2f(em_width, 0.);
1960 let snapshot = {1969 let snapshot = {
1961 editor.set_visible_line_count(size.y() / line_height);1970 editor.set_visible_line_count(size.y() / line_height, cx);
1962 1971
1963 let editor_width = text_width - gutter_margin - overscroll.x() - em_width;1972 let editor_width = text_width - gutter_margin - overscroll.x() - em_width;
1964 let wrap_width = match editor.soft_wrap_mode(cx) {1973 let wrap_width = match editor.soft_wrap_mode(cx) {
@@ -2131,7 +2140,7 @@ impl Element<Editor> for EditorElement { · 166 unmodified lines
2131 .folds2140 .folds
2132 .ellipses2141 .ellipses
2133 .background2142 .background
2134 .style_for(&mut cx.mouse_state::<FoldMarkers>(id as usize), false)2143 .style_for(&mut cx.mouse_state::<FoldMarkers>(id as usize))
2135 .color;2144 .color;
2136 2145
2137 (id, fold, color)2146 (id, fold, color)
crates/editor/src/inlay_hint_cache.rs+2275−0
@@ -0,0 +1,2275 @@
1use std::{
2 cmp,
3 ops::{ControlFlow, Range},
4 sync::Arc,
5};
6
7use crate::{
8 display_map::Inlay, Anchor, Editor, ExcerptId, InlayId, MultiBuffer, MultiBufferSnapshot,
9};
10use anyhow::Context;
11use clock::Global;
12use gpui::{ModelHandle, Task, ViewContext};
13use language::{language_settings::InlayHintKind, Buffer, BufferSnapshot};
14use log::error;
15use parking_lot::RwLock;
16use project::InlayHint;
17
18use collections::{hash_map, HashMap, HashSet};
19use language::language_settings::InlayHintSettings;
20use util::post_inc;
21
22pub struct InlayHintCache {
23 pub hints: HashMap<ExcerptId, Arc<RwLock<CachedExcerptHints>>>,
24 pub allowed_hint_kinds: HashSet<Option<InlayHintKind>>,
25 pub version: usize,
26 pub enabled: bool,
27 update_tasks: HashMap<ExcerptId, UpdateTask>,
28}
29
30#[derive(Debug)]
31pub struct CachedExcerptHints {
32 version: usize,
33 buffer_version: Global,
34 buffer_id: u64,
35 pub hints: Vec<(InlayId, InlayHint)>,
36}
37
38#[derive(Debug, Clone, Copy)]
39pub enum InvalidationStrategy {
40 RefreshRequested,
41 BufferEdited,
42 None,
43}
44
45#[derive(Debug, Default)]
46pub struct InlaySplice {
47 pub to_remove: Vec<InlayId>,
48 pub to_insert: Vec<Inlay>,
49}
50
51struct UpdateTask {
52 invalidate: InvalidationStrategy,
53 cache_version: usize,
54 task: RunningTask,
55 pending_refresh: Option<ExcerptQuery>,
56}
57
58struct RunningTask {
59 _task: Task<()>,
60 is_running_rx: smol::channel::Receiver<()>,
61}
62
63#[derive(Debug)]
64struct ExcerptHintsUpdate {
65 excerpt_id: ExcerptId,
66 remove_from_visible: Vec<InlayId>,
67 remove_from_cache: HashSet<InlayId>,
68 add_to_cache: HashSet<InlayHint>,
69}
70
71#[derive(Debug, Clone, Copy)]
72struct ExcerptQuery {
73 buffer_id: u64,
74 excerpt_id: ExcerptId,
75 dimensions: ExcerptDimensions,
76 cache_version: usize,
77 invalidate: InvalidationStrategy,
78}
79
80#[derive(Debug, Clone, Copy)]
81struct ExcerptDimensions {
82 excerpt_range_start: language::Anchor,
83 excerpt_range_end: language::Anchor,
84 excerpt_visible_range_start: language::Anchor,
85 excerpt_visible_range_end: language::Anchor,
86}
87
88struct HintFetchRanges {
89 visible_range: Range<language::Anchor>,
90 other_ranges: Vec<Range<language::Anchor>>,
91}
92
93impl InvalidationStrategy {
94 fn should_invalidate(&self) -> bool {
95 matches!(
96 self,
97 InvalidationStrategy::RefreshRequested | InvalidationStrategy::BufferEdited
98 )
99 }
100}
101
102impl ExcerptQuery {
103 fn hints_fetch_ranges(&self, buffer: &BufferSnapshot) -> HintFetchRanges {
104 let visible_range =
105 self.dimensions.excerpt_visible_range_start..self.dimensions.excerpt_visible_range_end;
106 let mut other_ranges = Vec::new();
107 if self
108 .dimensions
109 .excerpt_range_start
110 .cmp(&visible_range.start, buffer)
111 .is_lt()
112 {
113 let mut end = visible_range.start;
114 end.offset -= 1;
115 other_ranges.push(self.dimensions.excerpt_range_start..end);
116 }
117 if self
118 .dimensions
119 .excerpt_range_end
120 .cmp(&visible_range.end, buffer)
121 .is_gt()
122 {
123 let mut start = visible_range.end;
124 start.offset += 1;
125 other_ranges.push(start..self.dimensions.excerpt_range_end);
126 }
127
128 HintFetchRanges {
129 visible_range,
130 other_ranges: other_ranges.into_iter().map(|range| range).collect(),
131 }
132 }
133}
134
135impl InlayHintCache {
136 pub fn new(inlay_hint_settings: InlayHintSettings) -> Self {
137 Self {
138 allowed_hint_kinds: inlay_hint_settings.enabled_inlay_hint_kinds(),
139 enabled: inlay_hint_settings.enabled,
140 hints: HashMap::default(),
141 update_tasks: HashMap::default(),
142 version: 0,
143 }
144 }
145
146 pub fn update_settings(
147 &mut self,
148 multi_buffer: &ModelHandle<MultiBuffer>,
149 new_hint_settings: InlayHintSettings,
150 visible_hints: Vec<Inlay>,
151 cx: &mut ViewContext<Editor>,
152 ) -> ControlFlow<Option<InlaySplice>> {
153 let new_allowed_hint_kinds = new_hint_settings.enabled_inlay_hint_kinds();
154 match (self.enabled, new_hint_settings.enabled) {
155 (false, false) => {
156 self.allowed_hint_kinds = new_allowed_hint_kinds;
157 ControlFlow::Break(None)
158 }
159 (true, true) => {
160 if new_allowed_hint_kinds == self.allowed_hint_kinds {
161 ControlFlow::Break(None)
162 } else {
163 let new_splice = self.new_allowed_hint_kinds_splice(
164 multi_buffer,
165 &visible_hints,
166 &new_allowed_hint_kinds,
167 cx,
168 );
169 if new_splice.is_some() {
170 self.version += 1;
171 self.update_tasks.clear();
172 self.allowed_hint_kinds = new_allowed_hint_kinds;
173 }
174 ControlFlow::Break(new_splice)
175 }
176 }
177 (true, false) => {
178 self.enabled = new_hint_settings.enabled;
179 self.allowed_hint_kinds = new_allowed_hint_kinds;
180 if self.hints.is_empty() {
181 ControlFlow::Break(None)
182 } else {
183 self.clear();
184 ControlFlow::Break(Some(InlaySplice {
185 to_remove: visible_hints.iter().map(|inlay| inlay.id).collect(),
186 to_insert: Vec::new(),
187 }))
188 }
189 }
190 (false, true) => {
191 self.enabled = new_hint_settings.enabled;
192 self.allowed_hint_kinds = new_allowed_hint_kinds;
193 ControlFlow::Continue(())
194 }
195 }
196 }
197
198 pub fn refresh_inlay_hints(
199 &mut self,
200 mut excerpts_to_query: HashMap<ExcerptId, (ModelHandle<Buffer>, Global, Range<usize>)>,
201 invalidate: InvalidationStrategy,
202 cx: &mut ViewContext<Editor>,
203 ) {
204 if !self.enabled || excerpts_to_query.is_empty() {
205 return;
206 }
207 let update_tasks = &mut self.update_tasks;
208 if invalidate.should_invalidate() {
209 update_tasks
210 .retain(|task_excerpt_id, _| excerpts_to_query.contains_key(task_excerpt_id));
211 }
212 let cache_version = self.version;
213 excerpts_to_query.retain(|visible_excerpt_id, _| {
214 match update_tasks.entry(*visible_excerpt_id) {
215 hash_map::Entry::Occupied(o) => match o.get().cache_version.cmp(&cache_version) {
216 cmp::Ordering::Less => true,
217 cmp::Ordering::Equal => invalidate.should_invalidate(),
218 cmp::Ordering::Greater => false,
219 },
220 hash_map::Entry::Vacant(_) => true,
221 }
222 });
223
224 cx.spawn(|editor, mut cx| async move {
225 editor
226 .update(&mut cx, |editor, cx| {
227 spawn_new_update_tasks(editor, excerpts_to_query, invalidate, cache_version, cx)
228 })
229 .ok();
230 })
231 .detach();
232 }
233
234 fn new_allowed_hint_kinds_splice(
235 &self,
236 multi_buffer: &ModelHandle<MultiBuffer>,
237 visible_hints: &[Inlay],
238 new_kinds: &HashSet<Option<InlayHintKind>>,
239 cx: &mut ViewContext<Editor>,
240 ) -> Option<InlaySplice> {
241 let old_kinds = &self.allowed_hint_kinds;
242 if new_kinds == old_kinds {
243 return None;
244 }
245
246 let mut to_remove = Vec::new();
247 let mut to_insert = Vec::new();
248 let mut shown_hints_to_remove = visible_hints.iter().fold(
249 HashMap::<ExcerptId, Vec<(Anchor, InlayId)>>::default(),
250 |mut current_hints, inlay| {
251 current_hints
252 .entry(inlay.position.excerpt_id)
253 .or_default()
254 .push((inlay.position, inlay.id));
255 current_hints
256 },
257 );
258
259 let multi_buffer = multi_buffer.read(cx);
260 let multi_buffer_snapshot = multi_buffer.snapshot(cx);
261
262 for (excerpt_id, excerpt_cached_hints) in &self.hints {
263 let shown_excerpt_hints_to_remove =
264 shown_hints_to_remove.entry(*excerpt_id).or_default();
265 let excerpt_cached_hints = excerpt_cached_hints.read();
266 let mut excerpt_cache = excerpt_cached_hints.hints.iter().fuse().peekable();
267 shown_excerpt_hints_to_remove.retain(|(shown_anchor, shown_hint_id)| {
268 let Some(buffer) = shown_anchor
269 .buffer_id
270 .and_then(|buffer_id| multi_buffer.buffer(buffer_id)) else { return false };
271 let buffer_snapshot = buffer.read(cx).snapshot();
272 loop {
273 match excerpt_cache.peek() {
274 Some((cached_hint_id, cached_hint)) => {
275 if cached_hint_id == shown_hint_id {
276 excerpt_cache.next();
277 return !new_kinds.contains(&cached_hint.kind);
278 }
279
280 match cached_hint
281 .position
282 .cmp(&shown_anchor.text_anchor, &buffer_snapshot)
283 {
284 cmp::Ordering::Less | cmp::Ordering::Equal => {
285 if !old_kinds.contains(&cached_hint.kind)
286 && new_kinds.contains(&cached_hint.kind)
287 {
288 to_insert.push(Inlay::hint(
289 cached_hint_id.id(),
290 multi_buffer_snapshot.anchor_in_excerpt(
291 *excerpt_id,
292 cached_hint.position,
293 ),
294 &cached_hint,
295 ));
296 }
297 excerpt_cache.next();
298 }
299 cmp::Ordering::Greater => return true,
300 }
301 }
302 None => return true,
303 }
304 }
305 });
306
307 for (cached_hint_id, maybe_missed_cached_hint) in excerpt_cache {
308 let cached_hint_kind = maybe_missed_cached_hint.kind;
309 if !old_kinds.contains(&cached_hint_kind) && new_kinds.contains(&cached_hint_kind) {
310 to_insert.push(Inlay::hint(
311 cached_hint_id.id(),
312 multi_buffer_snapshot
313 .anchor_in_excerpt(*excerpt_id, maybe_missed_cached_hint.position),
314 &maybe_missed_cached_hint,
315 ));
316 }
317 }
318 }
319
320 to_remove.extend(
321 shown_hints_to_remove
322 .into_values()
323 .flatten()
324 .map(|(_, hint_id)| hint_id),
325 );
326 if to_remove.is_empty() && to_insert.is_empty() {
327 None
328 } else {
329 Some(InlaySplice {
330 to_remove,
331 to_insert,
332 })
333 }
334 }
335
336 fn clear(&mut self) {
337 self.version += 1;
338 self.update_tasks.clear();
339 self.hints.clear();
340 }
341}
342
343fn spawn_new_update_tasks(
344 editor: &mut Editor,
345 excerpts_to_query: HashMap<ExcerptId, (ModelHandle<Buffer>, Global, Range<usize>)>,
346 invalidate: InvalidationStrategy,
347 update_cache_version: usize,
348 cx: &mut ViewContext<'_, '_, Editor>,
349) {
350 let visible_hints = Arc::new(editor.visible_inlay_hints(cx));
351 for (excerpt_id, (buffer_handle, new_task_buffer_version, excerpt_visible_range)) in
352 excerpts_to_query
353 {
354 if excerpt_visible_range.is_empty() {
355 continue;
356 }
357 let buffer = buffer_handle.read(cx);
358 let buffer_snapshot = buffer.snapshot();
359 if buffer_snapshot
360 .version()
361 .changed_since(&new_task_buffer_version)
362 {
363 continue;
364 }
365
366 let cached_excerpt_hints = editor.inlay_hint_cache.hints.get(&excerpt_id).cloned();
367 if let Some(cached_excerpt_hints) = &cached_excerpt_hints {
368 let cached_excerpt_hints = cached_excerpt_hints.read();
369 let cached_buffer_version = &cached_excerpt_hints.buffer_version;
370 if cached_excerpt_hints.version > update_cache_version
371 || cached_buffer_version.changed_since(&new_task_buffer_version)
372 {
373 continue;
374 }
375 if !new_task_buffer_version.changed_since(&cached_buffer_version)
376 && !matches!(invalidate, InvalidationStrategy::RefreshRequested)
377 {
378 continue;
379 }
380 };
381
382 let buffer_id = buffer.remote_id();
383 let excerpt_visible_range_start = buffer.anchor_before(excerpt_visible_range.start);
384 let excerpt_visible_range_end = buffer.anchor_after(excerpt_visible_range.end);
385
386 let (multi_buffer_snapshot, full_excerpt_range) =
387 editor.buffer.update(cx, |multi_buffer, cx| {
388 let multi_buffer_snapshot = multi_buffer.snapshot(cx);
389 (
390 multi_buffer_snapshot,
391 multi_buffer
392 .excerpts_for_buffer(&buffer_handle, cx)
393 .into_iter()
394 .find(|(id, _)| id == &excerpt_id)
395 .map(|(_, range)| range.context),
396 )
397 });
398
399 if let Some(full_excerpt_range) = full_excerpt_range {
400 let query = ExcerptQuery {
401 buffer_id,
402 excerpt_id,
403 dimensions: ExcerptDimensions {
404 excerpt_range_start: full_excerpt_range.start,
405 excerpt_range_end: full_excerpt_range.end,
406 excerpt_visible_range_start,
407 excerpt_visible_range_end,
408 },
409 cache_version: update_cache_version,
410 invalidate,
411 };
412
413 let new_update_task = |is_refresh_after_regular_task| {
414 new_update_task(
415 query,
416 multi_buffer_snapshot,
417 buffer_snapshot,
418 Arc::clone(&visible_hints),
419 cached_excerpt_hints,
420 is_refresh_after_regular_task,
421 cx,
422 )
423 };
424 match editor.inlay_hint_cache.update_tasks.entry(excerpt_id) {
425 hash_map::Entry::Occupied(mut o) => {
426 let update_task = o.get_mut();
427 match (update_task.invalidate, invalidate) {
428 (_, InvalidationStrategy::None) => {}
429 (
430 InvalidationStrategy::BufferEdited,
431 InvalidationStrategy::RefreshRequested,
432 ) if !update_task.task.is_running_rx.is_closed() => {
433 update_task.pending_refresh = Some(query);
434 }
435 _ => {
436 o.insert(UpdateTask {
437 invalidate,
438 cache_version: query.cache_version,
439 task: new_update_task(false),
440 pending_refresh: None,
441 });
442 }
443 }
444 }
445 hash_map::Entry::Vacant(v) => {
446 v.insert(UpdateTask {
447 invalidate,
448 cache_version: query.cache_version,
449 task: new_update_task(false),
450 pending_refresh: None,
451 });
452 }
453 }
454 }
455 }
456}
457
458fn new_update_task(
459 query: ExcerptQuery,
460 multi_buffer_snapshot: MultiBufferSnapshot,
461 buffer_snapshot: BufferSnapshot,
462 visible_hints: Arc<Vec<Inlay>>,
463 cached_excerpt_hints: Option<Arc<RwLock<CachedExcerptHints>>>,
464 is_refresh_after_regular_task: bool,
465 cx: &mut ViewContext<'_, '_, Editor>,
466) -> RunningTask {
467 let hints_fetch_ranges = query.hints_fetch_ranges(&buffer_snapshot);
468 let (is_running_tx, is_running_rx) = smol::channel::bounded(1);
469 let _task = cx.spawn(|editor, mut cx| async move {
470 let _is_running_tx = is_running_tx;
471 let create_update_task = |range| {
472 fetch_and_update_hints(
473 editor.clone(),
474 multi_buffer_snapshot.clone(),
475 buffer_snapshot.clone(),
476 Arc::clone(&visible_hints),
477 cached_excerpt_hints.as_ref().map(Arc::clone),
478 query,
479 range,
480 cx.clone(),
481 )
482 };
483
484 if is_refresh_after_regular_task {
485 let visible_range_has_updates =
486 match create_update_task(hints_fetch_ranges.visible_range).await {
487 Ok(updated) => updated,
488 Err(e) => {
489 error!("inlay hint visible range update task failed: {e:#}");
490 return;
491 }
492 };
493
494 if visible_range_has_updates {
495 let other_update_results = futures::future::join_all(
496 hints_fetch_ranges
497 .other_ranges
498 .into_iter()
499 .map(create_update_task),
500 )
501 .await;
502
503 for result in other_update_results {
504 if let Err(e) = result {
505 error!("inlay hint update task failed: {e:#}");
506 }
507 }
508 }
509 } else {
510 let task_update_results = futures::future::join_all(
511 std::iter::once(hints_fetch_ranges.visible_range)
512 .chain(hints_fetch_ranges.other_ranges.into_iter())
513 .map(create_update_task),
514 )
515 .await;
516
517 for result in task_update_results {
518 if let Err(e) = result {
519 error!("inlay hint update task failed: {e:#}");
520 }
521 }
522 }
523
524 editor
525 .update(&mut cx, |editor, cx| {
526 let pending_refresh_query = editor
527 .inlay_hint_cache
528 .update_tasks
529 .get_mut(&query.excerpt_id)
530 .and_then(|task| task.pending_refresh.take());
531
532 if let Some(pending_refresh_query) = pending_refresh_query {
533 let refresh_multi_buffer = editor.buffer().read(cx);
534 let refresh_multi_buffer_snapshot = refresh_multi_buffer.snapshot(cx);
535 let refresh_visible_hints = Arc::new(editor.visible_inlay_hints(cx));
536 let refresh_cached_excerpt_hints = editor
537 .inlay_hint_cache
538 .hints
539 .get(&pending_refresh_query.excerpt_id)
540 .map(Arc::clone);
541 if let Some(buffer) =
542 refresh_multi_buffer.buffer(pending_refresh_query.buffer_id)
543 {
544 drop(refresh_multi_buffer);
545 editor.inlay_hint_cache.update_tasks.insert(
546 pending_refresh_query.excerpt_id,
547 UpdateTask {
548 invalidate: InvalidationStrategy::RefreshRequested,
549 cache_version: editor.inlay_hint_cache.version,
550 task: new_update_task(
551 pending_refresh_query,
552 refresh_multi_buffer_snapshot,
553 buffer.read(cx).snapshot(),
554 refresh_visible_hints,
555 refresh_cached_excerpt_hints,
556 true,
557 cx,
558 ),
559 pending_refresh: None,
560 },
561 );
562 }
563 }
564 })
565 .ok();
566 });
567
568 RunningTask {
569 _task,
570 is_running_rx,
571 }
572}
573
574async fn fetch_and_update_hints(
575 editor: gpui::WeakViewHandle<Editor>,
576 multi_buffer_snapshot: MultiBufferSnapshot,
577 buffer_snapshot: BufferSnapshot,
578 visible_hints: Arc<Vec<Inlay>>,
579 cached_excerpt_hints: Option<Arc<RwLock<CachedExcerptHints>>>,
580 query: ExcerptQuery,
581 fetch_range: Range<language::Anchor>,
582 mut cx: gpui::AsyncAppContext,
583) -> anyhow::Result<bool> {
584 let inlay_hints_fetch_task = editor
585 .update(&mut cx, |editor, cx| {
586 editor
587 .buffer()
588 .read(cx)
589 .buffer(query.buffer_id)
590 .and_then(|buffer| {
591 let project = editor.project.as_ref()?;
592 Some(project.update(cx, |project, cx| {
593 project.inlay_hints(buffer, fetch_range.clone(), cx)
594 }))
595 })
596 })
597 .ok()
598 .flatten();
599 let mut update_happened = false;
600 let Some(inlay_hints_fetch_task) = inlay_hints_fetch_task else { return Ok(update_happened) };
601 let new_hints = inlay_hints_fetch_task
602 .await
603 .context("inlay hint fetch task")?;
604 let background_task_buffer_snapshot = buffer_snapshot.clone();
605 let backround_fetch_range = fetch_range.clone();
606 let new_update = cx
607 .background()
608 .spawn(async move {
609 calculate_hint_updates(
610 query,
611 backround_fetch_range,
612 new_hints,
613 &background_task_buffer_snapshot,
614 cached_excerpt_hints,
615 &visible_hints,
616 )
617 })
618 .await;
619
620 editor
621 .update(&mut cx, |editor, cx| {
622 if let Some(new_update) = new_update {
623 update_happened = !new_update.add_to_cache.is_empty()
624 || !new_update.remove_from_cache.is_empty()
625 || !new_update.remove_from_visible.is_empty();
626
627 let cached_excerpt_hints = editor
628 .inlay_hint_cache
629 .hints
630 .entry(new_update.excerpt_id)
631 .or_insert_with(|| {
632 Arc::new(RwLock::new(CachedExcerptHints {
633 version: query.cache_version,
634 buffer_version: buffer_snapshot.version().clone(),
635 buffer_id: query.buffer_id,
636 hints: Vec::new(),
637 }))
638 });
639 let mut cached_excerpt_hints = cached_excerpt_hints.write();
640 match query.cache_version.cmp(&cached_excerpt_hints.version) {
641 cmp::Ordering::Less => return,
642 cmp::Ordering::Greater | cmp::Ordering::Equal => {
643 cached_excerpt_hints.version = query.cache_version;
644 }
645 }
646 cached_excerpt_hints
647 .hints
648 .retain(|(hint_id, _)| !new_update.remove_from_cache.contains(hint_id));
649 cached_excerpt_hints.buffer_version = buffer_snapshot.version().clone();
650 editor.inlay_hint_cache.version += 1;
651
652 let mut splice = InlaySplice {
653 to_remove: new_update.remove_from_visible,
654 to_insert: Vec::new(),
655 };
656
657 for new_hint in new_update.add_to_cache {
658 let new_hint_position = multi_buffer_snapshot
659 .anchor_in_excerpt(query.excerpt_id, new_hint.position);
660 let new_inlay_id = post_inc(&mut editor.next_inlay_id);
661 if editor
662 .inlay_hint_cache
663 .allowed_hint_kinds
664 .contains(&new_hint.kind)
665 {
666 splice.to_insert.push(Inlay::hint(
667 new_inlay_id,
668 new_hint_position,
669 &new_hint,
670 ));
671 }
672
673 cached_excerpt_hints
674 .hints
675 .push((InlayId::Hint(new_inlay_id), new_hint));
676 }
677
678 cached_excerpt_hints
679 .hints
680 .sort_by(|(_, hint_a), (_, hint_b)| {
681 hint_a.position.cmp(&hint_b.position, &buffer_snapshot)
682 });
683 drop(cached_excerpt_hints);
684
685 if query.invalidate.should_invalidate() {
686 let mut outdated_excerpt_caches = HashSet::default();
687 for (excerpt_id, excerpt_hints) in editor.inlay_hint_cache().hints.iter() {
688 let excerpt_hints = excerpt_hints.read();
689 if excerpt_hints.buffer_id == query.buffer_id
690 && excerpt_id != &query.excerpt_id
691 && buffer_snapshot
692 .version()
693 .changed_since(&excerpt_hints.buffer_version)
694 {
695 outdated_excerpt_caches.insert(*excerpt_id);
696 splice
697 .to_remove
698 .extend(excerpt_hints.hints.iter().map(|(id, _)| id));
699 }
700 }
701 editor
702 .inlay_hint_cache
703 .hints
704 .retain(|excerpt_id, _| !outdated_excerpt_caches.contains(excerpt_id));
705 }
706
707 let InlaySplice {
708 to_remove,
709 to_insert,
710 } = splice;
711 if !to_remove.is_empty() || !to_insert.is_empty() {
712 editor.splice_inlay_hints(to_remove, to_insert, cx)
713 }
714 }
715 })
716 .ok();
717
718 Ok(update_happened)
719}
720
721fn calculate_hint_updates(
722 query: ExcerptQuery,
723 fetch_range: Range<language::Anchor>,
724 new_excerpt_hints: Vec<InlayHint>,
725 buffer_snapshot: &BufferSnapshot,
726 cached_excerpt_hints: Option<Arc<RwLock<CachedExcerptHints>>>,
727 visible_hints: &[Inlay],
728) -> Option<ExcerptHintsUpdate> {
729 let mut add_to_cache: HashSet<InlayHint> = HashSet::default();
730 let mut excerpt_hints_to_persist = HashMap::default();
731 for new_hint in new_excerpt_hints {
732 if !contains_position(&fetch_range, new_hint.position, buffer_snapshot) {
733 continue;
734 }
735 let missing_from_cache = match &cached_excerpt_hints {
736 Some(cached_excerpt_hints) => {
737 let cached_excerpt_hints = cached_excerpt_hints.read();
738 match cached_excerpt_hints.hints.binary_search_by(|probe| {
739 probe.1.position.cmp(&new_hint.position, buffer_snapshot)
740 }) {
741 Ok(ix) => {
742 let (cached_inlay_id, cached_hint) = &cached_excerpt_hints.hints[ix];
743 if cached_hint == &new_hint {
744 excerpt_hints_to_persist.insert(*cached_inlay_id, cached_hint.kind);
745 false
746 } else {
747 true
748 }
749 }
750 Err(_) => true,
751 }
752 }
753 None => true,
754 };
755 if missing_from_cache {
756 add_to_cache.insert(new_hint);
757 }
758 }
759
760 let mut remove_from_visible = Vec::new();
761 let mut remove_from_cache = HashSet::default();
762 if query.invalidate.should_invalidate() {
763 remove_from_visible.extend(
764 visible_hints
765 .iter()
766 .filter(|hint| hint.position.excerpt_id == query.excerpt_id)
767 .filter(|hint| {
768 contains_position(&fetch_range, hint.position.text_anchor, buffer_snapshot)
769 })
770 .filter(|hint| {
771 fetch_range
772 .start
773 .cmp(&hint.position.text_anchor, buffer_snapshot)
774 .is_le()
775 && fetch_range
776 .end
777 .cmp(&hint.position.text_anchor, buffer_snapshot)
778 .is_ge()
779 })
780 .map(|inlay_hint| inlay_hint.id)
781 .filter(|hint_id| !excerpt_hints_to_persist.contains_key(hint_id)),
782 );
783
784 if let Some(cached_excerpt_hints) = &cached_excerpt_hints {
785 let cached_excerpt_hints = cached_excerpt_hints.read();
786 remove_from_cache.extend(
787 cached_excerpt_hints
788 .hints
789 .iter()
790 .filter(|(cached_inlay_id, _)| {
791 !excerpt_hints_to_persist.contains_key(cached_inlay_id)
792 })
793 .filter(|(_, cached_hint)| {
794 fetch_range
795 .start
796 .cmp(&cached_hint.position, buffer_snapshot)
797 .is_le()
798 && fetch_range
799 .end
800 .cmp(&cached_hint.position, buffer_snapshot)
801 .is_ge()
802 })
803 .map(|(cached_inlay_id, _)| *cached_inlay_id),
804 );
805 }
806 }
807
808 if remove_from_visible.is_empty() && remove_from_cache.is_empty() && add_to_cache.is_empty() {
809 None
810 } else {
811 Some(ExcerptHintsUpdate {
812 excerpt_id: query.excerpt_id,
813 remove_from_visible,
814 remove_from_cache,
815 add_to_cache,
816 })
817 }
818}
819
820fn contains_position(
821 range: &Range<language::Anchor>,
822 position: language::Anchor,
823 buffer_snapshot: &BufferSnapshot,
824) -> bool {
825 range.start.cmp(&position, buffer_snapshot).is_le()
826 && range.end.cmp(&position, buffer_snapshot).is_ge()
827}
828
829#[cfg(test)]
830mod tests {
831 use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
832
833 use crate::{
834 scroll::{autoscroll::Autoscroll, scroll_amount::ScrollAmount},
835 serde_json::json,
836 ExcerptRange, InlayHintSettings,
837 };
838 use futures::StreamExt;
839 use gpui::{executor::Deterministic, TestAppContext, ViewHandle};
840 use language::{
841 language_settings::AllLanguageSettingsContent, FakeLspAdapter, Language, LanguageConfig,
842 };
843 use lsp::FakeLanguageServer;
844 use parking_lot::Mutex;
845 use project::{FakeFs, Project};
846 use settings::SettingsStore;
847 use text::Point;
848 use workspace::Workspace;
849
850 use crate::editor_tests::update_test_settings;
851
852 use super::*;
853
854 #[gpui::test]
855 async fn test_basic_cache_update_with_duplicate_hints(cx: &mut gpui::TestAppContext) {
856 let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
857 init_test(cx, |settings| {
858 settings.defaults.inlay_hints = Some(InlayHintSettings {
859 enabled: true,
860 show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
861 show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
862 show_other_hints: allowed_hint_kinds.contains(&None),
863 })
864 });
865
866 let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await;
867 let lsp_request_count = Arc::new(AtomicU32::new(0));
868 fake_server
869 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
870 let task_lsp_request_count = Arc::clone(&lsp_request_count);
871 async move {
872 assert_eq!(
873 params.text_document.uri,
874 lsp::Url::from_file_path(file_with_hints).unwrap(),
875 );
876 let current_call_id =
877 Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
878 let mut new_hints = Vec::with_capacity(2 * current_call_id as usize);
879 for _ in 0..2 {
880 let mut i = current_call_id;
881 loop {
882 new_hints.push(lsp::InlayHint {
883 position: lsp::Position::new(0, i),
884 label: lsp::InlayHintLabel::String(i.to_string()),
885 kind: None,
886 text_edits: None,
887 tooltip: None,
888 padding_left: None,
889 padding_right: None,
890 data: None,
891 });
892 if i == 0 {
893 break;
894 }
895 i -= 1;
896 }
897 }
898
899 Ok(Some(new_hints))
900 }
901 })
902 .next()
903 .await;
904 cx.foreground().run_until_parked();
905
906 let mut edits_made = 1;
907 editor.update(cx, |editor, cx| {
908 let expected_layers = vec!["0".to_string()];
909 assert_eq!(
910 expected_layers,
911 cached_hint_labels(editor),
912 "Should get its first hints when opening the editor"
913 );
914 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
915 let inlay_cache = editor.inlay_hint_cache();
916 assert_eq!(
917 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
918 "Cache should use editor settings to get the allowed hint kinds"
919 );
920 assert_eq!(
921 inlay_cache.version, edits_made,
922 "The editor update the cache version after every cache/view change"
923 );
924 });
925
926 editor.update(cx, |editor, cx| {
927 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
928 editor.handle_input("some change", cx);
929 edits_made += 1;
930 });
931 cx.foreground().run_until_parked();
932 editor.update(cx, |editor, cx| {
933 let expected_layers = vec!["0".to_string(), "1".to_string()];
934 assert_eq!(
935 expected_layers,
936 cached_hint_labels(editor),
937 "Should get new hints after an edit"
938 );
939 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
940 let inlay_cache = editor.inlay_hint_cache();
941 assert_eq!(
942 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
943 "Cache should use editor settings to get the allowed hint kinds"
944 );
945 assert_eq!(
946 inlay_cache.version, edits_made,
947 "The editor update the cache version after every cache/view change"
948 );
949 });
950
951 fake_server
952 .request::<lsp::request::InlayHintRefreshRequest>(())
953 .await
954 .expect("inlay refresh request failed");
955 edits_made += 1;
956 cx.foreground().run_until_parked();
957 editor.update(cx, |editor, cx| {
958 let expected_layers = vec!["0".to_string(), "1".to_string(), "2".to_string()];
959 assert_eq!(
960 expected_layers,
961 cached_hint_labels(editor),
962 "Should get new hints after hint refresh/ request"
963 );
964 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
965 let inlay_cache = editor.inlay_hint_cache();
966 assert_eq!(
967 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
968 "Cache should use editor settings to get the allowed hint kinds"
969 );
970 assert_eq!(
971 inlay_cache.version, edits_made,
972 "The editor update the cache version after every cache/view change"
973 );
974 });
975 }
976
977 #[gpui::test]
978 async fn test_no_hint_updates_for_unrelated_language_files(cx: &mut gpui::TestAppContext) {
979 let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
980 init_test(cx, |settings| {
981 settings.defaults.inlay_hints = Some(InlayHintSettings {
982 enabled: true,
983 show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
984 show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
985 show_other_hints: allowed_hint_kinds.contains(&None),
986 })
987 });
988
989 let fs = FakeFs::new(cx.background());
990 fs.insert_tree(
991 "/a",
992 json!({
993 "main.rs": "fn main() { a } // and some long comment to ensure inlays are not trimmed out",
994 "other.md": "Test md file with some text",
995 }),
996 )
997 .await;
998 let project = Project::test(fs, ["/a".as_ref()], cx).await;
999 let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
1000 let worktree_id = workspace.update(cx, |workspace, cx| {
1001 workspace.project().read_with(cx, |project, cx| {
1002 project.worktrees(cx).next().unwrap().read(cx).id()
1003 })
1004 });
1005
1006 let mut rs_fake_servers = None;
1007 let mut md_fake_servers = None;
1008 for (name, path_suffix) in [("Rust", "rs"), ("Markdown", "md")] {
1009 let mut language = Language::new(
1010 LanguageConfig {
1011 name: name.into(),
1012 path_suffixes: vec![path_suffix.to_string()],
1013 ..Default::default()
1014 },
1015 Some(tree_sitter_rust::language()),
1016 );
1017 let fake_servers = language
1018 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
1019 name,
1020 capabilities: lsp::ServerCapabilities {
1021 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
1022 ..Default::default()
1023 },
1024 ..Default::default()
1025 }))
1026 .await;
1027 match name {
1028 "Rust" => rs_fake_servers = Some(fake_servers),
1029 "Markdown" => md_fake_servers = Some(fake_servers),
1030 _ => unreachable!(),
1031 }
1032 project.update(cx, |project, _| {
1033 project.languages().add(Arc::new(language));
1034 });
1035 }
1036
1037 let _rs_buffer = project
1038 .update(cx, |project, cx| {
1039 project.open_local_buffer("/a/main.rs", cx)
1040 })
1041 .await
1042 .unwrap();
1043 cx.foreground().run_until_parked();
1044 cx.foreground().start_waiting();
1045 let rs_fake_server = rs_fake_servers.unwrap().next().await.unwrap();
1046 let rs_editor = workspace
1047 .update(cx, |workspace, cx| {
1048 workspace.open_path((worktree_id, "main.rs"), None, true, cx)
1049 })
1050 .await
1051 .unwrap()
1052 .downcast::<Editor>()
1053 .unwrap();
1054 let rs_lsp_request_count = Arc::new(AtomicU32::new(0));
1055 rs_fake_server
1056 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1057 let task_lsp_request_count = Arc::clone(&rs_lsp_request_count);
1058 async move {
1059 assert_eq!(
1060 params.text_document.uri,
1061 lsp::Url::from_file_path("/a/main.rs").unwrap(),
1062 );
1063 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
1064 Ok(Some(vec![lsp::InlayHint {
1065 position: lsp::Position::new(0, i),
1066 label: lsp::InlayHintLabel::String(i.to_string()),
1067 kind: None,
1068 text_edits: None,
1069 tooltip: None,
1070 padding_left: None,
1071 padding_right: None,
1072 data: None,
1073 }]))
1074 }
1075 })
1076 .next()
1077 .await;
1078 cx.foreground().run_until_parked();
1079 rs_editor.update(cx, |editor, cx| {
1080 let expected_layers = vec!["0".to_string()];
1081 assert_eq!(
1082 expected_layers,
1083 cached_hint_labels(editor),
1084 "Should get its first hints when opening the editor"
1085 );
1086 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
1087 let inlay_cache = editor.inlay_hint_cache();
1088 assert_eq!(
1089 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
1090 "Cache should use editor settings to get the allowed hint kinds"
1091 );
1092 assert_eq!(
1093 inlay_cache.version, 1,
1094 "Rust editor update the cache version after every cache/view change"
1095 );
1096 });
1097
1098 cx.foreground().run_until_parked();
1099 let _md_buffer = project
1100 .update(cx, |project, cx| {
1101 project.open_local_buffer("/a/other.md", cx)
1102 })
1103 .await
1104 .unwrap();
1105 cx.foreground().run_until_parked();
1106 cx.foreground().start_waiting();
1107 let md_fake_server = md_fake_servers.unwrap().next().await.unwrap();
1108 let md_editor = workspace
1109 .update(cx, |workspace, cx| {
1110 workspace.open_path((worktree_id, "other.md"), None, true, cx)
1111 })
1112 .await
1113 .unwrap()
1114 .downcast::<Editor>()
1115 .unwrap();
1116 let md_lsp_request_count = Arc::new(AtomicU32::new(0));
1117 md_fake_server
1118 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1119 let task_lsp_request_count = Arc::clone(&md_lsp_request_count);
1120 async move {
1121 assert_eq!(
1122 params.text_document.uri,
1123 lsp::Url::from_file_path("/a/other.md").unwrap(),
1124 );
1125 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
1126 Ok(Some(vec![lsp::InlayHint {
1127 position: lsp::Position::new(0, i),
1128 label: lsp::InlayHintLabel::String(i.to_string()),
1129 kind: None,
1130 text_edits: None,
1131 tooltip: None,
1132 padding_left: None,
1133 padding_right: None,
1134 data: None,
1135 }]))
1136 }
1137 })
1138 .next()
1139 .await;
1140 cx.foreground().run_until_parked();
1141 md_editor.update(cx, |editor, cx| {
1142 let expected_layers = vec!["0".to_string()];
1143 assert_eq!(
1144 expected_layers,
1145 cached_hint_labels(editor),
1146 "Markdown editor should have a separate verison, repeating Rust editor rules"
1147 );
1148 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
1149 let inlay_cache = editor.inlay_hint_cache();
1150 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1151 assert_eq!(inlay_cache.version, 1);
1152 });
1153
1154 rs_editor.update(cx, |editor, cx| {
1155 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
1156 editor.handle_input("some rs change", cx);
1157 });
1158 cx.foreground().run_until_parked();
1159 rs_editor.update(cx, |editor, cx| {
1160 let expected_layers = vec!["1".to_string()];
1161 assert_eq!(
1162 expected_layers,
1163 cached_hint_labels(editor),
1164 "Rust inlay cache should change after the edit"
1165 );
1166 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
1167 let inlay_cache = editor.inlay_hint_cache();
1168 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1169 assert_eq!(
1170 inlay_cache.version, 2,
1171 "Every time hint cache changes, cache version should be incremented"
1172 );
1173 });
1174 md_editor.update(cx, |editor, cx| {
1175 let expected_layers = vec!["0".to_string()];
1176 assert_eq!(
1177 expected_layers,
1178 cached_hint_labels(editor),
1179 "Markdown editor should not be affected by Rust editor changes"
1180 );
1181 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
1182 let inlay_cache = editor.inlay_hint_cache();
1183 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1184 assert_eq!(inlay_cache.version, 1);
1185 });
1186
1187 md_editor.update(cx, |editor, cx| {
1188 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
1189 editor.handle_input("some md change", cx);
1190 });
1191 cx.foreground().run_until_parked();
1192 md_editor.update(cx, |editor, cx| {
1193 let expected_layers = vec!["1".to_string()];
1194 assert_eq!(
1195 expected_layers,
1196 cached_hint_labels(editor),
1197 "Rust editor should not be affected by Markdown editor changes"
1198 );
1199 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
1200 let inlay_cache = editor.inlay_hint_cache();
1201 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1202 assert_eq!(inlay_cache.version, 2);
1203 });
1204 rs_editor.update(cx, |editor, cx| {
1205 let expected_layers = vec!["1".to_string()];
1206 assert_eq!(
1207 expected_layers,
1208 cached_hint_labels(editor),
1209 "Markdown editor should also change independently"
1210 );
1211 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
1212 let inlay_cache = editor.inlay_hint_cache();
1213 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1214 assert_eq!(inlay_cache.version, 2);
1215 });
1216 }
1217
1218 #[gpui::test]
1219 async fn test_hint_setting_changes(cx: &mut gpui::TestAppContext) {
1220 let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
1221 init_test(cx, |settings| {
1222 settings.defaults.inlay_hints = Some(InlayHintSettings {
1223 enabled: true,
1224 show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1225 show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
1226 show_other_hints: allowed_hint_kinds.contains(&None),
1227 })
1228 });
1229
1230 let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await;
1231 let lsp_request_count = Arc::new(AtomicU32::new(0));
1232 let another_lsp_request_count = Arc::clone(&lsp_request_count);
1233 fake_server
1234 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1235 let task_lsp_request_count = Arc::clone(&another_lsp_request_count);
1236 async move {
1237 Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
1238 assert_eq!(
1239 params.text_document.uri,
1240 lsp::Url::from_file_path(file_with_hints).unwrap(),
1241 );
1242 Ok(Some(vec![
1243 lsp::InlayHint {
1244 position: lsp::Position::new(0, 1),
1245 label: lsp::InlayHintLabel::String("type hint".to_string()),
1246 kind: Some(lsp::InlayHintKind::TYPE),
1247 text_edits: None,
1248 tooltip: None,
1249 padding_left: None,
1250 padding_right: None,
1251 data: None,
1252 },
1253 lsp::InlayHint {
1254 position: lsp::Position::new(0, 2),
1255 label: lsp::InlayHintLabel::String("parameter hint".to_string()),
1256 kind: Some(lsp::InlayHintKind::PARAMETER),
1257 text_edits: None,
1258 tooltip: None,
1259 padding_left: None,
1260 padding_right: None,
1261 data: None,
1262 },
1263 lsp::InlayHint {
1264 position: lsp::Position::new(0, 3),
1265 label: lsp::InlayHintLabel::String("other hint".to_string()),
1266 kind: None,
1267 text_edits: None,
1268 tooltip: None,
1269 padding_left: None,
1270 padding_right: None,
1271 data: None,
1272 },
1273 ]))
1274 }
1275 })
1276 .next()
1277 .await;
1278 cx.foreground().run_until_parked();
1279
1280 let mut edits_made = 1;
1281 editor.update(cx, |editor, cx| {
1282 assert_eq!(
1283 lsp_request_count.load(Ordering::Relaxed),
1284 1,
1285 "Should query new hints once"
1286 );
1287 assert_eq!(
1288 vec![
1289 "other hint".to_string(),
1290 "parameter hint".to_string(),
1291 "type hint".to_string(),
1292 ],
1293 cached_hint_labels(editor),
1294 "Should get its first hints when opening the editor"
1295 );
1296 assert_eq!(
1297 vec!["other hint".to_string(), "type hint".to_string()],
1298 visible_hint_labels(editor, cx)
1299 );
1300 let inlay_cache = editor.inlay_hint_cache();
1301 assert_eq!(
1302 inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
1303 "Cache should use editor settings to get the allowed hint kinds"
1304 );
1305 assert_eq!(
1306 inlay_cache.version, edits_made,
1307 "The editor update the cache version after every cache/view change"
1308 );
1309 });
1310
1311 fake_server
1312 .request::<lsp::request::InlayHintRefreshRequest>(())
1313 .await
1314 .expect("inlay refresh request failed");
1315 cx.foreground().run_until_parked();
1316 editor.update(cx, |editor, cx| {
1317 assert_eq!(
1318 lsp_request_count.load(Ordering::Relaxed),
1319 2,
1320 "Should load new hints twice"
1321 );
1322 assert_eq!(
1323 vec![
1324 "other hint".to_string(),
1325 "parameter hint".to_string(),
1326 "type hint".to_string(),
1327 ],
1328 cached_hint_labels(editor),
1329 "Cached hints should not change due to allowed hint kinds settings update"
1330 );
1331 assert_eq!(
1332 vec!["other hint".to_string(), "type hint".to_string()],
1333 visible_hint_labels(editor, cx)
1334 );
1335 let inlay_cache = editor.inlay_hint_cache();
1336 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1337 assert_eq!(
1338 inlay_cache.version, edits_made,
1339 "Should not update cache version due to new loaded hints being the same"
1340 );
1341 });
1342
1343 for (new_allowed_hint_kinds, expected_visible_hints) in [
1344 (HashSet::from_iter([None]), vec!["other hint".to_string()]),
1345 (
1346 HashSet::from_iter([Some(InlayHintKind::Type)]),
1347 vec!["type hint".to_string()],
1348 ),
1349 (
1350 HashSet::from_iter([Some(InlayHintKind::Parameter)]),
1351 vec!["parameter hint".to_string()],
1352 ),
1353 (
1354 HashSet::from_iter([None, Some(InlayHintKind::Type)]),
1355 vec!["other hint".to_string(), "type hint".to_string()],
1356 ),
1357 (
1358 HashSet::from_iter([None, Some(InlayHintKind::Parameter)]),
1359 vec!["other hint".to_string(), "parameter hint".to_string()],
1360 ),
1361 (
1362 HashSet::from_iter([Some(InlayHintKind::Type), Some(InlayHintKind::Parameter)]),
1363 vec!["parameter hint".to_string(), "type hint".to_string()],
1364 ),
1365 (
1366 HashSet::from_iter([
1367 None,
1368 Some(InlayHintKind::Type),
1369 Some(InlayHintKind::Parameter),
1370 ]),
1371 vec![
1372 "other hint".to_string(),
1373 "parameter hint".to_string(),
1374 "type hint".to_string(),
1375 ],
1376 ),
1377 ] {
1378 edits_made += 1;
1379 update_test_settings(cx, |settings| {
1380 settings.defaults.inlay_hints = Some(InlayHintSettings {
1381 enabled: true,
1382 show_type_hints: new_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1383 show_parameter_hints: new_allowed_hint_kinds
1384 .contains(&Some(InlayHintKind::Parameter)),
1385 show_other_hints: new_allowed_hint_kinds.contains(&None),
1386 })
1387 });
1388 cx.foreground().run_until_parked();
1389 editor.update(cx, |editor, cx| {
1390 assert_eq!(
1391 lsp_request_count.load(Ordering::Relaxed),
1392 2,
1393 "Should not load new hints on allowed hint kinds change for hint kinds {new_allowed_hint_kinds:?}"
1394 );
1395 assert_eq!(
1396 vec![
1397 "other hint".to_string(),
1398 "parameter hint".to_string(),
1399 "type hint".to_string(),
1400 ],
1401 cached_hint_labels(editor),
1402 "Should get its cached hints unchanged after the settings change for hint kinds {new_allowed_hint_kinds:?}"
1403 );
1404 assert_eq!(
1405 expected_visible_hints,
1406 visible_hint_labels(editor, cx),
1407 "Should get its visible hints filtered after the settings change for hint kinds {new_allowed_hint_kinds:?}"
1408 );
1409 let inlay_cache = editor.inlay_hint_cache();
1410 assert_eq!(
1411 inlay_cache.allowed_hint_kinds, new_allowed_hint_kinds,
1412 "Cache should use editor settings to get the allowed hint kinds for hint kinds {new_allowed_hint_kinds:?}"
1413 );
1414 assert_eq!(
1415 inlay_cache.version, edits_made,
1416 "The editor should update the cache version after every cache/view change for hint kinds {new_allowed_hint_kinds:?} due to visible hints change"
1417 );
1418 });
1419 }
1420
1421 edits_made += 1;
1422 let another_allowed_hint_kinds = HashSet::from_iter([Some(InlayHintKind::Type)]);
1423 update_test_settings(cx, |settings| {
1424 settings.defaults.inlay_hints = Some(InlayHintSettings {
1425 enabled: false,
1426 show_type_hints: another_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1427 show_parameter_hints: another_allowed_hint_kinds
1428 .contains(&Some(InlayHintKind::Parameter)),
1429 show_other_hints: another_allowed_hint_kinds.contains(&None),
1430 })
1431 });
1432 cx.foreground().run_until_parked();
1433 editor.update(cx, |editor, cx| {
1434 assert_eq!(
1435 lsp_request_count.load(Ordering::Relaxed),
1436 2,
1437 "Should not load new hints when hints got disabled"
1438 );
1439 assert!(
1440 cached_hint_labels(editor).is_empty(),
1441 "Should clear the cache when hints got disabled"
1442 );
1443 assert!(
1444 visible_hint_labels(editor, cx).is_empty(),
1445 "Should clear visible hints when hints got disabled"
1446 );
1447 let inlay_cache = editor.inlay_hint_cache();
1448 assert_eq!(
1449 inlay_cache.allowed_hint_kinds, another_allowed_hint_kinds,
1450 "Should update its allowed hint kinds even when hints got disabled"
1451 );
1452 assert_eq!(
1453 inlay_cache.version, edits_made,
1454 "The editor should update the cache version after hints got disabled"
1455 );
1456 });
1457
1458 fake_server
1459 .request::<lsp::request::InlayHintRefreshRequest>(())
1460 .await
1461 .expect("inlay refresh request failed");
1462 cx.foreground().run_until_parked();
1463 editor.update(cx, |editor, cx| {
1464 assert_eq!(
1465 lsp_request_count.load(Ordering::Relaxed),
1466 2,
1467 "Should not load new hints when they got disabled"
1468 );
1469 assert!(cached_hint_labels(editor).is_empty());
1470 assert!(visible_hint_labels(editor, cx).is_empty());
1471 let inlay_cache = editor.inlay_hint_cache();
1472 assert_eq!(inlay_cache.allowed_hint_kinds, another_allowed_hint_kinds);
1473 assert_eq!(
1474 inlay_cache.version, edits_made,
1475 "The editor should not update the cache version after /refresh query without updates"
1476 );
1477 });
1478
1479 let final_allowed_hint_kinds = HashSet::from_iter([Some(InlayHintKind::Parameter)]);
1480 edits_made += 1;
1481 update_test_settings(cx, |settings| {
1482 settings.defaults.inlay_hints = Some(InlayHintSettings {
1483 enabled: true,
1484 show_type_hints: final_allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1485 show_parameter_hints: final_allowed_hint_kinds
1486 .contains(&Some(InlayHintKind::Parameter)),
1487 show_other_hints: final_allowed_hint_kinds.contains(&None),
1488 })
1489 });
1490 cx.foreground().run_until_parked();
1491 editor.update(cx, |editor, cx| {
1492 assert_eq!(
1493 lsp_request_count.load(Ordering::Relaxed),
1494 3,
1495 "Should query for new hints when they got reenabled"
1496 );
1497 assert_eq!(
1498 vec![
1499 "other hint".to_string(),
1500 "parameter hint".to_string(),
1501 "type hint".to_string(),
1502 ],
1503 cached_hint_labels(editor),
1504 "Should get its cached hints fully repopulated after the hints got reenabled"
1505 );
1506 assert_eq!(
1507 vec!["parameter hint".to_string()],
1508 visible_hint_labels(editor, cx),
1509 "Should get its visible hints repopulated and filtered after the h"
1510 );
1511 let inlay_cache = editor.inlay_hint_cache();
1512 assert_eq!(
1513 inlay_cache.allowed_hint_kinds, final_allowed_hint_kinds,
1514 "Cache should update editor settings when hints got reenabled"
1515 );
1516 assert_eq!(
1517 inlay_cache.version, edits_made,
1518 "Cache should update its version after hints got reenabled"
1519 );
1520 });
1521
1522 fake_server
1523 .request::<lsp::request::InlayHintRefreshRequest>(())
1524 .await
1525 .expect("inlay refresh request failed");
1526 cx.foreground().run_until_parked();
1527 editor.update(cx, |editor, cx| {
1528 assert_eq!(
1529 lsp_request_count.load(Ordering::Relaxed),
1530 4,
1531 "Should query for new hints again"
1532 );
1533 assert_eq!(
1534 vec![
1535 "other hint".to_string(),
1536 "parameter hint".to_string(),
1537 "type hint".to_string(),
1538 ],
1539 cached_hint_labels(editor),
1540 );
1541 assert_eq!(
1542 vec!["parameter hint".to_string()],
1543 visible_hint_labels(editor, cx),
1544 );
1545 let inlay_cache = editor.inlay_hint_cache();
1546 assert_eq!(inlay_cache.allowed_hint_kinds, final_allowed_hint_kinds);
1547 assert_eq!(inlay_cache.version, edits_made);
1548 });
1549 }
1550
1551 #[gpui::test]
1552 async fn test_hint_request_cancellation(cx: &mut gpui::TestAppContext) {
1553 let allowed_hint_kinds = HashSet::from_iter([None]);
1554 init_test(cx, |settings| {
1555 settings.defaults.inlay_hints = Some(InlayHintSettings {
1556 enabled: true,
1557 show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1558 show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
1559 show_other_hints: allowed_hint_kinds.contains(&None),
1560 })
1561 });
1562
1563 let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await;
1564 let fake_server = Arc::new(fake_server);
1565 let lsp_request_count = Arc::new(AtomicU32::new(0));
1566 let another_lsp_request_count = Arc::clone(&lsp_request_count);
1567 fake_server
1568 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1569 let task_lsp_request_count = Arc::clone(&another_lsp_request_count);
1570 async move {
1571 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1;
1572 assert_eq!(
1573 params.text_document.uri,
1574 lsp::Url::from_file_path(file_with_hints).unwrap(),
1575 );
1576 Ok(Some(vec![lsp::InlayHint {
1577 position: lsp::Position::new(0, i),
1578 label: lsp::InlayHintLabel::String(i.to_string()),
1579 kind: None,
1580 text_edits: None,
1581 tooltip: None,
1582 padding_left: None,
1583 padding_right: None,
1584 data: None,
1585 }]))
1586 }
1587 })
1588 .next()
1589 .await;
1590
1591 let mut expected_changes = Vec::new();
1592 for change_after_opening in [
1593 "initial change #1",
1594 "initial change #2",
1595 "initial change #3",
1596 ] {
1597 editor.update(cx, |editor, cx| {
1598 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
1599 editor.handle_input(change_after_opening, cx);
1600 });
1601 expected_changes.push(change_after_opening);
1602 }
1603
1604 cx.foreground().run_until_parked();
1605
1606 editor.update(cx, |editor, cx| {
1607 let current_text = editor.text(cx);
1608 for change in &expected_changes {
1609 assert!(
1610 current_text.contains(change),
1611 "Should apply all changes made"
1612 );
1613 }
1614 assert_eq!(
1615 lsp_request_count.load(Ordering::Relaxed),
1616 2,
1617 "Should query new hints twice: for editor init and for the last edit that interrupted all others"
1618 );
1619 let expected_hints = vec!["2".to_string()];
1620 assert_eq!(
1621 expected_hints,
1622 cached_hint_labels(editor),
1623 "Should get hints from the last edit landed only"
1624 );
1625 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1626 let inlay_cache = editor.inlay_hint_cache();
1627 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1628 assert_eq!(
1629 inlay_cache.version, 1,
1630 "Only one update should be registered in the cache after all cancellations"
1631 );
1632 });
1633
1634 let mut edits = Vec::new();
1635 for async_later_change in [
1636 "another change #1",
1637 "another change #2",
1638 "another change #3",
1639 ] {
1640 expected_changes.push(async_later_change);
1641 let task_editor = editor.clone();
1642 let mut task_cx = cx.clone();
1643 edits.push(cx.foreground().spawn(async move {
1644 task_editor.update(&mut task_cx, |editor, cx| {
1645 editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
1646 editor.handle_input(async_later_change, cx);
1647 });
1648 }));
1649 }
1650 let _ = futures::future::join_all(edits).await;
1651 cx.foreground().run_until_parked();
1652
1653 editor.update(cx, |editor, cx| {
1654 let current_text = editor.text(cx);
1655 for change in &expected_changes {
1656 assert!(
1657 current_text.contains(change),
1658 "Should apply all changes made"
1659 );
1660 }
1661 assert_eq!(
1662 lsp_request_count.load(Ordering::SeqCst),
1663 3,
1664 "Should query new hints one more time, for the last edit only"
1665 );
1666 let expected_hints = vec!["3".to_string()];
1667 assert_eq!(
1668 expected_hints,
1669 cached_hint_labels(editor),
1670 "Should get hints from the last edit landed only"
1671 );
1672 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
1673 let inlay_cache = editor.inlay_hint_cache();
1674 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1675 assert_eq!(
1676 inlay_cache.version, 2,
1677 "Should update the cache version once more, for the new change"
1678 );
1679 });
1680 }
1681
1682 #[gpui::test]
1683 async fn test_large_buffer_inlay_requests_split(cx: &mut gpui::TestAppContext) {
1684 let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
1685 init_test(cx, |settings| {
1686 settings.defaults.inlay_hints = Some(InlayHintSettings {
1687 enabled: true,
1688 show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1689 show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
1690 show_other_hints: allowed_hint_kinds.contains(&None),
1691 })
1692 });
1693
1694 let mut language = Language::new(
1695 LanguageConfig {
1696 name: "Rust".into(),
1697 path_suffixes: vec!["rs".to_string()],
1698 ..Default::default()
1699 },
1700 Some(tree_sitter_rust::language()),
1701 );
1702 let mut fake_servers = language
1703 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
1704 capabilities: lsp::ServerCapabilities {
1705 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
1706 ..Default::default()
1707 },
1708 ..Default::default()
1709 }))
1710 .await;
1711 let fs = FakeFs::new(cx.background());
1712 fs.insert_tree(
1713 "/a",
1714 json!({
1715 "main.rs": format!("fn main() {{\n{}\n}}", "let i = 5;\n".repeat(500)),
1716 "other.rs": "// Test file",
1717 }),
1718 )
1719 .await;
1720 let project = Project::test(fs, ["/a".as_ref()], cx).await;
1721 project.update(cx, |project, _| project.languages().add(Arc::new(language)));
1722 let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
1723 let worktree_id = workspace.update(cx, |workspace, cx| {
1724 workspace.project().read_with(cx, |project, cx| {
1725 project.worktrees(cx).next().unwrap().read(cx).id()
1726 })
1727 });
1728
1729 let _buffer = project
1730 .update(cx, |project, cx| {
1731 project.open_local_buffer("/a/main.rs", cx)
1732 })
1733 .await
1734 .unwrap();
1735 cx.foreground().run_until_parked();
1736 cx.foreground().start_waiting();
1737 let fake_server = fake_servers.next().await.unwrap();
1738 let editor = workspace
1739 .update(cx, |workspace, cx| {
1740 workspace.open_path((worktree_id, "main.rs"), None, true, cx)
1741 })
1742 .await
1743 .unwrap()
1744 .downcast::<Editor>()
1745 .unwrap();
1746 let lsp_request_ranges = Arc::new(Mutex::new(Vec::new()));
1747 let lsp_request_count = Arc::new(AtomicU32::new(0));
1748 let closure_lsp_request_ranges = Arc::clone(&lsp_request_ranges);
1749 let closure_lsp_request_count = Arc::clone(&lsp_request_count);
1750 fake_server
1751 .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
1752 let task_lsp_request_ranges = Arc::clone(&closure_lsp_request_ranges);
1753 let task_lsp_request_count = Arc::clone(&closure_lsp_request_count);
1754 async move {
1755 assert_eq!(
1756 params.text_document.uri,
1757 lsp::Url::from_file_path("/a/main.rs").unwrap(),
1758 );
1759
1760 task_lsp_request_ranges.lock().push(params.range);
1761 let query_start = params.range.start;
1762 let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1;
1763 Ok(Some(vec![lsp::InlayHint {
1764 position: query_start,
1765 label: lsp::InlayHintLabel::String(i.to_string()),
1766 kind: None,
1767 text_edits: None,
1768 tooltip: None,
1769 padding_left: None,
1770 padding_right: None,
1771 data: None,
1772 }]))
1773 }
1774 })
1775 .next()
1776 .await;
1777 cx.foreground().run_until_parked();
1778 editor.update(cx, |editor, cx| {
1779 let mut ranges = lsp_request_ranges.lock().drain(..).collect::<Vec<_>>();
1780 ranges.sort_by_key(|range| range.start);
1781 assert_eq!(ranges.len(), 2, "When scroll is at the edge of a big document, its visible part + the rest should be queried for hints");
1782 assert_eq!(ranges[0].start, lsp::Position::new(0, 0), "Should query from the beginning of the document");
1783 assert_eq!(ranges[0].end.line, ranges[1].start.line, "Both requests should be on the same line");
1784 assert_eq!(ranges[0].end.character + 1, ranges[1].start.character, "Both request should be concequent");
1785
1786 assert_eq!(lsp_request_count.load(Ordering::SeqCst), 2,
1787 "When scroll is at the edge of a big document, its visible part + the rest should be queried for hints");
1788 let expected_layers = vec!["1".to_string(), "2".to_string()];
1789 assert_eq!(
1790 expected_layers,
1791 cached_hint_labels(editor),
1792 "Should have hints from both LSP requests made for a big file"
1793 );
1794 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
1795 let inlay_cache = editor.inlay_hint_cache();
1796 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1797 assert_eq!(
1798 inlay_cache.version, 2,
1799 "Both LSP queries should've bumped the cache version"
1800 );
1801 });
1802
1803 editor.update(cx, |editor, cx| {
1804 editor.scroll_screen(&ScrollAmount::Page(1.0), cx);
1805 editor.scroll_screen(&ScrollAmount::Page(1.0), cx);
1806 editor.change_selections(None, cx, |s| s.select_ranges([600..600]));
1807 editor.handle_input("++++more text++++", cx);
1808 });
1809
1810 cx.foreground().run_until_parked();
1811 editor.update(cx, |editor, cx| {
1812 let mut ranges = lsp_request_ranges.lock().drain(..).collect::<Vec<_>>();
1813 ranges.sort_by_key(|range| range.start);
1814 assert_eq!(ranges.len(), 3, "When scroll is at the middle of a big document, its visible part + 2 other inbisible parts should be queried for hints");
1815 assert_eq!(ranges[0].start, lsp::Position::new(0, 0), "Should query from the beginning of the document");
1816 assert_eq!(ranges[0].end.line + 1, ranges[1].start.line, "Neighbour requests got on different lines due to the line end");
1817 assert_ne!(ranges[0].end.character, 0, "First query was in the end of the line, not in the beginning");
1818 assert_eq!(ranges[1].start.character, 0, "Second query got pushed into a new line and starts from the beginning");
1819 assert_eq!(ranges[1].end.line, ranges[2].start.line, "Neighbour requests should be on the same line");
1820 assert_eq!(ranges[1].end.character + 1, ranges[2].start.character, "Neighbour request should be concequent");
1821
1822 assert_eq!(lsp_request_count.load(Ordering::SeqCst), 5,
1823 "When scroll not at the edge of a big document, visible part + 2 other parts should be queried for hints");
1824 let expected_layers = vec!["3".to_string(), "4".to_string(), "5".to_string()];
1825 assert_eq!(expected_layers, cached_hint_labels(editor),
1826 "Should have hints from the new LSP response after edit");
1827 assert_eq!(expected_layers, visible_hint_labels(editor, cx));
1828 let inlay_cache = editor.inlay_hint_cache();
1829 assert_eq!(inlay_cache.allowed_hint_kinds, allowed_hint_kinds);
1830 assert_eq!(inlay_cache.version, 5, "Should update the cache for every LSP response with hints added");
1831 });
1832 }
1833
1834 #[gpui::test]
1835 async fn test_multiple_excerpts_large_multibuffer(
1836 deterministic: Arc<Deterministic>,
1837 cx: &mut gpui::TestAppContext,
1838 ) {
1839 let allowed_hint_kinds = HashSet::from_iter([None, Some(InlayHintKind::Type)]);
1840 init_test(cx, |settings| {
1841 settings.defaults.inlay_hints = Some(InlayHintSettings {
1842 enabled: true,
1843 show_type_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Type)),
1844 show_parameter_hints: allowed_hint_kinds.contains(&Some(InlayHintKind::Parameter)),
1845 show_other_hints: allowed_hint_kinds.contains(&None),
1846 })
1847 });
1848
1849 let mut language = Language::new(
1850 LanguageConfig {
1851 name: "Rust".into(),
1852 path_suffixes: vec!["rs".to_string()],
1853 ..Default::default()
1854 },
1855 Some(tree_sitter_rust::language()),
1856 );
1857 let mut fake_servers = language
1858 .set_fake_lsp_adapter(Arc::new(FakeLspAdapter {
1859 capabilities: lsp::ServerCapabilities {
1860 inlay_hint_provider: Some(lsp::OneOf::Left(true)),
1861 ..Default::default()
1862 },
1863 ..Default::default()
1864 }))
1865 .await;
1866 let language = Arc::new(language);
1867 let fs = FakeFs::new(cx.background());
1868 fs.insert_tree(
1869 "/a",
1870 json!({
1871 "main.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|i| format!("let i = {i};\n")).collect::<Vec<_>>().join("")),
1872 "other.rs": format!("fn main() {{\n{}\n}}", (0..501).map(|j| format!("let j = {j};\n")).collect::<Vec<_>>().join("")),
1873 }),
1874 )
1875 .await;
1876 let project = Project::test(fs, ["/a".as_ref()], cx).await;
1877 project.update(cx, |project, _| {
1878 project.languages().add(Arc::clone(&language))
1879 });
1880 let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
1881 let worktree_id = workspace.update(cx, |workspace, cx| {
1882 workspace.project().read_with(cx, |project, cx| {
1883 project.worktrees(cx).next().unwrap().read(cx).id()
1884 })
1885 });
1886
1887 let buffer_1 = project
1888 .update(cx, |project, cx| {
1889 project.open_buffer((worktree_id, "main.rs"), cx)
1890 })
1891 .await
1892 .unwrap();
1893 let buffer_2 = project
1894 .update(cx, |project, cx| {
1895 project.open_buffer((worktree_id, "other.rs"), cx)
1896 })
1897 .await
1898 .unwrap();
1899 let multibuffer = cx.add_model(|cx| {
1900 let mut multibuffer = MultiBuffer::new(0);
1901 multibuffer.push_excerpts(

374 more lines aren’t shown here.

crates/editor/src/multi_buffer.rs+5−5

This diff is large: its 45 lines aren’t shown here.

crates/editor/src/multi_buffer/anchor.rs+17−0

This diff is large: its 31 lines aren’t shown here.

crates/editor/src/scroll.rs+21−5

This diff is large: its 59 lines aren’t shown here.

crates/editor/src/scroll/actions.rs+6−6

This diff is large: its 29 lines aren’t shown here.

crates/editor/src/scroll/scroll_amount.rs+15−17

This diff is large: its 53 lines aren’t shown here.

crates/feedback/src/deploy_feedback_button.rs+2−1

This diff is large: its 10 lines aren’t shown here.

crates/feedback/src/submit_feedback_button.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/file_finder/src/file_finder.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/fs/Cargo.toml+4−0

This diff is large: its 11 lines aren’t shown here.

crates/fs/src/fs.rs+86−26

This diff is large: its 240 lines aren’t shown here.

crates/fs/src/repository.rs+47−1

This diff is large: its 75 lines aren’t shown here.

crates/go_to_line/src/go_to_line.rs+11−0

This diff is large: its 37 lines aren’t shown here.

crates/gpui/src/app.rs+39−15

This diff is large: its 113 lines aren’t shown here.

crates/gpui/src/app/action.rs+4−4

This diff is large: its 29 lines aren’t shown here.

crates/gpui/src/app/window.rs+40−25

This diff is large: its 179 lines aren’t shown here.

crates/gpui/src/color.rs+3−2

This diff is large: its 19 lines aren’t shown here.

crates/gpui/src/elements.rs+1−91

This diff is large: its 106 lines aren’t shown here.

crates/gpui/src/elements/container.rs+6−4

This diff is large: its 43 lines aren’t shown here.

crates/gpui/src/elements/image.rs+2−1

This diff is large: its 17 lines aren’t shown here.

crates/gpui/src/elements/label.rs+3−1

This diff is large: its 25 lines aren’t shown here.

crates/gpui/src/elements/list.rs+5−5

This diff is large: its 45 lines aren’t shown here.

crates/gpui/src/elements/mouse_event_handler.rs+11−2

This diff is large: its 27 lines aren’t shown here.

crates/gpui/src/elements/svg.rs+31−6

This diff is large: its 63 lines aren’t shown here.

crates/gpui/src/elements/tooltip.rs+3−2

This diff is large: its 26 lines aren’t shown here.

crates/gpui/src/executor.rs+4−1

This diff is large: its 22 lines aren’t shown here.

crates/gpui/src/font_cache.rs+2−1

This diff is large: its 16 lines aren’t shown here.

crates/gpui/src/fonts.rs+29−4

This diff is large: its 68 lines aren’t shown here.

crates/gpui/src/gpui.rs+3−1

This diff is large: its 12 lines aren’t shown here.

crates/gpui/src/platform.rs+2−1

This diff is large: its 17 lines aren’t shown here.

crates/gpui/src/platform/mac/platform.rs+6−3

This diff is large: its 30 lines aren’t shown here.

crates/gpui/src/scene.rs+2−1

This diff is large: its 17 lines aren’t shown here.

crates/gpui/src/scene/mouse_event.rs+22−0

This diff is large: its 64 lines aren’t shown here.

crates/gpui/src/scene/mouse_region.rs+36−1

This diff is large: its 65 lines aren’t shown here.

crates/gpui_macros/src/gpui_macros.rs+67−2

This diff is large: its 80 lines aren’t shown here.

crates/language/src/language.rs+193−77

This diff is large: its 471 lines aren’t shown here.

crates/language/src/language_settings.rs+60−1

This diff is large: its 102 lines aren’t shown here.

crates/language/src/syntax_map.rs+169−78

This diff is large: its 384 lines aren’t shown here.

crates/language/src/syntax_map/syntax_map_tests.rs+32−1

This diff is large: its 67 lines aren’t shown here.

crates/language_selector/src/active_buffer_language.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/language_selector/src/language_selector.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/language_tools/src/lsp_log.rs+5−3

This diff is large: its 29 lines aren’t shown here.

crates/language_tools/src/syntax_tree_view.rs+3−2

This diff is large: its 19 lines aren’t shown here.

crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift+131−1

This diff is large: its 209 lines aren’t shown here.

crates/live_kit_client/examples/test_app.rs+94−12

This diff is large: its 144 lines aren’t shown here.

crates/live_kit_client/src/live_kit_client.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/live_kit_client/src/prod.rs+384−1

This diff is large: its 496 lines aren’t shown here.

crates/live_kit_client/src/test.rs+162−6

This diff is large: its 265 lines aren’t shown here.

crates/lsp/src/lsp.rs+61−24

This diff is large: its 236 lines aren’t shown here.

crates/node_runtime/Cargo.toml+1−0

This diff is large: its 5 lines aren’t shown here.

crates/node_runtime/src/node_runtime.rs+120−83

This diff is large: its 275 lines aren’t shown here.

crates/outline/src/outline.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/picker/src/picker.rs+25−0

This diff is large: its 74 lines aren’t shown here.

crates/project/Cargo.toml+1−1

This diff is large: its 9 lines aren’t shown here.

crates/project/src/lsp_command.rs+349−4

This diff is large: its 375 lines aren’t shown here.

crates/project/src/project.rs+989−442

This diff is large: its 1749 lines aren’t shown here.

crates/project/src/project_tests.rs+118−15

This diff is large: its 189 lines aren’t shown here.

crates/project/src/worktree.rs+719−391

This diff is large: its 1777 lines aren’t shown here.

crates/project/src/worktree_tests.rs+708−90

This diff is large: its 1061 lines aren’t shown here.

crates/project_panel/Cargo.toml+1−0

This diff is large: its 8 lines aren’t shown here.

crates/project_panel/src/project_panel.rs+219−43

This diff is large: its 413 lines aren’t shown here.

crates/project_symbols/src/project_symbols.rs+5−2

This diff is large: its 21 lines aren’t shown here.

crates/recent_projects/Cargo.toml+1−0

This diff is large: its 8 lines aren’t shown here.

crates/recent_projects/src/recent_projects.rs+20−4

This diff is large: its 69 lines aren’t shown here.

crates/rope/src/rope.rs+7−1

This diff is large: its 22 lines aren’t shown here.

crates/rpc/proto/zed.proto+79−1

This diff is large: its 115 lines aren’t shown here.

crates/rpc/src/proto.rs+11−0

This diff is large: its 56 lines aren’t shown here.

crates/rpc/src/rpc.rs+1−1

This diff is large: its 6 lines aren’t shown here.

crates/search/src/buffer_search.rs+14−6

This diff is large: its 62 lines aren’t shown here.

crates/search/src/project_search.rs+6−2

This diff is large: its 22 lines aren’t shown here.

crates/settings/Cargo.toml+3−3

This diff is large: its 18 lines aren’t shown here.

crates/settings/src/keymap_file.rs+55−15

This diff is large: its 128 lines aren’t shown here.

crates/settings/src/settings_store.rs+1−4

This diff is large: its 13 lines aren’t shown here.

crates/sum_tree/src/cursor.rs+38−2

This diff is large: its 61 lines aren’t shown here.

crates/sum_tree/src/sum_tree.rs+49−31

This diff is large: its 297 lines aren’t shown here.

crates/sum_tree/src/tree_map.rs+3−3

This diff is large: its 27 lines aren’t shown here.

crates/terminal_view/src/terminal_element.rs+11−10

This diff is large: its 28 lines aren’t shown here.

crates/terminal_view/src/terminal_panel.rs+3−0

This diff is large: its 24 lines aren’t shown here.

crates/text/src/text.rs+21−16

This diff is large: its 107 lines aren’t shown here.

crates/theme/src/theme.rs+181−146

This diff is large: its 973 lines aren’t shown here.

crates/theme/src/theme_settings.rs+2−1

This diff is large: its 15 lines aren’t shown here.

crates/theme/src/ui.rs+12−31

This diff is large: its 103 lines aren’t shown here.

crates/theme_selector/src/theme_selector.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/theme_testbench/Cargo.toml+0−19

This diff is large: its 20 lines aren’t shown here.

crates/theme_testbench/src/theme_testbench.rs+0−300

This diff is large: its 301 lines aren’t shown here.

crates/util/src/paths.rs+1−0

This diff is large: its 8 lines aren’t shown here.

crates/util/src/util.rs+12−2

This diff is large: its 34 lines aren’t shown here.

crates/vim/src/motion.rs+18−9

This diff is large: its 58 lines aren’t shown here.

crates/vim/src/normal.rs+26−64

This diff is large: its 186 lines aren’t shown here.

crates/vim/src/normal/case.rs+64−0

This diff is large: its 65 lines aren’t shown here.

crates/vim/src/normal/change.rs+5−4

This diff is large: its 32 lines aren’t shown here.

crates/vim/src/normal/delete.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/vim/src/normal/scroll.rs+120−0

This diff is large: its 121 lines aren’t shown here.

crates/vim/src/normal/substitute.rs+73−0

This diff is large: its 74 lines aren’t shown here.

crates/vim/src/normal/yank.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/vim/src/test.rs+41−0

This diff is large: its 45 lines aren’t shown here.

crates/vim/src/vim.rs+3−4

This diff is large: its 17 lines aren’t shown here.

crates/vim/src/visual.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/welcome/src/base_keymap_picker.rs+1−1

This diff is large: its 9 lines aren’t shown here.

crates/workspace/src/dock.rs+7−4

This diff is large: its 35 lines aren’t shown here.

crates/workspace/src/item.rs+2−2

This diff is large: its 11 lines aren’t shown here.

crates/workspace/src/notifications.rs+2−2

This diff is large: its 18 lines aren’t shown here.

crates/workspace/src/pane.rs+48−23

This diff is large: its 164 lines aren’t shown here.

crates/workspace/src/persistence.rs+21−6

This diff is large: its 62 lines aren’t shown here.

crates/workspace/src/persistence/model.rs+5−1

This diff is large: its 30 lines aren’t shown here.

crates/workspace/src/toolbar.rs+33−43

This diff is large: its 167 lines aren’t shown here.

crates/workspace/src/workspace.rs+145−44

This diff is large: its 437 lines aren’t shown here.

crates/xtask/Cargo.toml+13−0

This diff is large: its 14 lines aren’t shown here.

crates/xtask/src/cli.rs+23−0

This diff is large: its 24 lines aren’t shown here.

crates/xtask/src/main.rs+29−0

This diff is large: its 30 lines aren’t shown here.

crates/zed-actions/Cargo.toml+10−0

This diff is large: its 11 lines aren’t shown here.

crates/zed-actions/src/lib.rs+28−0

This diff is large: its 29 lines aren’t shown here.

crates/zed/Cargo.toml+3−3

This diff is large: its 31 lines aren’t shown here.

crates/zed/src/assets.rs+1−0

This diff is large: its 8 lines aren’t shown here.

crates/zed/src/languages/c.rs+57−36

This diff is large: its 139 lines aren’t shown here.

crates/zed/src/languages/elixir.rs+91−29

This diff is large: its 179 lines aren’t shown here.

crates/zed/src/languages/elixir/highlights.scm+7−2

This diff is large: its 20 lines aren’t shown here.

crates/zed/src/languages/go.rs+95−36

This diff is large: its 183 lines aren’t shown here.

crates/zed/src/languages/heex/highlights.scm+9−6

This diff is large: its 34 lines aren’t shown here.

crates/zed/src/languages/heex/injections.scm+10−10

This diff is large: its 24 lines aren’t shown here.

crates/zed/src/languages/html.rs+58−37

This diff is large: its 142 lines aren’t shown here.

crates/zed/src/languages/json.rs+48−30

This diff is large: its 122 lines aren’t shown here.

crates/zed/src/languages/language_plugin.rs+17−5

This diff is large: its 60 lines aren’t shown here.

crates/zed/src/languages/lua.rs+61−35

This diff is large: its 133 lines aren’t shown here.

crates/zed/src/languages/python.rs+51−33

This diff is large: its 138 lines aren’t shown here.

crates/zed/src/languages/ruby.rs+17−5

This diff is large: its 54 lines aren’t shown here.

crates/zed/src/languages/rust.rs+45−21

This diff is large: its 113 lines aren’t shown here.

crates/zed/src/languages/typescript.rs+88−49

This diff is large: its 231 lines aren’t shown here.

crates/zed/src/languages/yaml.rs+50−33

This diff is large: its 137 lines aren’t shown here.

crates/zed/src/main.rs+88−93

This diff is large: its 290 lines aren’t shown here.

crates/zed/src/zed.rs+173−42

This diff is large: its 281 lines aren’t shown here.

docs/backend-development.md+52−0

This diff is large: its 53 lines aren’t shown here.

docs/building-zed.md+79−0

This diff is large: its 80 lines aren’t shown here.

docs/company-and-vision.md+34−0

This diff is large: its 35 lines aren’t shown here.

docs/design-tools.md+74−0

This diff is large: its 75 lines aren’t shown here.

docs/index.md+14−0

This diff is large: its 15 lines aren’t shown here.

docs/local-collaboration.md+22−0

This diff is large: its 23 lines aren’t shown here.

docs/release-process.md+96−0

This diff is large: its 97 lines aren’t shown here.

docs/tools.md+82−0

This diff is large: its 83 lines aren’t shown here.

docs/zed/syntax-highlighting.md+79−0

This diff is large: its 80 lines aren’t shown here.

script/build-theme-types+10−0

This diff is large: its 11 lines aren’t shown here.

script/start-local-collaboration+1−1

This diff is large: its 7 lines aren’t shown here.

styles/.eslintrc.js+33−0

This diff is large: its 34 lines aren’t shown here.

styles/.gitignore+1−0

This diff is large: its 3 lines aren’t shown here.

styles/.prettierrc+6−0

This diff is large: its 7 lines aren’t shown here.

styles/.zed/settings.json+20−0

This diff is large: its 21 lines aren’t shown here.

styles/package-lock.json+4207−257

This diff is large: its 4597 lines aren’t shown here.

styles/package.json+21−15

This diff is large: its 53 lines aren’t shown here.

styles/src/buildLicenses.ts+0−50

This diff is large: its 51 lines aren’t shown here.

styles/src/buildThemes.ts+0−43

This diff is large: its 44 lines aren’t shown here.

styles/src/buildTokens.ts+0−85

This diff is large: its 86 lines aren’t shown here.

styles/src/build_licenses.ts+50−0

This diff is large: its 51 lines aren’t shown here.

styles/src/build_themes.ts+47−0

This diff is large: its 48 lines aren’t shown here.

styles/src/build_tokens.ts+90−0

This diff is large: its 91 lines aren’t shown here.

styles/src/build_types.ts+62−0

This diff is large: its 63 lines aren’t shown here.

styles/src/common.ts+4−22

This diff is large: its 47 lines aren’t shown here.

styles/src/component/icon_button.ts+85−0

This diff is large: its 86 lines aren’t shown here.

styles/src/component/text_button.ts+93−0

This diff is large: its 94 lines aren’t shown here.

styles/src/element/index.ts+4−0

This diff is large: its 5 lines aren’t shown here.

styles/src/element/interactive.test.ts+56−0

This diff is large: its 57 lines aren’t shown here.

styles/src/element/interactive.ts+97−0

This diff is large: its 98 lines aren’t shown here.

styles/src/element/toggle.test.ts+52−0

This diff is large: its 53 lines aren’t shown here.

styles/src/element/toggle.ts+47−0

This diff is large: its 48 lines aren’t shown here.

styles/src/styleTree/app.ts+0−74

This diff is large: its 75 lines aren’t shown here.

styles/src/styleTree/assistant.ts+0−85

This diff is large: its 86 lines aren’t shown here.

styles/src/styleTree/commandPalette.ts+0−30

This diff is large: its 31 lines aren’t shown here.

styles/src/styleTree/contactFinder.ts+0−70

This diff is large: its 71 lines aren’t shown here.

styles/src/styleTree/contactList.ts+0−182

This diff is large: its 183 lines aren’t shown here.

styles/src/styleTree/contactNotification.ts+0−45

This diff is large: its 46 lines aren’t shown here.

styles/src/styleTree/contactsPopover.ts+0−16

This diff is large: its 17 lines aren’t shown here.

styles/src/styleTree/contextMenu.ts+0−49

This diff is large: its 50 lines aren’t shown here.

styles/src/styleTree/copilot.ts+0−267

This diff is large: its 268 lines aren’t shown here.

styles/src/styleTree/editor.ts+0−281

This diff is large: its 282 lines aren’t shown here.

styles/src/styleTree/feedback.ts+0−44

This diff is large: its 45 lines aren’t shown here.

styles/src/styleTree/hoverPopover.ts+0−46

This diff is large: its 47 lines aren’t shown here.

styles/src/styleTree/incomingCallNotification.ts+0−53

This diff is large: its 54 lines aren’t shown here.

styles/src/styleTree/picker.ts+0−82

This diff is large: its 83 lines aren’t shown here.

styles/src/styleTree/projectDiagnostics.ts+0−13

This diff is large: its 14 lines aren’t shown here.

styles/src/styleTree/projectPanel.ts+0−107

This diff is large: its 108 lines aren’t shown here.

styles/src/styleTree/projectSharedNotification.ts+0−54

This diff is large: its 55 lines aren’t shown here.

styles/src/styleTree/search.ts+0−113

This diff is large: its 114 lines aren’t shown here.

styles/src/styleTree/sharedScreen.ts+0−9

This diff is large: its 10 lines aren’t shown here.

styles/src/styleTree/simpleMessageNotification.ts+0−44

This diff is large: its 45 lines aren’t shown here.

styles/src/styleTree/statusBar.ts+0−126

This diff is large: its 127 lines aren’t shown here.

styles/src/styleTree/tabBar.ts+0−109

This diff is large: its 110 lines aren’t shown here.

styles/src/styleTree/terminal.ts+0−52

This diff is large: its 53 lines aren’t shown here.

styles/src/styleTree/toolbarDropdownMenu.ts+0−46

This diff is large: its 47 lines aren’t shown here.

styles/src/styleTree/tooltip.ts+0−23

This diff is large: its 24 lines aren’t shown here.

styles/src/styleTree/updateNotification.ts+0−31

This diff is large: its 32 lines aren’t shown here.

styles/src/styleTree/welcome.ts+0−129

This diff is large: its 130 lines aren’t shown here.

styles/src/styleTree/workspace.ts+0−338

This diff is large: its 339 lines aren’t shown here.

styles/src/style_tree/app.ts+62−0

This diff is large: its 63 lines aren’t shown here.

styles/src/style_tree/assistant.ts+281−0

This diff is large: its 282 lines aren’t shown here.

styles/src/style_tree/command_palette.ts+46−0

This diff is large: its 47 lines aren’t shown here.

styles/src/style_tree/components.tsrenamed from styles/src/styleTree/components.ts+67−63

This diff is large: its 254 lines aren’t shown here.

styles/src/style_tree/contact_finder.ts+74−0

This diff is large: its 75 lines aren’t shown here.

styles/src/style_tree/contact_list.ts+247−0

This diff is large: its 248 lines aren’t shown here.

styles/src/style_tree/contact_notification.ts+55−0

This diff is large: its 56 lines aren’t shown here.

styles/src/style_tree/contacts_popover.ts+16−0

This diff is large: its 17 lines aren’t shown here.

styles/src/style_tree/context_menu.ts+70−0

This diff is large: its 71 lines aren’t shown here.

styles/src/style_tree/copilot.ts+293−0

This diff is large: its 294 lines aren’t shown here.

styles/src/style_tree/editor.ts+319−0

This diff is large: its 320 lines aren’t shown here.

styles/src/style_tree/feedback.ts+51−0

This diff is large: its 52 lines aren’t shown here.

styles/src/style_tree/hover_popover.ts+49−0

This diff is large: its 50 lines aren’t shown here.

styles/src/style_tree/incoming_call_notification.ts+55−0

This diff is large: its 56 lines aren’t shown here.

styles/src/style_tree/picker.ts+132−0

This diff is large: its 133 lines aren’t shown here.

styles/src/style_tree/project_diagnostics.ts+14−0

This diff is large: its 15 lines aren’t shown here.

styles/src/style_tree/project_panel.ts+199−0

This diff is large: its 200 lines aren’t shown here.

styles/src/style_tree/project_shared_notification.ts+55−0

This diff is large: its 56 lines aren’t shown here.

styles/src/style_tree/search.ts+138−0

This diff is large: its 139 lines aren’t shown here.

styles/src/style_tree/shared_screen.ts+10−0

This diff is large: its 11 lines aren’t shown here.

styles/src/style_tree/simple_message_notification.ts+52−0

This diff is large: its 53 lines aren’t shown here.

styles/src/style_tree/status_bar.ts+156−0

This diff is large: its 157 lines aren’t shown here.

styles/src/style_tree/tab_bar.ts+131−0

This diff is large: its 132 lines aren’t shown here.

styles/src/style_tree/terminal.ts+54−0

This diff is large: its 55 lines aren’t shown here.

styles/src/style_tree/titlebar.ts+278−0

This diff is large: its 279 lines aren’t shown here.

styles/src/style_tree/toolbar_dropdown_menu.ts+66−0

This diff is large: its 67 lines aren’t shown here.

styles/src/style_tree/tooltip.ts+24−0

This diff is large: its 25 lines aren’t shown here.

styles/src/style_tree/update_notification.ts+41−0

This diff is large: its 42 lines aren’t shown here.

styles/src/style_tree/welcome.ts+157−0

This diff is large: its 158 lines aren’t shown here.

styles/src/style_tree/workspace.ts+192−0

This diff is large: its 193 lines aren’t shown here.

styles/src/system/lib/convert.ts+0−11

This diff is large: its 12 lines aren’t shown here.

styles/src/system/lib/curve.ts+0−26

This diff is large: its 27 lines aren’t shown here.

styles/src/system/lib/generate.ts+0−159

This diff is large: its 160 lines aren’t shown here.

styles/src/system/ref/color.ts+0−445

This diff is large: its 446 lines aren’t shown here.

styles/src/system/ref/curves.ts+0−25

This diff is large: its 26 lines aren’t shown here.

styles/src/system/system.ts+0−32

This diff is large: its 33 lines aren’t shown here.

styles/src/system/types.ts+0−66

This diff is large: its 67 lines aren’t shown here.

styles/src/theme/color.ts+1−1

This diff is large: its 7 lines aren’t shown here.

styles/src/theme/colorScheme.ts+0−286

This diff is large: its 287 lines aren’t shown here.

styles/src/theme/create_theme.ts+282−0

This diff is large: its 283 lines aren’t shown here.

styles/src/theme/index.ts+23−2

This diff is large: its 28 lines aren’t shown here.

styles/src/theme/ramps.ts+22−22

This diff is large: its 67 lines aren’t shown here.

styles/src/theme/syntax.ts+68−55

This diff is large: its 250 lines aren’t shown here.

styles/src/theme/themeConfig.ts+0−148

This diff is large: its 149 lines aren’t shown here.

styles/src/theme/theme_config.ts+81−0

This diff is large: its 82 lines aren’t shown here.

styles/src/theme/tokens/colorScheme.ts+0−81

This diff is large: its 82 lines aren’t shown here.

styles/src/theme/tokens/layer.ts+25−22

This diff is large: its 72 lines aren’t shown here.

styles/src/theme/tokens/players.ts+26−17

This diff is large: its 55 lines aren’t shown here.

styles/src/theme/tokens/theme.ts+101−0

This diff is large: its 102 lines aren’t shown here.

styles/src/theme/tokens/token.ts+7−2

This diff is large: its 22 lines aren’t shown here.

styles/src/themes/andromeda/LICENSE+1−1

This diff is large: its 6 lines aren’t shown here.

styles/src/themes/andromeda/andromeda.ts+13−13

This diff is large: its 46 lines aren’t shown here.

styles/src/themes/atelier/LICENSE+1−1

This diff is large: its 6 lines aren’t shown here.

styles/src/themes/atelier/atelier-cave-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-cave-light.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-dune-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-dune-light.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-estuary-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-estuary-light.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-forest-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-forest-light.ts+18−18

This diff is large: its 62 lines aren’t shown here.

styles/src/themes/atelier/atelier-heath-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-heath-light.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-lakeside-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-lakeside-light.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-plateau-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-plateau-light.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-savanna-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-savanna-light.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-seaside-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-seaside-light.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-sulphurpool-dark.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/atelier-sulphurpool-light.ts+17−17

This diff is large: its 61 lines aren’t shown here.

styles/src/themes/atelier/common.ts+3−3

This diff is large: its 16 lines aren’t shown here.

styles/src/themes/ayu/LICENSE+1−1

This diff is large: its 6 lines aren’t shown here.

styles/src/themes/ayu/ayu-dark.ts+6−6

This diff is large: its 23 lines aren’t shown here.

styles/src/themes/ayu/ayu-light.ts+6−6

This diff is large: its 23 lines aren’t shown here.

styles/src/themes/ayu/ayu-mirage.ts+6−6

This diff is large: its 23 lines aren’t shown here.

styles/src/themes/ayu/common.ts+15−15

This diff is large: its 68 lines aren’t shown here.

styles/src/themes/gruvbox/LICENSE+1−1

This diff is large: its 6 lines aren’t shown here.

styles/src/themes/gruvbox/gruvbox-common.ts+58−59

This diff is large: its 197 lines aren’t shown here.

styles/src/themes/gruvbox/gruvbox-dark-hard.ts+1−1

This diff is large: its 3 lines aren’t shown here.

styles/src/themes/gruvbox/gruvbox-dark-soft.ts+1−1

This diff is large: its 3 lines aren’t shown here.

styles/src/themes/gruvbox/gruvbox-dark.ts+1−1

This diff is large: its 3 lines aren’t shown here.

styles/src/themes/gruvbox/gruvbox-light-hard.ts+1−1

This diff is large: its 3 lines aren’t shown here.

styles/src/themes/gruvbox/gruvbox-light-soft.ts+1−1

This diff is large: its 3 lines aren’t shown here.

styles/src/themes/gruvbox/gruvbox-light.ts+1−1

This diff is large: its 3 lines aren’t shown here.

styles/src/themes/index.ts+74−74

This diff is large: its 157 lines aren’t shown here.

styles/src/themes/one/LICENSE+1−1

This diff is large: its 6 lines aren’t shown here.

styles/src/themes/one/one-dark.ts+20−19

This diff is large: its 81 lines aren’t shown here.

styles/src/themes/one/one-light.ts+19−19

This diff is large: its 80 lines aren’t shown here.

styles/src/themes/rose-pine/LICENSE+1−1

This diff is large: its 6 lines aren’t shown here.

styles/src/themes/rose-pine/common.ts+75−0

This diff is large: its 76 lines aren’t shown here.

styles/src/themes/rose-pine/rose-pine-dawn.ts+34−24

This diff is large: its 74 lines aren’t shown here.

styles/src/themes/rose-pine/rose-pine-moon.ts+30−22

This diff is large: its 70 lines aren’t shown here.

styles/src/themes/rose-pine/rose-pine.ts+29−22

This diff is large: its 67 lines aren’t shown here.

styles/src/themes/sandcastle/LICENSE+1−1

This diff is large: its 6 lines aren’t shown here.

styles/src/themes/sandcastle/sandcastle.ts+13−13

This diff is large: its 46 lines aren’t shown here.

styles/src/themes/solarized/LICENSE+1−1

This diff is large: its 6 lines aren’t shown here.

styles/src/themes/solarized/solarized.ts+17−17

This diff is large: its 59 lines aren’t shown here.

styles/src/themes/summercamp/LICENSE+1−1

This diff is large: its 6 lines aren’t shown here.

styles/src/themes/summercamp/summercamp.ts+13−13

This diff is large: its 46 lines aren’t shown here.

styles/src/utils/slugify.ts+10−1

This diff is large: its 12 lines aren’t shown here.

styles/src/utils/snakeCase.ts+0−35

This diff is large: its 36 lines aren’t shown here.

styles/tsconfig.json+6−2

This diff is large: its 14 lines aren’t shown here.

styles/vitest.config.ts+8−0

This diff is large: its 9 lines aren’t shown here.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t