zed 0.96.4

Don't highlight project search matches either (#2807 )
@JosephTLyons this is probably worth merging alongside #2803 - vim: Fix a bug where focusing project search results unexpectedly entered visual mode
2023-07-28 18:31:58 -04:00 · 2023-07-28 16:24:01 -04:00 · 2023-07-28 16:24:01 -04:00 · 2023-07-27 12:24:12 -04:00 · 2023-07-27 14:38:20 +03:00 · 2023-07-26 13:27:34 -04:00
67 changed files with 813 additions and 322 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1052,6 +1052,10 @@ dependencies = [
 "media",
 "postage",
 "project",
+ "schemars",
+ "serde",
+ "serde_derive",
+ "serde_json",
 "settings",
 "util",
 ]
@ -9450,7 +9454,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.96.0"
+version = "0.96.4"
 dependencies = [
 "activity_indicator",
 "ai",
--- a/assets/icons/file_icons/archive.svg
+++ b/assets/icons/file_icons/archive.svg
@ -1,5 +1,5 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 7.63H8" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<rect x="2" y="2" width="10" height="3" rx="1" stroke="black" stroke-width="1.25"/>
-<path d="M3 5H11L10.5663 11.0712C10.529 11.5946 10.0935 12 9.56888 12H4.43112C3.90648 12 3.47104 11.5946 3.43366 11.0712L3 5Z" stroke="black" stroke-width="1.25"/>
+<path d="M6 7.63H8" stroke="black" stroke-opacity="0.66" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="2" y="2" width="10" height="3" rx="0.5" fill="black" fill-opacity="0.33" stroke="black" stroke-width="1.25"/>
+<path d="M2.59375 5H11.4375L10.5581 11.5664C10.5248 11.8146 10.313 12 10.0625 12H3.93944C3.68812 12 3.47585 11.8134 3.44358 11.5642L2.59375 5Z" stroke="black" stroke-width="1.25"/>
 </svg>
--- a/assets/icons/file_icons/audio.svg
+++ b/assets/icons/file_icons/audio.svg
@ -0,0 +1,6 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 11C5.46973 11 4.1268 11.1873 3.31522 11.3327C2.94367 11.3992 2.60079 11.0563 2.66733 10.6848C2.81266 9.8732 3 8.53027 3 7C3 5.8387 2.89211 4.78529 2.77656 3.99011C2.73589 3.71017 3.19546 3.51715 3.36119 3.7464C4.09612 4.76304 5.23301 6.23301 6.5 7.5C7.76699 8.76699 9.23696 9.90388 10.2536 10.6388C10.4828 10.8045 10.2898 11.2641 10.0099 11.2234C9.21472 11.1079 8.1613 11 7 11Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.3594 3.35938C12.3594 3.35938 12.0146 2.9209 11.5312 2.4375C11.0479 1.9541 10.6406 1.64062 10.6406 1.64062" stroke="black" stroke-opacity="0.33" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M11.3516 7.36803C11.3516 7.36803 10.7962 5.88996 9.48438 4.57812C8.17254 3.26629 6.64062 2.64155 6.64062 2.64155" stroke="black" stroke-opacity="0.66" stroke-width="1.25" stroke-linecap="round"/>
+<rect x="2.72266" y="8.73828" width="3.58525" height="2.72899" rx="0.5" transform="rotate(45 2.72266 8.73828)" fill="black"/>
+</svg>
--- a/assets/icons/file_icons/book.svg
+++ b/assets/icons/file_icons/book.svg
@ -1,4 +1,6 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 2C7.44772 2 7 2.44772 7 3V13C7.5 12 8.5 11.375 10 11.375H11C11.5523 11.375 12 10.9273 12 10.375V3C12 2.44772 11.5523 2 11 2H8Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 2C6.55228 2 7 2.44772 7 3V13C6.5 12 5.5 11.375 4 11.375H3C2.44772 11.375 2 10.9273 2 10.375V3C2 2.44772 2.44772 2 3 2H6Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 10L12 10.8374C12 10.9431 11.9665 11.046 11.9044 11.1315L11.1498 12.1691C11.0557 12.2985 10.9054 12.375 10.7454 12.375L3.25461 12.375C3.09464 12.375 2.94433 12.2985 2.85024 12.1691L2.09563 11.1315C2.03348 11.046 2 10.9431 2 10.8374L2 2" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M2 12V10L7 11H12V12H2Z" fill="black"/>
+<path d="M5.63246 2.04415C6.44914 2.31638 7 3.08066 7 3.94152V10.7306C7 11.0924 6.62757 11.3345 6.29693 11.1875L2.79693 9.63197C2.61637 9.55172 2.5 9.37266 2.5 9.17506V1.69371C2.5 1.35243 2.83435 1.11145 3.15811 1.21937L5.63246 2.04415Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.5 2C7.67157 2 7 2.67157 7 3.5V12C7 11.1954 10.2366 11.0382 11.5017 11.0075C11.7778 11.0008 12 10.7761 12 10.5V2.5C12 2.22386 11.7761 2 11.5 2H8.5Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/file_icons/camera.svg
+++ b/assets/icons/file_icons/camera.svg
@ -1,4 +1,4 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10.1111C12 10.602 11.593 11 11.0909 11H2.90909C2.40701 11 2 10.602 2 10.1111V5.22222C2 4.7313 2.40701 4.38 2.90909 4.38H4.72727L5.5 3H8.5L9.27273 4.38H11.0909C11.593 4.38 12 4.7313 12 5.22222V10.1111Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.005 9C7.90246 9 8.63 8.27246 8.63 7.375C8.63 6.47754 7.90246 5.75 7.005 5.75C6.10753 5.75 5.38 6.47754 5.38 7.375C5.38 8.27246 6.10753 9 7.005 9Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10.5C12 10.7761 11.7761 11 11.5 11H2.5C2.22386 11 2 10.7761 2 10.5V4.88C2 4.60386 2.22386 4.38 2.5 4.38H4.4342C4.61518 4.38 4.78204 4.2822 4.87046 4.12428L5.35681 3.25572C5.44524 3.0978 5.61209 3 5.79308 3H8.20692C8.38791 3 8.55476 3.0978 8.64319 3.25572L9.12954 4.12428C9.21796 4.2822 9.38482 4.38 9.5658 4.38H11.5C11.7761 4.38 12 4.60386 12 4.88V10.5Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.005 9C7.90246 9 8.63 8.27246 8.63 7.375C8.63 6.47754 7.90246 5.75 7.005 5.75C6.10754 5.75 5.38 6.47754 5.38 7.375C5.38 8.27246 6.10754 9 7.005 9Z" fill="black" fill-opacity="0.33" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/file_icons/chevron_down.svg
+++ b/assets/icons/file_icons/chevron_down.svg
@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.63281 5.66406L6.99344 8.89844L10.3672 5.66406" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/file_icons/chevron_left.svg
+++ b/assets/icons/file_icons/chevron_left.svg
@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.35938 3.63281L5.125 6.99344L8.35938 10.3672" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/file_icons/chevron_right.svg
+++ b/assets/icons/file_icons/chevron_right.svg
@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.64062 3.64062L8.89062 7.00125L5.64062 10.375" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/file_icons/chevron_up.svg
+++ b/assets/icons/file_icons/chevron_up.svg
@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.63281 8.36719L6.99344 5.13281L10.3672 8.36719" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/file_icons/code.svg
+++ b/assets/icons/file_icons/code.svg
@ -1,4 +1,4 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 2C3.5 2 2.25 3 3 4.5C3.5 5.5 3 6.5 2 6.99894C3 7.5 3.5 8.5 3 9.5C2.25 11 3 12 5 12" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 2C10.5 2 11.75 3 11 4.5C10.5 5.5 11 6.5 12 6.99894C11 7.5 10.5 8.5 11 9.5C11.75 11 11 12 9 12" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.375 2C2.5 2 2.5 3.5 2.5 4.5C2.5 5.5 2 6.50106 1 7C2 7.50106 2.5 8.5 2.5 9.5C2.5 10.5 2.5 12 4.375 12" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.63281 2C11.5078 2 11.5078 3.5 11.5078 4.5C11.5078 5.5 12.0078 6.50106 13.0078 7C12.0078 7.50106 11.5078 8.5 11.5078 9.5C11.5078 10.5 11.5078 12 9.63281 12" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/file_icons/database.svg
+++ b/assets/icons/file_icons/database.svg
@ -1,5 +1,5 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<ellipse cx="7" cy="4" rx="5" ry="2" stroke="black" stroke-width="1.25"/>
+<ellipse cx="7" cy="4" rx="5" ry="2" fill="black" fill-opacity="0.33" stroke="black" stroke-width="1.25"/>
 <path d="M12 4V10C12 11.1046 9.76142 12 7 12C4.23858 12 2 11.1046 2 10V4" stroke="black" stroke-width="1.25"/>
 <path d="M12 7C12 8.10457 9.76142 9 7 9C4.23858 9 2 8.10457 2 7" stroke="black" stroke-width="1.25"/>
 </svg>
--- a/assets/icons/file_icons/eslint.svg
+++ b/assets/icons/file_icons/eslint.svg
@ -1,4 +1,4 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.3969 7.5625L11.8557 7.25L12.3969 7.5625C12.5979 7.21442 12.5979 6.78558 12.3969 6.4375L11.8557 6.75L12.3969 6.4375L10.1856 2.60737C9.98464 2.2593 9.61325 2.04487 9.21132 2.04487L4.78868 2.04487C4.38675 2.04487 4.01536 2.2593 3.8144 2.60737L1.60307 6.4375C1.40211 6.78558 1.40211 7.21442 1.60307 7.5625L3.8144 11.3926C4.01536 11.7407 4.38675 11.9551 4.78867 11.9551L9.21132 11.9551C9.61325 11.9551 9.98464 11.7407 10.1856 11.3926L12.3969 7.5625Z" stroke="black" stroke-width="1.25"/>
+<path d="M12.5413 7.3125C12.6529 7.11913 12.6529 6.88088 12.5413 6.6875L10.0413 2.35738C9.92962 2.164 9.72329 2.04488 9.5 2.04488L4.5 2.04488C4.27671 2.04488 4.07038 2.164 3.95873 2.35738L1.45873 6.6875C1.34709 6.88088 1.34709 7.11913 1.45873 7.3125L3.95873 11.6426C4.07038 11.836 4.27671 11.9551 4.5 11.9551L9.5 11.9551C9.72329 11.9551 9.92962 11.836 10.0413 11.6426L12.5413 7.3125Z" stroke="black" stroke-width="1.25" stroke-linejoin="round"/>
 <path d="M6.75 4.14434C6.9047 4.05502 7.0953 4.05502 7.25 4.14434L9.34808 5.35566C9.50278 5.44498 9.59808 5.61004 9.59808 5.78868V8.21132C9.59808 8.38996 9.50278 8.55502 9.34808 8.64434L7.25 9.85566C7.0953 9.94498 6.9047 9.94498 6.75 9.85566L4.65192 8.64434C4.49722 8.55502 4.40192 8.38996 4.40192 8.21132L4.40192 5.78868C4.40192 5.61004 4.49722 5.44498 4.65192 5.35566L6.75 4.14434Z" fill="black"/>
 </svg>
--- a/assets/icons/file_icons/file.svg
+++ b/assets/icons/file_icons/file.svg
@ -1,5 +1,5 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 4H10" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M2 4H10" stroke="black" stroke-opacity="0.66" stroke-width="1.25" stroke-linecap="round"/>
 <path d="M2 7H12" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-<path d="M2 10H8" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M2 10H8" stroke="black" stroke-opacity="0.33" stroke-width="1.25" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@ -17,6 +17,7 @@
    "fish": "terminal",
    "gitattributes": "vcs",
    "gitignore": "vcs",
+    "gitmodules": "vcs",
    "gif": "image",
    "go": "code",
    "h": "code",
@ -74,7 +75,7 @@
    "svg": "image",
    "swift": "code",
    "tiff": "image",
-    "toml": "settings",
+    "toml": "toml",
    "ts": "typescript",
    "tsx": "code",
    "txt": "document",
@ -89,25 +90,31 @@
  },
  "types": {
    "audio": {
-      "icon": "icons/file_icons/file.svg"
+      "icon": "icons/file_icons/audio.svg"
    },
    "code": {
      "icon": "icons/file_icons/code.svg"
    },
+    "collapsed_chevron": {
+      "icon": "icons/file_icons/chevron_right.svg"
+    },
+    "collapsed_folder": {
+      "icon": "icons/file_icons/folder.svg"
+    },
    "default": {
      "icon": "icons/file_icons/file.svg"
    },
-    "directory": {
-      "icon": "icons/file_icons/folder.svg"
-    },
    "document": {
      "icon": "icons/file_icons/book.svg"
    },
    "eslint": {
      "icon": "icons/file_icons/eslint.svg"
    },
-    "expanded_directory": {
-      "icon": "icons/file_icons/folder-open.svg"
+    "expanded_chevron": {
+      "icon": "icons/file_icons/chevron_down.svg"
+    },
+    "expanded_folder": {
+      "icon": "icons/file_icons/folder_open.svg"
    },
    "image": {
      "icon": "icons/file_icons/image.svg"
@ -136,6 +143,9 @@
    "terminal": {
      "icon": "icons/file_icons/terminal.svg"
    },
+    "toml": {
+      "icon": "icons/file_icons/toml.svg"
+    },
    "typescript": {
      "icon": "icons/file_icons/typescript.svg"
    },
@ -143,7 +153,7 @@
      "icon": "icons/file_icons/git.svg"
    },
    "video": {
-      "icon": "icons/file_icons/file.svg"
+      "icon": "icons/file_icons/video.svg"
    }
  }
 }
--- a/assets/icons/file_icons/folder-open.svg
+++ b/assets/icons/file_icons/folder-open.svg
@ -1,4 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.08592 5.30382C4.22115 4.89402 4.60401 4.61719 5.03555 4.61719H11.9295C12.6108 4.61719 13.0926 5.28358 12.8791 5.93056L11.2266 10.9384C11.0914 11.3482 10.7085 11.625 10.2769 11.625H3.38303C2.70174 11.625 2.2199 10.9586 2.4334 10.3116L4.08592 5.30382Z" stroke="black" stroke-width="1.25"/>
-<path d="M8 4.4024L7.27505 2.93264C7.10664 2.59119 6.75894 2.375 6.37821 2.375H3C2.44772 2.375 2 2.82272 2 3.375V4.4024V10.625C2 11.1773 2.44772 11.625 3 11.625H4.00781" stroke="black" stroke-width="1.25" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/file_icons/folder.svg
+++ b/assets/icons/file_icons/folder.svg
@ -1,4 +1,5 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 5.625C2 5.07272 2.44772 4.625 3 4.625H11C11.5523 4.625 12 5.07272 12 5.625V10.625C12 11.1773 11.5523 11.625 11 11.625H3C2.44772 11.625 2 11.1773 2 10.625V5.625Z" stroke="black" stroke-width="1.25"/>
-<path d="M8 4.375L7.27639 2.92779C7.107 2.589 6.76074 2.375 6.38197 2.375H3C2.44772 2.375 2 2.82272 2 3.375V8" stroke="black" stroke-width="1.25"/>
+<path d="M2 5.125C2 4.84886 2.22386 4.625 2.5 4.625H11.5C11.7761 4.625 12 4.84886 12 5.125V11.125C12 11.4011 11.7761 11.625 11.5 11.625H2.5C2.22386 11.625 2 11.4011 2 11.125V5.125Z" fill="black" fill-opacity="0.33" stroke="black" stroke-width="1.25" stroke-linejoin="round"/>
+<path d="M6.38197 2.375H2.5C2.22386 2.375 2 2.59886 2 2.875V4.375H8L7.27639 2.92779C7.107 2.589 6.76074 2.375 6.38197 2.375Z" fill="black"/>
+<path d="M2 8V4.375M2 4.375V2.875C2 2.59886 2.22386 2.375 2.5 2.375H6.38197C6.76074 2.375 7.107 2.589 7.27639 2.92779L8 4.375H2Z" stroke="black" stroke-width="1.25"/>
 </svg>
--- a/assets/icons/file_icons/folder_open.svg
+++ b/assets/icons/file_icons/folder_open.svg
@ -0,0 +1,5 @@
+<svg width="15" height="14" viewBox="0 0 15 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 2.53125H2.21875V10.625L4.5 4.59375H7.96875L7 2.53125Z" fill="black"/>
+<path d="M4.47293 4.94363C4.54554 4.74743 4.73263 4.61719 4.94184 4.61719H12.8755C13.2237 4.61719 13.4653 4.9642 13.3445 5.29074L11.1208 11.2986C11.0482 11.4948 10.8611 11.625 10.6519 11.625H2.71821C2.37002 11.625 2.12844 11.278 2.2493 10.9514L4.47293 4.94363Z" fill="black" fill-opacity="0.33" stroke="black" stroke-width="1.25"/>
+<path d="M8 4.4024L7.27505 2.93264C7.10664 2.59119 6.75894 2.375 6.37821 2.375H2.5C2.22386 2.375 2 2.59886 2 2.875V11.125C2 11.4011 2.22386 11.625 2.5 11.625H4.00781" stroke="black" stroke-width="1.25" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/file_icons/git.svg
+++ b/assets/icons/file_icons/git.svg
@ -1,6 +1,6 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
 <circle cx="4" cy="10" r="2" stroke="black" stroke-width="1.25"/>
-<circle cx="10" cy="4" r="2" stroke="black" stroke-width="1.25"/>
+<circle cx="10" cy="4" r="2" fill="black" fill-opacity="0.33" stroke="black" stroke-width="1.25"/>
 <line x1="3.625" y1="2.625" x2="3.625" y2="7.375" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
 <path d="M10 6V6C10 8.20914 8.20914 10 6 10V10" stroke="black" stroke-width="1.25"/>
 </svg>
--- a/assets/icons/file_icons/image.svg
+++ b/assets/icons/file_icons/image.svg
@ -1,6 +1,7 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M6.5 3C6.91421 3 7.25 2.66421 7.25 2.25C7.25 1.83579 6.91421 1.5 6.5 1.5C6.08579 1.5 5.75 1.83579 5.75 2.25C5.75 2.66421 6.08579 3 6.5 3Z" fill="black" stroke="black" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3.375 2H3C2.44772 2 2 2.44772 2 3V11C2 11.5523 2.44772 12 3 12H7.35938M9.64062 2H11C11.5523 2 12 2.44772 12 3V11C12 11.5523 11.5523 12 11 12H10.125" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-<path d="M2 10L5 7L7 9" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 8L9 5L12 8" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 8L9 5L12 8H6Z" fill="black" fill-opacity="0.33"/>
+<path d="M2 10L5 7L7.375 9.375" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 8L7.5 6.5L9 5L10.5 6.5L12 8" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.375 2H2.5C2.22386 2 2 2.22386 2 2.5V11.5C2 11.7761 2.22386 12 2.5 12H7.35938M9.64062 2H11.5C11.7761 2 12 2.22386 12 2.5V11.5C12 11.7761 11.7761 12 11.5 12H10.125" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/file_icons/lock.svg
+++ b/assets/icons/file_icons/lock.svg
@ -1,6 +1,6 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="3" y="5" width="8" height="7" rx="1" stroke="black" stroke-width="1.35"/>
-<path d="M4 4C4 2.89543 4.89543 2 6 2H8C9.10457 2 10 2.89543 10 4V5H4V4Z" stroke="black" stroke-width="1.35"/>
+<rect x="3" y="5" width="8" height="7" rx="0.5" stroke="black" stroke-width="1.25"/>
+<path d="M4 4C4 2.89543 4.89543 2 6 2H8C9.10457 2 10 2.89543 10 4V5H4V4Z" stroke="black" stroke-opacity="0.66" stroke-width="1.25"/>
 <circle cx="7" cy="8" r="1" fill="black"/>
 <path d="M7 8V9.375" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/file_icons/notebook.svg
+++ b/assets/icons/file_icons/notebook.svg
@ -1,6 +1,8 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.4 12H3.59997C2.71633 12 2 11.3367 2 10.5185V3.48148C2 2.66328 2.71633 2 3.59997 2H10.4C11.2837 2 12 2.66328 12 3.48148V10.5185C12 11.3367 11.2837 12 10.4 12Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.03125 2.96875C2.03125 2.41647 2.47897 1.96875 3.03125 1.96875H5V12H3.03125C2.47897 12 2.03125 11.5523 2.03125 11V2.96875Z" fill="black" fill-opacity="0.33"/>
+<rect x="2" y="2" width="10" height="10" rx="0.5" stroke="black" stroke-width="1.25"/>
 <path d="M9.5 5L7.5 5" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.5 7H7.5" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.5 7H7.5" stroke="black" stroke-opacity="0.66" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.5 9H7.5" stroke="black" stroke-opacity="0.33" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M5 2V13" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/file_icons/package.svg
+++ b/assets/icons/file_icons/package.svg
@ -1,3 +1,4 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.62679 3.88473L6.99984 6.78517M1.62679 3.88473L1.63138 9.90006L7.00444 12.8005M1.62679 3.88473L4.31118 2.54212M6.99984 6.78517L7.00444 12.8005M6.99984 6.78517L9.68415 5.33085M7.00444 12.8005L12.3731 9.89186L12.3685 3.87652M4.31118 2.54212L6.99558 1.1995L12.3685 3.87652M4.31118 2.54212L9.68415 5.33085M12.3685 3.87652L9.68415 5.33085" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.62677 3.88472L6.99983 6.78517M1.62677 3.88472L1.63137 9.90006L7.00442 12.8005M1.62677 3.88472L4.31117 2.54211M6.99983 6.78517L7.00442 12.8005M6.99983 6.78517L9.68414 5.33084M7.00442 12.8005L12.373 9.89186L12.3684 3.87652M4.31117 2.54211L6.99556 1.1995L12.3684 3.87652M4.31117 2.54211L9.68414 5.33084M12.3684 3.87652L9.68414 5.33084" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.03125 12.5625V6.78125L1.5625 3.9375V9.75L7.03125 12.5625Z" fill="black" fill-opacity="0.33"/>
 </svg>
--- a/assets/icons/file_icons/prettier.svg
+++ b/assets/icons/file_icons/prettier.svg
@ -1,12 +1,12 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M2 2.86328H8.51563" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-<path d="M11 2.86328L12 2.86328" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-<path d="M9.64062 5.6263L12 5.6263" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M11 2.86328L12 2.86328" stroke="black" stroke-opacity="0.33" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M9.64062 5.6263L12 5.6263" stroke="black" stroke-opacity="0.66" stroke-width="1.25" stroke-linecap="round"/>
 <path d="M4.79688 5.6263L7.15625 5.6263" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-<path d="M2 5.6263L2.35937 5.6263" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M2 5.6263L2.35937 5.6263" stroke="black" stroke-opacity="0.33" stroke-width="1.25" stroke-linecap="round"/>
 <path d="M7.15625 8.3737L12 8.3737" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-<path d="M2 8.3737L4.64062 8.3737" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M2 8.3737L4.64062 8.3737" stroke="black" stroke-opacity="0.66" stroke-width="1.25" stroke-linecap="round"/>
 <path d="M2 11.1094H3.54687" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
 <path d="M5.97656 11.1094H8.35938" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-<path d="M10.8203 11.1094L12 11.1094" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M10.8203 11.1094L12 11.1094" stroke="black" stroke-opacity="0.33" stroke-width="1.25" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/file_icons/rust.svg
+++ b/assets/icons/file_icons/rust.svg
@ -1,4 +1,4 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.27935 9.98207C4.32063 9.4038 3.9204 8.89049 3.35998 8.80276L2.60081 8.68387C2.37979 8.64945 2.20167 8.48001 2.15225 8.25614L2.01378 7.63511C1.96382 7.41235 2.05233 7.1807 2.23696 7.05125L2.8631 6.61242C3.33337 6.28297 3.47456 5.6369 3.18621 5.13364L2.79467 4.45092C2.68118 4.25261 2.69801 4.00374 2.83757 3.82321L3.22314 3.32436C3.3627 3.14438 3.59621 3.06994 3.81071 3.13772L4.57531 3.37769C5.11944 3.54879 5.70048 3.26159 5.90683 2.71886L6.1811 1.99782C6.26255 1.78395 6.46345 1.64285 6.68772 1.6423L7.31007 1.64063C7.53434 1.64007 7.73579 1.78006 7.81834 1.99337L8.09965 2.72275C8.30821 3.26214 8.88655 3.54712 9.42903 3.37714L10.1632 3.14716C10.3772 3.07994 10.6096 3.15382 10.7492 3.3327L11.1374 3.83099" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.27935 9.98207C4.32063 9.4038 3.9204 8.89049 3.35998 8.80276L2.60081 8.68387C2.37979 8.64945 2.20167 8.48001 2.15225 8.25614L2.01378 7.63511C1.96382 7.41235 2.05233 7.1807 2.23696 7.05125L2.8631 6.61242C3.33337 6.28297 3.47456 5.6369 3.18621 5.13364L2.79467 4.45092C2.68118 4.25261 2.69801 4.00374 2.83757 3.82321L3.22314 3.32436C3.3627 3.14438 3.59621 3.06994 3.81071 3.13772L4.57531 3.37769C5.11944 3.54879 5.70048 3.26159 5.90683 2.71886L6.1811 1.99782C6.26255 1.78395 6.46345 1.64285 6.68772 1.6423L7.31007 1.64063C7.53434 1.64007 7.73579 1.78006 7.81834 1.99337L8.09965 2.72275C8.30821 3.26214 8.88655 3.54712 9.42903 3.37714L10.1632 3.14716C10.3772 3.07994 10.6096 3.15382 10.7492 3.3327L11.1374 3.83099" stroke="black" stroke-opacity="0.66" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M7.76988 10.5933C7.76988 10.6595 7.8236 10.7133 7.88988 10.7133H7.97588C8.32602 10.7133 8.60988 10.9971 8.60988 11.3472V11.3472C8.60988 11.6974 8.32602 11.9812 7.97588 11.9812H6.05587C5.70573 11.9812 5.42188 11.6974 5.42188 11.3472V11.3472C5.42188 10.9971 5.70573 10.7133 6.05587 10.7133H6.14188C6.20815 10.7133 6.26188 10.6595 6.26188 10.5933V6.66925C6.26188 6.60298 6.20815 6.54925 6.14188 6.54925H6.05588C5.70573 6.54925 5.42188 6.2654 5.42188 5.91525V5.91525C5.42188 5.5651 5.70573 5.28125 6.05588 5.28125H8.89988C10.0518 5.28125 11.8619 5.71487 11.8619 7.15185C11.8619 7.67078 11.7284 8.10362 11.4642 8.45348C11.1981 8.79765 10.8458 9.05637 10.4056 9.22931V9.22931C10.3782 9.24007 10.3673 9.27304 10.3829 9.29801L11.2163 10.6342C11.247 10.6834 11.3008 10.7133 11.3588 10.7133H11.7319C12.082 10.7133 12.3659 10.9971 12.3659 11.3472V11.3472C12.3659 11.6974 12.082 11.9812 11.7319 11.9812H10.5637C10.4955 11.9812 10.432 11.9465 10.3952 11.889L8.96523 9.65406C8.92847 9.59661 8.86496 9.56185 8.79676 9.56185H7.96988C7.85942 9.56185 7.76988 9.65139 7.76988 9.76185V10.5933ZM8.61188 6.54925C9.02963 6.54925 10.125 6.54925 10.2339 7.18785C10.2975 7.56123 10.1181 7.86557 9.88118 8.07715C9.64227 8.29046 9.20527 8.38985 8.58788 8.38985H7.86988C7.81465 8.38985 7.76988 8.34508 7.76988 8.28985V6.64925C7.76988 6.59402 7.81465 6.54925 7.86988 6.54925H8.61188Z" fill="black"/>
 </svg>
--- a/assets/icons/file_icons/settings.svg
+++ b/assets/icons/file_icons/settings.svg
@ -1,4 +1,4 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.60081 8.94324L3.35998 9.06214C3.9204 9.14987 4.32063 9.66318 4.27935 10.2415L4.22342 11.0252C4.20713 11.2536 4.32877 11.4686 4.53024 11.568L5.09174 11.8446C5.29321 11.9441 5.53379 11.9068 5.69834 11.7519L6.26255 11.2186C6.67855 10.8253 7.32041 10.8253 7.7369 11.2186L8.3011 11.7519C8.46565 11.9075 8.70572 11.9441 8.90772 11.8446L9.47028 11.5675C9.67124 11.4686 9.79234 11.2541 9.77607 11.0264L9.72007 10.2415C9.67883 9.66318 10.079 9.14987 10.6394 9.06214L11.3986 8.94324C11.6197 8.90883 11.7978 8.73938 11.8477 8.51607L11.9862 7.89504C12.0362 7.67173 11.9477 7.44007 11.763 7.31118L11.1293 6.86731C10.6617 6.53959 10.5189 5.89966 10.8013 5.39691L11.1841 4.71586C11.2954 4.51754 11.277 4.26923 11.1374 4.09036L10.7492 3.59207C10.6096 3.4132 10.3772 3.33932 10.1632 3.40653L9.42903 3.63651C8.88655 3.80649 8.30821 3.52152 8.09965 2.98213L7.81834 2.25275C7.73579 2.03944 7.53434 1.89945 7.31007 1.9L6.68772 1.90167C6.46345 1.90222 6.26255 2.04333 6.1811 2.2572L5.90683 2.97824C5.70048 3.52097 5.11944 3.80816 4.57531 3.63707L3.81071 3.39709C3.59621 3.32932 3.3627 3.40375 3.22314 3.58374L2.83757 4.08258C2.69801 4.26312 2.68118 4.51199 2.79467 4.7103L3.18621 5.39302C3.47456 5.89628 3.33337 6.54235 2.8631 6.8718L2.23696 7.31062C2.05233 7.44007 1.96382 7.67173 2.01378 7.89449L2.15225 8.51552C2.20167 8.73938 2.37979 8.90883 2.60081 8.94324Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.14913 5.85093L8.14909 5.85089C7.51453 5.21637 6.48549 5.21637 5.85092 5.85089L5.85089 5.85092C5.21637 6.48549 5.21637 7.51453 5.85089 8.14909L5.85093 8.14913C6.48549 8.78362 7.51452 8.78362 8.14908 8.14913L8.14913 8.14908C8.78362 7.51452 8.78362 6.48549 8.14913 5.85093Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.60081 8.94324L3.35998 9.06214C3.9204 9.14986 4.32063 9.66317 4.27935 10.2414L4.22342 11.0252C4.20713 11.2536 4.32877 11.4686 4.53024 11.568L5.09174 11.8446C5.29321 11.9441 5.53379 11.9068 5.69834 11.7519L6.26255 11.2186C6.67855 10.8253 7.32041 10.8253 7.7369 11.2186L8.3011 11.7519C8.46565 11.9074 8.70572 11.9441 8.90772 11.8446L9.47027 11.5674C9.67124 11.4686 9.79234 11.2541 9.77607 11.0264L9.72007 10.2414C9.67883 9.66317 10.079 9.14986 10.6394 9.06214L11.3986 8.94324C11.6197 8.90883 11.7978 8.73938 11.8477 8.51607L11.9862 7.89504C12.0362 7.67172 11.9477 7.44007 11.763 7.31117L11.1293 6.86731C10.6617 6.53959 10.5189 5.89966 10.8013 5.3969L11.1841 4.71586C11.2954 4.51754 11.277 4.26923 11.1374 4.09036L10.7492 3.59207C10.6096 3.41319 10.3772 3.33932 10.1632 3.40653L9.42903 3.63651C8.88655 3.80649 8.30821 3.52152 8.09965 2.98213L7.81834 2.25275C7.73579 2.03944 7.53434 1.89945 7.31007 1.9L6.68772 1.90167C6.46345 1.90222 6.26255 2.04333 6.1811 2.25719L5.90683 2.97824C5.70048 3.52097 5.11944 3.80816 4.57531 3.63706L3.81071 3.39709C3.59621 3.32932 3.3627 3.40375 3.22314 3.58374L2.83757 4.08258C2.69801 4.26312 2.68118 4.51199 2.79467 4.7103L3.18621 5.39302C3.47456 5.89628 3.33337 6.54235 2.8631 6.87179L2.23696 7.31062C2.05233 7.44007 1.96382 7.67173 2.01378 7.89448L2.15225 8.51552C2.20167 8.73938 2.37979 8.90883 2.60081 8.94324Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8.14913 5.85093L8.14909 5.85089C7.51453 5.21637 6.48549 5.21637 5.85092 5.85089L5.85089 5.85092C5.21637 6.48549 5.21637 7.51453 5.85089 8.14909L5.85093 8.14913C6.48549 8.78362 7.51452 8.78362 8.14908 8.14913L8.14913 8.14908C8.78362 7.51452 8.78362 6.48549 8.14913 5.85093Z" fill="black" fill-opacity="0.33" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/file_icons/terminal.svg
+++ b/assets/icons/file_icons/terminal.svg
@ -1,5 +1,5 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1.65625" y="2" width="10.6875" height="10" rx="1" stroke="black" stroke-width="1.25"/>
+<path d="M1.65625 2.5C1.65625 2.22386 1.88011 2 2.15625 2H11.8437C12.1199 2 12.3438 2.22386 12.3438 2.5V11.5C12.3438 11.7761 12.1199 12 11.8437 12H2.15625C1.88011 12 1.65625 11.7761 1.65625 11.5V2.5Z" stroke="black" stroke-width="1.25"/>
 <path d="M4.375 9L6.375 7L4.375 5" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M7.625 9L9.90625 9" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/file_icons/toml.svg
+++ b/assets/icons/file_icons/toml.svg
@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 5H9" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M7 5L7 10" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M4 2H2.5C2.22386 2 2 2.22386 2 2.5V11.5C2 11.7761 2.22386 12 2.5 12H4M10 2H11.5C11.7761 2 12 2.22386 12 2.5V11.5C12 11.7761 11.7761 12 11.5 12H10" stroke="black" stroke-opacity="0.66" stroke-width="1.25" stroke-linecap="round"/>
+</svg>
--- a/assets/icons/file_icons/typescript.svg
+++ b/assets/icons/file_icons/typescript.svg
@ -1,5 +1,5 @@
 <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 4.375V3C12 2.44772 11.5523 2 11 2H3C2.44772 2 2 2.44772 2 3V11C2 11.5523 2.44772 12 3 12H3.375" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
-<path d="M10.6836 7.82805C10.7933 7.65392 10.9823 7.57377 11.174 7.57377C11.2904 7.57377 11.4019 7.59384 11.5091 7.62792C11.8324 7.73069 12.2148 7.63925 12.3392 7.32368L12.3773 7.22707C12.4703 6.99131 12.3823 6.71761 12.1522 6.61154C11.8328 6.46436 11.4984 6.375 11.1262 6.375C9.87707 6.375 8.91934 7.60671 9.4239 8.84869C9.54204 9.13951 9.74218 9.36166 9.95149 9.54337C10.1061 9.6776 10.2858 9.80516 10.4475 9.92002C10.4972 9.95529 10.5452 9.98936 10.5902 10.0221C11.0283 10.34 11.2526 10.5876 11.2526 10.9466C11.2526 11.1518 11.1622 11.3133 11.016 11.4128C10.8777 11.5071 10.7055 11.5357 10.5454 11.5222C10.393 11.5093 10.2529 11.4717 10.1214 11.4196C9.81632 11.2989 9.45533 11.4015 9.3364 11.7073L9.28139 11.8487C9.19162 12.0796 9.27489 12.3463 9.49799 12.4539C10.0893 12.7391 10.7377 12.8279 11.3915 12.5872C12.0569 12.3423 12.595 11.7708 12.595 10.9068C12.595 10.1301 12.1336 9.69583 11.6966 9.36109C11.606 9.29163 11.5259 9.23292 11.4493 9.17682C11.3259 9.08638 11.1964 8.99109 11.0734 8.88536C10.8937 8.73082 10.7518 8.57274 10.6594 8.38613C10.5746 8.21464 10.5815 7.99013 10.6836 7.82805Z" fill="black"/>
-<path d="M6.98644 7.70935H7.69396C7.98162 7.70935 8.21481 7.47616 8.21481 7.1885V7.02346C8.21481 6.7358 7.98162 6.50261 7.69396 6.50261H4.96848C4.68082 6.50261 4.44763 6.7358 4.44763 7.02346V7.1885C4.44763 7.47616 4.68082 7.70935 4.96848 7.70935H5.676V12.102C5.676 12.3896 5.90919 12.6228 6.19685 12.6228H6.46559C6.75325 12.6228 6.98644 12.3896 6.98644 12.102V7.70935Z" fill="black"/>
+<path d="M12 4.375V2.5C12 2.22386 11.7761 2 11.5 2H2.5C2.22386 2 2 2.22386 2 2.5V11.5C2 11.7761 2.22386 12 2.5 12H3.375" stroke="black" stroke-opacity="0.66" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M10.6836 7.82805C10.7933 7.65392 10.9823 7.57377 11.174 7.57377C11.2904 7.57377 11.4019 7.59384 11.5092 7.62792C11.8324 7.73069 12.2148 7.63925 12.3392 7.32368L12.3773 7.22707C12.4703 6.99131 12.3823 6.71761 12.1522 6.61154C11.8328 6.46436 11.4984 6.375 11.1262 6.375C9.87708 6.375 8.91935 7.60671 9.4239 8.84869C9.54205 9.13951 9.74219 9.36166 9.9515 9.54337C10.1061 9.6776 10.2858 9.80516 10.4475 9.92002C10.4972 9.95529 10.5452 9.98936 10.5903 10.0221C11.0283 10.34 11.2526 10.5876 11.2526 10.9466C11.2526 11.1518 11.1622 11.3133 11.016 11.4128C10.8777 11.5071 10.7055 11.5357 10.5454 11.5222C10.3931 11.5093 10.2529 11.4717 10.1214 11.4196C9.81633 11.2989 9.45533 11.4015 9.33641 11.7073L9.2814 11.8487C9.19162 12.0796 9.2749 12.3463 9.49799 12.4539C10.0894 12.7391 10.7377 12.8279 11.3915 12.5872C12.0569 12.3423 12.595 11.7708 12.595 10.9068C12.595 10.1301 12.1336 9.69583 11.6966 9.36109C11.606 9.29163 11.5259 9.23292 11.4493 9.17682C11.3259 9.08638 11.1964 8.99109 11.0734 8.88536C10.8937 8.73082 10.7518 8.57274 10.6595 8.38613C10.5746 8.21464 10.5815 7.99013 10.6836 7.82805Z" fill="black"/>
+<path d="M6.98644 7.70936H7.69396C7.98162 7.70936 8.21481 7.47617 8.21481 7.18851V7.02346C8.21481 6.73581 7.98162 6.50261 7.69396 6.50261H4.96848C4.68082 6.50261 4.44763 6.73581 4.44763 7.02346V7.18851C4.44763 7.47617 4.68082 7.70936 4.96848 7.70936H5.676V12.102C5.676 12.3896 5.90919 12.6228 6.19685 12.6228H6.46559C6.75325 12.6228 6.98644 12.3896 6.98644 12.102V7.70936Z" fill="black"/>
 </svg>
--- a/assets/icons/file_icons/video.svg
+++ b/assets/icons/file_icons/video.svg
@ -0,0 +1,4 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.65625 2H11.8437C12.1199 2 12.3438 2.22386 12.3438 2.5V9.34375M12.3438 12H2.15625C1.88011 12 1.65625 11.7761 1.65625 11.5V4.65625" stroke="black" stroke-width="1.25" stroke-linecap="round"/>
+<path d="M9 7.01562L5.65624 9.3125L5.65624 4.6875L9 7.01562Z" fill="black" fill-opacity="0.33" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@ -195,8 +195,8 @@
  {
    "context": "Editor && mode == auto_height",
    "bindings": {
-      "shift-enter": "editor::Newline",
-      "cmd-shift-enter": "editor::NewlineBelow"
+      "ctrl-enter": "editor::Newline",
+      "ctrl-shift-enter": "editor::NewlineBelow"
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@ -356,7 +356,7 @@
    }
  },
  {
-    "context": "BufferSearchBar",
+    "context": "BufferSearchBar > VimEnabled",
    "bindings": {
      "enter": "vim::SearchSubmit",
      "escape": "buffer_search::Dismiss"
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@ -66,6 +66,11 @@
  // 3. Draw all invisible symbols:
  //   "all"
  "show_whitespaces": "selection",
+  // Settings related to calls in Zed
+  "calls": {
+    // Join calls with the microphone muted by default
+    "mute_on_join": true
+  },
  // Scrollbar related settings
  "scrollbar": {
    // When to show the scrollbar in the editor.
@ -97,14 +102,18 @@
    "show_other_hints": true
  },
  "project_panel": {
-    // Whether to show the git status in the project panel.
-    "git_status": true,
-    // Whether to show file icons in the project panel.
-    "file_icons": true,
+    // Default width of the project panel.
+    "default_width": 240,
    // Where to dock project panel. Can be 'left' or 'right'.
    "dock": "left",
-    // Default width of the project panel.
-    "default_width": 240
+    // Whether to show file icons in the project panel.
+    "file_icons": true,
+    // Whether to show folder icons or chevrons for directories in the project panel.
+    "folder_icons": true,
+    // Whether to show the git status in the project panel.
+    "git_status": true,
+    // Amount of indentation for nested items.
+    "indent_size": 20
  },
  "assistant": {
    // Where to dock the assistant. Can be 'left', 'right' or 'bottom'.
@ -198,9 +207,7 @@
  "copilot": {
    // The set of glob patterns for which copilot should be disabled
    // in any matching file.
-    "disabled_globs": [
-      ".env"
-    ]
+    "disabled_globs": [".env"]
  },
  // Settings specific to journaling
  "journal": {
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@ -36,6 +36,10 @@ anyhow.workspace = true
 async-broadcast = "0.4"
 futures.workspace = true
 postage.workspace = true
+schemars.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+serde_derive.workspace = true

 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
--- a/crates/call/src/call.rs
+++ b/crates/call/src/call.rs
@ -1,9 +1,11 @@
+pub mod call_settings;
 pub mod participant;
 pub mod room;

 use std::sync::Arc;

 use anyhow::{anyhow, Result};
+use call_settings::CallSettings;
 use client::{proto, ClickhouseEvent, Client, TelemetrySettings, TypedEnvelope, User, UserStore};
 use collections::HashSet;
 use futures::{future::Shared, FutureExt};
@ -19,6 +21,8 @@ pub use participant::ParticipantLocation;
 pub use room::Room;

 pub fn init(client: Arc<Client>, user_store: ModelHandle<UserStore>, cx: &mut AppContext) {
+    settings::register::<CallSettings>(cx);
+
    let active_call = cx.add_model(|cx| ActiveCall::new(client, user_store, cx));
    cx.set_global(active_call);
 }
@ -280,21 +284,6 @@ impl ActiveCall {
        }
    }

-    pub fn toggle_screen_sharing(&self, cx: &mut AppContext) {
-        if let Some(room) = self.room().cloned() {
-            let toggle_screen_sharing = room.update(cx, |room, cx| {
-                if room.is_screen_sharing() {
-                    self.report_call_event("disable screen share", cx);
-                    Task::ready(room.unshare_screen(cx))
-                } else {
-                    self.report_call_event("enable screen share", cx);
-                    room.share_screen(cx)
-                }
-            });
-            toggle_screen_sharing.detach_and_log_err(cx);
-        }
-    }
-
    pub fn share_project(
        &mut self,
        project: ModelHandle<Project>,
--- a/crates/call/src/call_settings.rs
+++ b/crates/call/src/call_settings.rs
@ -0,0 +1,27 @@
+use schemars::JsonSchema;
+use serde_derive::{Deserialize, Serialize};
+use settings::Setting;
+
+#[derive(Deserialize, Debug)]
+pub struct CallSettings {
+    pub mute_on_join: bool,
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+pub struct CallSettingsContent {
+    pub mute_on_join: Option<bool>,
+}
+
+impl Setting for CallSettings {
+    const KEY: Option<&'static str> = Some("calls");
+
+    type FileContent = CallSettingsContent;
+
+    fn load(
+        default_value: &Self::FileContent,
+        user_values: &[&Self::FileContent],
+        _: &gpui::AppContext,
+    ) -> anyhow::Result<Self> {
+        Self::load_via_json_merge(default_value, user_values)
+    }
+}
--- a/crates/call/src/room.rs
+++ b/crates/call/src/room.rs
@ -1,4 +1,5 @@
 use crate::{
+    call_settings::CallSettings,
    participant::{LocalParticipant, ParticipantLocation, RemoteParticipant, RemoteVideoTrack},
    IncomingCall,
 };
@ -19,7 +20,7 @@ use live_kit_client::{
 };
 use postage::stream::Stream;
 use project::Project;
-use std::{future::Future, mem, pin::Pin, sync::Arc, time::Duration};
+use std::{future::Future, mem, panic::Location, pin::Pin, sync::Arc, time::Duration};
 use util::{post_inc, ResultExt, TryFutureExt};

 pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
@ -153,8 +154,10 @@ impl Room {
            cx.spawn(|this, mut cx| async move {
                connect.await?;

-                this.update(&mut cx, |this, cx| this.share_microphone(cx))
-                    .await?;
+                if !cx.read(|cx| settings::get::<CallSettings>(cx).mute_on_join) {
+                    this.update(&mut cx, |this, cx| this.share_microphone(cx))
+                        .await?;
+                }

                anyhow::Ok(())
            })
@ -656,7 +659,7 @@ impl Room {
                                    peer_id,
                                    projects: participant.projects,
                                    location,
-                                    muted: false,
+                                    muted: true,
                                    speaking: false,
                                    video_tracks: Default::default(),
                                    audio_tracks: Default::default(),
@ -670,6 +673,10 @@ impl Room {
                                    live_kit.room.remote_video_tracks(&user.id.to_string());
                                let audio_tracks =
                                    live_kit.room.remote_audio_tracks(&user.id.to_string());
+                                let publications = live_kit
+                                    .room
+                                    .remote_audio_track_publications(&user.id.to_string());
+
                                for track in video_tracks {
                                    this.remote_video_track_updated(
                                        RemoteVideoTrackUpdate::Subscribed(track),
@ -677,9 +684,15 @@ impl Room {
                                    )
                                    .log_err();
                                }
-                                for track in audio_tracks {
+
+                                for (track, publication) in
+                                    audio_tracks.iter().zip(publications.iter())
+                                {
                                    this.remote_audio_track_updated(
-                                        RemoteAudioTrackUpdate::Subscribed(track),
+                                        RemoteAudioTrackUpdate::Subscribed(
+                                            track.clone(),
+                                            publication.clone(),
+                                        ),
                                        cx,
                                    )
                                    .log_err();
@ -819,8 +832,8 @@ impl Room {
                cx.notify();
            }
            RemoteAudioTrackUpdate::MuteChanged { track_id, muted } => {
+                let mut found = false;
                for participant in &mut self.remote_participants.values_mut() {
-                    let mut found = false;
                    for track in participant.audio_tracks.values() {
                        if track.sid() == track_id {
                            found = true;
@ -832,16 +845,20 @@ impl Room {
                        break;
                    }
                }
+
                cx.notify();
            }
-            RemoteAudioTrackUpdate::Subscribed(track) => {
+            RemoteAudioTrackUpdate::Subscribed(track, publication) => {
                let user_id = track.publisher_id().parse()?;
                let track_id = track.sid().to_string();
                let participant = self
                    .remote_participants
                    .get_mut(&user_id)
                    .ok_or_else(|| anyhow!("subscribed to track by unknown participant"))?;
+
                participant.audio_tracks.insert(track_id.clone(), track);
+                participant.muted = publication.is_muted();
+
                cx.emit(Event::RemoteAudioTracksChanged {
                    participant_id: participant.peer_id,
                });
@ -1053,7 +1070,7 @@ impl Room {
        self.live_kit
            .as_ref()
            .and_then(|live_kit| match &live_kit.microphone_track {
-                LocalTrack::None => None,
+                LocalTrack::None => Some(true),
                LocalTrack::Pending { muted, .. } => Some(*muted),
                LocalTrack::Published { muted, .. } => Some(*muted),
            })
@ -1070,7 +1087,9 @@ impl Room {
        self.live_kit.as_ref().map(|live_kit| live_kit.deafened)
    }

+    #[track_caller]
    pub fn share_microphone(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
+        dbg!(Location::caller());
        if self.status.is_offline() {
            return Task::ready(Err(anyhow!("room is offline")));
        } else if self.is_sharing_mic() {
@ -1244,6 +1263,10 @@ impl Room {
    pub fn toggle_mute(&mut self, cx: &mut ModelContext<Self>) -> Result<Task<Result<()>>> {
        let should_mute = !self.is_muted();
        if let Some(live_kit) = self.live_kit.as_mut() {
+            if matches!(live_kit.microphone_track, LocalTrack::None) {
+                return Ok(self.share_microphone(cx));
+            }
+
            let (ret_task, old_muted) = live_kit.set_mute(should_mute, cx)?;
            live_kit.muted_by_user = should_mute;

--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@ -652,10 +652,10 @@ impl CollabTitlebarItem {
        let is_muted = room.read(cx).is_muted();
        if is_muted {
            icon = "icons/radix/mic-mute.svg";
-            tooltip = "Unmute microphone\nRight click for options";
+            tooltip = "Unmute microphone";
        } else {
            icon = "icons/radix/mic.svg";
-            tooltip = "Mute microphone\nRight click for options";
+            tooltip = "Mute microphone";
        }

        let titlebar = &theme.titlebar;
@ -705,10 +705,10 @@ impl CollabTitlebarItem {
        let is_deafened = room.read(cx).is_deafened().unwrap_or(false);
        if is_deafened {
            icon = "icons/radix/speaker-off.svg";
-            tooltip = "Unmute speakers\nRight click for options";
+            tooltip = "Unmute speakers";
        } else {
            icon = "icons/radix/speaker-loud.svg";
-            tooltip = "Mute speakers\nRight click for options";
+            tooltip = "Mute speakers";
        }

        let titlebar = &theme.titlebar;
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@ -18,13 +18,7 @@ use workspace::AppState;

 actions!(
    collab,
-    [
-        ToggleScreenSharing,
-        ToggleMute,
-        ToggleDeafen,
-        LeaveCall,
-        ShareMicrophone
-    ]
+    [ToggleScreenSharing, ToggleMute, ToggleDeafen, LeaveCall]
 );

 pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
@ -40,7 +34,6 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
    cx.add_global_action(toggle_screen_sharing);
    cx.add_global_action(toggle_mute);
    cx.add_global_action(toggle_deafen);
-    cx.add_global_action(share_microphone);
 }

 pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {
@ -71,10 +64,24 @@ pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {
 }

 pub fn toggle_mute(_: &ToggleMute, cx: &mut AppContext) {
-    if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
-        room.update(cx, Room::toggle_mute)
-            .map(|task| task.detach_and_log_err(cx))
-            .log_err();
+    let call = ActiveCall::global(cx).read(cx);
+    if let Some(room) = call.room().cloned() {
+        let client = call.client();
+        room.update(cx, |room, cx| {
+            if room.is_muted() {
+                ActiveCall::report_call_event_for_room("enable microphone", room.id(), &client, cx);
+            } else {
+                ActiveCall::report_call_event_for_room(
+                    "disable microphone",
+                    room.id(),
+                    &client,
+                    cx,
+                );
+            }
+            room.toggle_mute(cx)
+        })
+        .map(|task| task.detach_and_log_err(cx))
+        .log_err();
    }
 }

@ -85,10 +92,3 @@ pub fn toggle_deafen(_: &ToggleDeafen, cx: &mut AppContext) {
            .log_err();
    }
 }
-
-pub fn share_microphone(_: &ShareMicrophone, cx: &mut AppContext) {
-    if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
-        room.update(cx, Room::share_microphone)
-            .detach_and_log_err(cx)
-    }
-}
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@ -1526,7 +1526,7 @@ impl Editor {
        self.collapse_matches = collapse_matches;
    }

-    fn range_for_match<T: std::marker::Copy>(&self, range: &Range<T>) -> Range<T> {
+    pub fn range_for_match<T: std::marker::Copy>(&self, range: &Range<T>) -> Range<T> {
        if self.collapse_matches {
            return range.start..range.start;
        }
@ -6273,8 +6273,8 @@ impl Editor {
                .range
                .to_offset(definition.target.buffer.read(cx));

+            let range = self.range_for_match(&range);
            if Some(&definition.target.buffer) == self.buffer.read(cx).as_singleton().as_ref() {
-                let range = self.range_for_match(&range);
                self.change_selections(Some(Autoscroll::fit()), cx, |s| {
                    s.select_ranges([range]);
                });
@ -6291,7 +6291,6 @@ impl Editor {
                        // When selecting a definition in a different buffer, disable the nav history
                        // to avoid creating a history entry at the previous cursor location.
                        pane.update(cx, |pane, _| pane.disable_history());
-                        let range = target_editor.range_for_match(&range);
                        target_editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
                            s.select_ranges([range]);
                        });
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@ -168,6 +168,10 @@ impl EditorElement {
            .on_drag(MouseButton::Left, {
                let position_map = position_map.clone();
                move |event, editor, cx| {
+                    if event.end {
+                        return;
+                    }
+
                    if !Self::mouse_dragged(
                        editor,
                        event.platform_event,
@ -1207,6 +1211,10 @@ impl EditorElement {
                })
                .on_drag(MouseButton::Left, {
                    move |event, editor: &mut Editor, cx| {
+                        if event.end {
+                            return;
+                        }
+
                        let y = event.prev_mouse_position.y();
                        let new_y = event.position.y();
                        if thumb_top < y && y < thumb_bottom {
@ -1311,7 +1319,7 @@ impl EditorElement {
    }

    fn max_line_number_width(&self, snapshot: &EditorSnapshot, cx: &ViewContext<Editor>) -> f32 {
-        let digit_count = (snapshot.max_buffer_row() as f32).log10().floor() as usize + 1;
+        let digit_count = (snapshot.max_buffer_row() as f32 + 1.).log10().floor() as usize + 1;
        let style = &self.style;

        cx.text_layout_cache()
--- a/crates/gpui/src/app/window.rs
+++ b/crates/gpui/src/app/window.rs
@ -518,6 +518,18 @@ impl<'a> WindowContext<'a> {
                // NOTE: The order of event pushes is important! MouseUp events MUST be fired
                // before click events, and so the MouseUp events need to be pushed before
                // MouseClick events.
+
+                // Synthesize one last drag event to end the drag
+                mouse_events.push(MouseEvent::Drag(MouseDrag {
+                    region: Default::default(),
+                    prev_mouse_position: self.window.mouse_position,
+                    platform_event: MouseMovedEvent {
+                        position: e.position,
+                        pressed_button: Some(e.button),
+                        modifiers: e.modifiers,
+                    },
+                    end: true,
+                }));
                mouse_events.push(MouseEvent::Up(MouseUp {
                    region: Default::default(),
                    platform_event: e.clone(),
@ -565,8 +577,16 @@ impl<'a> WindowContext<'a> {
                            region: Default::default(),
                            prev_mouse_position: self.window.mouse_position,
                            platform_event: e.clone(),
+                            end: false,
                        }));
                    } else if let Some((_, clicked_button)) = self.window.clicked_region {
+                        mouse_events.push(MouseEvent::Drag(MouseDrag {
+                            region: Default::default(),
+                            prev_mouse_position: self.window.mouse_position,
+                            platform_event: e.clone(),
+                            end: true,
+                        }));
+
                        // Mouse up event happened outside the current window. Simulate mouse up button event
                        let button_event = e.to_button_event(clicked_button);
                        mouse_events.push(MouseEvent::Up(MouseUp {
--- a/crates/gpui/src/elements/resizable.rs
+++ b/crates/gpui/src/elements/resizable.rs
@ -147,6 +147,9 @@ impl<V: View> Element<V> for Resizable<V> {
                let max_size = side.relevant_component(constraint.max);
                let on_resize = self.on_resize.clone();
                move |event, view: &mut V, cx| {
+                    if event.end {
+                        return;
+                    }
                    let new_size = min_size
                        .max(prev_size + side.compute_delta(event))
                        .min(max_size)
--- a/crates/gpui/src/scene/mouse_event.rs
+++ b/crates/gpui/src/scene/mouse_event.rs
@ -32,6 +32,7 @@ pub struct MouseDrag {
    pub region: RectF,
    pub prev_mouse_position: Vector2F,
    pub platform_event: MouseMovedEvent,
+    pub end: bool,
 }

 impl Deref for MouseDrag {
--- a/crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift
+++ b/crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift
@ -6,7 +6,7 @@ import ScreenCaptureKit
 class LKRoomDelegate: RoomDelegate {
    var data: UnsafeRawPointer
    var onDidDisconnect: @convention(c) (UnsafeRawPointer) -> Void
-    var onDidSubscribeToRemoteAudioTrack: @convention(c) (UnsafeRawPointer, CFString, CFString, UnsafeRawPointer) -> Void
+    var onDidSubscribeToRemoteAudioTrack: @convention(c) (UnsafeRawPointer, CFString, CFString, UnsafeRawPointer, UnsafeRawPointer) -> Void
    var onDidUnsubscribeFromRemoteAudioTrack: @convention(c) (UnsafeRawPointer, CFString, CFString) -> Void
    var onMuteChangedFromRemoteAudioTrack: @convention(c) (UnsafeRawPointer, CFString, Bool) -> Void
    var onActiveSpeakersChanged: @convention(c) (UnsafeRawPointer, CFArray) -> Void
@ -16,7 +16,7 @@ class LKRoomDelegate: RoomDelegate {
    init(
        data: UnsafeRawPointer,
        onDidDisconnect: @escaping @convention(c) (UnsafeRawPointer) -> Void,
-        onDidSubscribeToRemoteAudioTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString, UnsafeRawPointer) -> Void,
+        onDidSubscribeToRemoteAudioTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString, UnsafeRawPointer, UnsafeRawPointer) -> Void,
        onDidUnsubscribeFromRemoteAudioTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString) -> Void,
        onMuteChangedFromRemoteAudioTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, Bool) -> Void,
        onActiveSpeakersChanged: @convention(c) (UnsafeRawPointer, CFArray) -> Void,
@ -43,7 +43,7 @@ class LKRoomDelegate: RoomDelegate {
        if track.kind == .video {
            self.onDidSubscribeToRemoteVideoTrack(self.data, participant.identity as CFString, track.sid! as CFString, Unmanaged.passUnretained(track).toOpaque())
        } else if track.kind == .audio {
-            self.onDidSubscribeToRemoteAudioTrack(self.data, participant.identity as CFString, track.sid! as CFString, Unmanaged.passUnretained(track).toOpaque())
+            self.onDidSubscribeToRemoteAudioTrack(self.data, participant.identity as CFString, track.sid! as CFString, Unmanaged.passUnretained(track).toOpaque(), Unmanaged.passUnretained(publication).toOpaque())
        }
    }

@ -52,12 +52,12 @@ class LKRoomDelegate: RoomDelegate {
            self.onMuteChangedFromRemoteAudioTrack(self.data, publication.sid as CFString, muted)
        }
    }
-    
+
    func room(_ room: Room, didUpdate speakers: [Participant]) {
        guard let speaker_ids = speakers.compactMap({ $0.identity as CFString }) as CFArray? else { return }
        self.onActiveSpeakersChanged(self.data, speaker_ids)
    }
-    
+
    func room(_ room: Room, participant: RemoteParticipant, didUnsubscribe publication: RemoteTrackPublication, track: Track) {
        if track.kind == .video {
            self.onDidUnsubscribeFromRemoteVideoTrack(self.data, participant.identity as CFString, track.sid! as CFString)
@ -104,7 +104,7 @@ class LKVideoRenderer: NSObject, VideoRenderer {
 public func LKRoomDelegateCreate(
    data: UnsafeRawPointer,
    onDidDisconnect: @escaping @convention(c) (UnsafeRawPointer) -> Void,
-    onDidSubscribeToRemoteAudioTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString, UnsafeRawPointer) -> Void,
+    onDidSubscribeToRemoteAudioTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString, UnsafeRawPointer, UnsafeRawPointer) -> Void,
    onDidUnsubscribeFromRemoteAudioTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString) -> Void,
    onMuteChangedFromRemoteAudioTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, Bool) -> Void,
    onActiveSpeakerChanged: @escaping @convention(c) (UnsafeRawPointer, CFArray) -> Void,
@ -180,39 +180,39 @@ public func LKRoomUnpublishTrack(room: UnsafeRawPointer, publication: UnsafeRawP
@_cdecl("LKRoomAudioTracksForRemoteParticipant")
 public func LKRoomAudioTracksForRemoteParticipant(room: UnsafeRawPointer, participantId: CFString) -> CFArray? {
    let room = Unmanaged<Room>.fromOpaque(room).takeUnretainedValue()
-    
+
    for (_, participant) in room.remoteParticipants {
        if participant.identity == participantId as String {
            return participant.audioTracks.compactMap { $0.track as? RemoteAudioTrack } as CFArray?
        }
    }
-    
+
    return nil;
 }

@_cdecl("LKRoomAudioTrackPublicationsForRemoteParticipant")
 public func LKRoomAudioTrackPublicationsForRemoteParticipant(room: UnsafeRawPointer, participantId: CFString) -> CFArray? {
    let room = Unmanaged<Room>.fromOpaque(room).takeUnretainedValue()
-    
+
    for (_, participant) in room.remoteParticipants {
        if participant.identity == participantId as String {
            return participant.audioTracks.compactMap { $0 as? RemoteTrackPublication } as CFArray?
        }
    }
-    
+
    return nil;
 }

@_cdecl("LKRoomVideoTracksForRemoteParticipant")
 public func LKRoomVideoTracksForRemoteParticipant(room: UnsafeRawPointer, participantId: CFString) -> CFArray? {
    let room = Unmanaged<Room>.fromOpaque(room).takeUnretainedValue()
-    
+
    for (_, participant) in room.remoteParticipants {
        if participant.identity == participantId as String {
            return participant.videoTracks.compactMap { $0.track as? RemoteVideoTrack } as CFArray?
        }
    }
-    
+
    return nil;
 }

@ -222,7 +222,7 @@ public func LKLocalAudioTrackCreateTrack() -> UnsafeMutableRawPointer {
      echoCancellation: true,
      noiseSuppression: true
    ))
-    
+
    return Unmanaged.passRetained(track).toOpaque()
 }

@ -276,7 +276,7 @@ public func LKLocalTrackPublicationSetMute(
    callback_data: UnsafeRawPointer
 ) {
    let publication = Unmanaged<LocalTrackPublication>.fromOpaque(publication).takeUnretainedValue()
-    
+
    if muted {
        publication.mute().then {
            on_complete(callback_data, nil)
@ -307,3 +307,21 @@ public func LKRemoteTrackPublicationSetEnabled(
        on_complete(callback_data, error.localizedDescription as CFString)
    }
 }
+
+@_cdecl("LKRemoteTrackPublicationIsMuted")
+public func LKRemoteTrackPublicationIsMuted(
+    publication: UnsafeRawPointer
+) -> Bool {
+    let publication = Unmanaged<RemoteTrackPublication>.fromOpaque(publication).takeUnretainedValue()
+
+    return publication.muted
+}
+
+@_cdecl("LKRemoteTrackPublicationGetSid")
+public func LKRemoteTrackPublicationGetSid(
+    publication: UnsafeRawPointer
+) -> CFString {
+    let publication = Unmanaged<RemoteTrackPublication>.fromOpaque(publication).takeUnretainedValue()
+
+    return publication.sid as CFString
+}
--- a/crates/live_kit_client/examples/test_app.rs
+++ b/crates/live_kit_client/examples/test_app.rs
@ -63,7 +63,7 @@ fn main() {
            let audio_track = LocalAudioTrack::create();
            let audio_track_publication = room_a.publish_audio_track(&audio_track).await.unwrap();

-            if let RemoteAudioTrackUpdate::Subscribed(track) =
+            if let RemoteAudioTrackUpdate::Subscribed(track, _) =
                audio_track_updates.next().await.unwrap()
            {
                let remote_tracks = room_b.remote_audio_tracks("test-participant-1");
--- a/crates/live_kit_client/src/prod.rs
+++ b/crates/live_kit_client/src/prod.rs
@ -26,6 +26,7 @@ extern "C" {
            publisher_id: CFStringRef,
            track_id: CFStringRef,
            remote_track: *const c_void,
+            remote_publication: *const c_void,
        ),
        on_did_unsubscribe_from_remote_audio_track: extern "C" fn(
            callback_data: *mut c_void,
@ -125,6 +126,9 @@ extern "C" {
        on_complete: extern "C" fn(callback_data: *mut c_void, error: CFStringRef),
        callback_data: *mut c_void,
    );
+
+    fn LKRemoteTrackPublicationIsMuted(publication: *const c_void) -> bool;
+    fn LKRemoteTrackPublicationGetSid(publication: *const c_void) -> CFStringRef;
 }

 pub type Sid = String;
@ -372,11 +376,19 @@ impl Room {
        rx
    }

-    fn did_subscribe_to_remote_audio_track(&self, track: RemoteAudioTrack) {
+    fn did_subscribe_to_remote_audio_track(
+        &self,
+        track: RemoteAudioTrack,
+        publication: RemoteTrackPublication,
+    ) {
        let track = Arc::new(track);
+        let publication = Arc::new(publication);
        self.remote_audio_track_subscribers.lock().retain(|tx| {
-            tx.unbounded_send(RemoteAudioTrackUpdate::Subscribed(track.clone()))
-                .is_ok()
+            tx.unbounded_send(RemoteAudioTrackUpdate::Subscribed(
+                track.clone(),
+                publication.clone(),
+            ))
+            .is_ok()
        });
    }

@ -501,13 +513,15 @@ impl RoomDelegate {
        publisher_id: CFStringRef,
        track_id: CFStringRef,
        track: *const c_void,
+        publication: *const c_void,
    ) {
        let room = unsafe { Weak::from_raw(room as *mut Room) };
        let publisher_id = unsafe { CFString::wrap_under_get_rule(publisher_id).to_string() };
        let track_id = unsafe { CFString::wrap_under_get_rule(track_id).to_string() };
        let track = RemoteAudioTrack::new(track, track_id, publisher_id);
+        let publication = RemoteTrackPublication::new(publication);
        if let Some(room) = room.upgrade() {
-            room.did_subscribe_to_remote_audio_track(track);
+            room.did_subscribe_to_remote_audio_track(track, publication);
        }
        let _ = Weak::into_raw(room);
    }
@ -682,6 +696,14 @@ impl RemoteTrackPublication {
        Self(native_track_publication)
    }

+    pub fn sid(&self) -> String {
+        unsafe { CFString::wrap_under_get_rule(LKRemoteTrackPublicationGetSid(self.0)).to_string() }
+    }
+
+    pub fn is_muted(&self) -> bool {
+        unsafe { LKRemoteTrackPublicationIsMuted(self.0) }
+    }
+
    pub fn set_enabled(&self, enabled: bool) -> impl Future<Output = Result<()>> {
        let (tx, rx) = futures::channel::oneshot::channel();

@ -832,7 +854,7 @@ pub enum RemoteVideoTrackUpdate {
 pub enum RemoteAudioTrackUpdate {
    ActiveSpeakersChanged { speakers: Vec<Sid> },
    MuteChanged { track_id: Sid, muted: bool },
-    Subscribed(Arc<RemoteAudioTrack>),
+    Subscribed(Arc<RemoteAudioTrack>, Arc<RemoteTrackPublication>),
    Unsubscribed { publisher_id: Sid, track_id: Sid },
 }

--- a/crates/live_kit_client/src/test.rs
+++ b/crates/live_kit_client/src/test.rs
@ -216,6 +216,8 @@ impl TestServer {
            publisher_id: identity.clone(),
        });

+        let publication = Arc::new(RemoteTrackPublication);
+
        room.audio_tracks.push(track.clone());

        for (id, client_room) in &room.client_rooms {
@ -225,7 +227,10 @@ impl TestServer {
                    .lock()
                    .audio_track_updates
                    .0
-                    .try_broadcast(RemoteAudioTrackUpdate::Subscribed(track.clone()))
+                    .try_broadcast(RemoteAudioTrackUpdate::Subscribed(
+                        track.clone(),
+                        publication.clone(),
+                    ))
                    .unwrap();
            }
        }
@ -501,6 +506,14 @@ impl RemoteTrackPublication {
    pub fn set_enabled(&self, _enabled: bool) -> impl Future<Output = Result<()>> {
        async { Ok(()) }
    }
+
+    pub fn is_muted(&self) -> bool {
+        false
+    }
+
+    pub fn sid(&self) -> String {
+        "".to_string()
+    }
 }

 #[derive(Clone)]
@ -579,7 +592,7 @@ pub enum RemoteVideoTrackUpdate {
 pub enum RemoteAudioTrackUpdate {
    ActiveSpeakersChanged { speakers: Vec<Sid> },
    MuteChanged { track_id: Sid, muted: bool },
-    Subscribed(Arc<RemoteAudioTrack>),
+    Subscribed(Arc<RemoteAudioTrack>, Arc<RemoteTrackPublication>),
    Unsubscribed { publisher_id: Sid, track_id: Sid },
 }

--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@ -259,6 +259,7 @@ pub enum Event {
    LanguageServerLog(LanguageServerId, String),
    Notification(String),
    ActiveEntryChanged(Option<ProjectEntryId>),
+    ActivateProjectPanel,
    WorktreeAdded,
    WorktreeRemoved(WorktreeId),
    WorktreeUpdatedEntries(WorktreeId, UpdatedEntriesSet),
--- a/crates/project_panel/src/file_associations.rs
+++ b/crates/project_panel/src/file_associations.rs
@ -17,8 +17,10 @@ pub struct FileAssociations {
    types: HashMap<String, TypeConfig>,
 }

-const DIRECTORY_TYPE: &'static str = "directory";
-const EXPANDED_DIRECTORY_TYPE: &'static str = "expanded_directory";
+const COLLAPSED_DIRECTORY_TYPE: &'static str = "collapsed_folder";
+const EXPANDED_DIRECTORY_TYPE: &'static str = "expanded_folder";
+const COLLAPSED_CHEVRON_TYPE: &'static str = "collapsed_chevron";
+const EXPANDED_CHEVRON_TYPE: &'static str = "expanded_chevron";
 pub const FILE_TYPES_ASSET: &'static str = "icons/file_icons/file_types.json";

 pub fn init(assets: impl AssetSource, cx: &mut AppContext) {
@ -72,7 +74,24 @@ impl FileAssociations {
            let key = if expanded {
                EXPANDED_DIRECTORY_TYPE
            } else {
-                DIRECTORY_TYPE
+                COLLAPSED_DIRECTORY_TYPE
+            };
+
+            this.types
+                .get(key)
+                .map(|type_config| type_config.icon.clone())
+        })
+        .unwrap_or_else(|| Arc::from("".to_string()))
+    }
+
+    pub fn get_chevron_icon(expanded: bool, cx: &AppContext) -> Arc<str> {
+        iife!({
+            let this = cx.has_global::<Self>().then(|| cx.global::<Self>())?;
+
+            let key = if expanded {
+                EXPANDED_CHEVRON_TYPE
+            } else {
+                COLLAPSED_CHEVRON_TYPE
            };

            this.types
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@ -169,6 +169,7 @@ pub enum Event {
    },
    DockPositionChanged,
    Focus,
+    ActivatePanel,
 }

 #[derive(Serialize, Deserialize)]
@ -195,6 +196,9 @@ impl ProjectPanel {
                        cx.notify();
                    }
                }
+                project::Event::ActivateProjectPanel => {
+                    cx.emit(Event::ActivatePanel);
+                }
                project::Event::WorktreeRemoved(id) => {
                    this.expanded_dir_ids.remove(id);
                    this.update_visible_entries(None, cx);
@ -982,7 +986,10 @@ impl ProjectPanel {
        None
    }

-    fn selected_entry<'a>(&self, cx: &'a AppContext) -> Option<(&'a Worktree, &'a project::Entry)> {
+    pub fn selected_entry<'a>(
+        &self,
+        cx: &'a AppContext,
+    ) -> Option<(&'a Worktree, &'a project::Entry)> {
        let (worktree, entry) = self.selected_entry_handle(cx)?;
        Some((worktree.read(cx), entry))
    }
@ -1176,9 +1183,13 @@ impl ProjectPanel {
            }

            let end_ix = range.end.min(ix + visible_worktree_entries.len());
-            let (git_status_setting, show_file_icons) = {
+            let (git_status_setting, show_file_icons, show_folder_icons) = {
                let settings = settings::get::<ProjectPanelSettings>(cx);
-                (settings.git_status, settings.file_icons)
+                (
+                    settings.git_status,
+                    settings.file_icons,
+                    settings.folder_icons,
+                )
            };
            if let Some(worktree) = self.project.read(cx).worktree_for_id(*worktree_id, cx) {
                let snapshot = worktree.read(cx).snapshot();
@ -1193,10 +1204,22 @@ impl ProjectPanel {
                for entry in visible_worktree_entries[entry_range].iter() {
                    let status = git_status_setting.then(|| entry.git_status).flatten();
                    let is_expanded = expanded_entry_ids.binary_search(&entry.id).is_ok();
-                    let icon = show_file_icons.then(|| match entry.kind {
-                        EntryKind::File(_) => FileAssociations::get_icon(&entry.path, cx),
-                        _ => FileAssociations::get_folder_icon(is_expanded, cx),
-                    });
+                    let icon = match entry.kind {
+                        EntryKind::File(_) => {
+                            if show_file_icons {
+                                Some(FileAssociations::get_icon(&entry.path, cx))
+                            } else {
+                                None
+                            }
+                        }
+                        _ => {
+                            if show_folder_icons {
+                                Some(FileAssociations::get_folder_icon(is_expanded, cx))
+                            } else {
+                                Some(FileAssociations::get_chevron_icon(is_expanded, cx))
+                            }
+                        }
+                    };

                    let mut details = EntryDetails {
                        filename: entry
@ -1258,7 +1281,6 @@ impl ProjectPanel {
        style: &ProjectPanelEntry,
        cx: &mut ViewContext<V>,
    ) -> AnyElement<V> {
-        let kind = details.kind;
        let show_editor = details.is_editing && !details.is_processing;

        let mut filename_text_style = style.text.clone();
@ -1282,26 +1304,14 @@ impl ProjectPanel {
                    .aligned()
                    .constrained()
                    .with_width(style.icon_size)
-            } else if kind.is_dir() {
-                if details.is_expanded {
-                    Svg::new("icons/chevron_down_8.svg").with_color(style.chevron_color)
-                } else {
-                    Svg::new("icons/chevron_right_8.svg").with_color(style.chevron_color)
-                }
-                .constrained()
-                .with_max_width(style.chevron_size)
-                .with_max_height(style.chevron_size)
-                .aligned()
-                .constrained()
-                .with_width(style.chevron_size)
            } else {
                Empty::new()
                    .constrained()
-                    .with_max_width(style.chevron_size)
-                    .with_max_height(style.chevron_size)
+                    .with_max_width(style.icon_size)
+                    .with_max_height(style.icon_size)
                    .aligned()
                    .constrained()
-                    .with_width(style.chevron_size)
+                    .with_width(style.icon_size)
            })
            .with_child(if show_editor && editor.is_some() {
                ChildView::new(editor.as_ref().unwrap(), cx)
@ -1337,7 +1347,8 @@ impl ProjectPanel {
    ) -> AnyElement<Self> {
        let kind = details.kind;
        let path = details.path.clone();
-        let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width;
+        let settings = settings::get::<ProjectPanelSettings>(cx);
+        let padding = theme.container.padding.left + details.depth as f32 * settings.indent_size;

        let entry_style = if details.is_cut {
            &theme.cut_entry
--- a/crates/project_panel/src/project_panel_settings.rs
+++ b/crates/project_panel/src/project_panel_settings.rs
@ -12,18 +12,22 @@ pub enum ProjectPanelDockPosition {

 #[derive(Deserialize, Debug)]
 pub struct ProjectPanelSettings {
-    pub git_status: bool,
-    pub file_icons: bool,
-    pub dock: ProjectPanelDockPosition,
    pub default_width: f32,
+    pub dock: ProjectPanelDockPosition,
+    pub file_icons: bool,
+    pub folder_icons: bool,
+    pub git_status: bool,
+    pub indent_size: f32,
 }

 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
 pub struct ProjectPanelSettingsContent {
-    pub git_status: Option<bool>,
-    pub file_icons: Option<bool>,
-    pub dock: Option<ProjectPanelDockPosition>,
    pub default_width: Option<f32>,
+    pub dock: Option<ProjectPanelDockPosition>,
+    pub file_icons: Option<bool>,
+    pub folder_icons: Option<bool>,
+    pub git_status: Option<bool>,
+    pub indent_size: Option<f32>,
 }

 impl Setting for ProjectPanelSettings {
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@ -568,7 +568,7 @@ impl BufferSearchBar {
    }

    fn select_all_matches(&mut self, _: &SelectAllMatches, cx: &mut ViewContext<Self>) {
-        if !self.dismissed {
+        if !self.dismissed && self.active_match_index.is_some() {
            if let Some(searchable_item) = self.active_searchable_item.as_ref() {
                if let Some(matches) = self
                    .searchable_items_with_matches
@ -1175,9 +1175,16 @@ mod tests {
            .await
            .unwrap();
        search_bar.update(cx, |search_bar, cx| {
+            cx.focus(search_bar.query_editor.as_any());
            search_bar.activate_current_match(cx);
        });

+        cx.read_window(window_id, |cx| {
+            assert!(
+                !editor.is_focused(cx),
+                "Initially, the editor should not be focused"
+            );
+        });
        let initial_selections = editor.update(cx, |editor, cx| {
            let initial_selections = editor.selections.display_ranges(cx);
            assert_eq!(
@ -1191,7 +1198,16 @@ mod tests {
        });

        search_bar.update(cx, |search_bar, cx| {
+            cx.focus(search_bar.query_editor.as_any());
            search_bar.select_all_matches(&SelectAllMatches, cx);
+        });
+        cx.read_window(window_id, |cx| {
+            assert!(
+                editor.is_focused(cx),
+                "Should focus editor after successful SelectAllMatches"
+            );
+        });
+        search_bar.update(cx, |search_bar, cx| {
            let all_selections =
                editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
            assert_eq!(
@ -1199,8 +1215,6 @@ mod tests {
                expected_query_matches_count,
                "Should select all `a` characters in the buffer, but got: {all_selections:?}"
            );
-        });
-        search_bar.update(cx, |search_bar, _| {
            assert_eq!(
                search_bar.active_match_index,
                Some(0),
@ -1210,6 +1224,14 @@ mod tests {

        search_bar.update(cx, |search_bar, cx| {
            search_bar.select_next_match(&SelectNextMatch, cx);
+        });
+        cx.read_window(window_id, |cx| {
+            assert!(
+                editor.is_focused(cx),
+                "Should still have editor focused after SelectNextMatch"
+            );
+        });
+        search_bar.update(cx, |search_bar, cx| {
            let all_selections =
                editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
            assert_eq!(
@ -1221,8 +1243,6 @@ mod tests {
                all_selections, initial_selections,
                "Next match should be different from the first selection"
            );
-        });
-        search_bar.update(cx, |search_bar, _| {
            assert_eq!(
                search_bar.active_match_index,
                Some(1),
@ -1231,7 +1251,16 @@ mod tests {
        });

        search_bar.update(cx, |search_bar, cx| {
+            cx.focus(search_bar.query_editor.as_any());
            search_bar.select_all_matches(&SelectAllMatches, cx);
+        });
+        cx.read_window(window_id, |cx| {
+            assert!(
+                editor.is_focused(cx),
+                "Should focus editor after successful SelectAllMatches"
+            );
+        });
+        search_bar.update(cx, |search_bar, cx| {
            let all_selections =
                editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
            assert_eq!(
@ -1239,8 +1268,6 @@ mod tests {
                expected_query_matches_count,
                "Should select all `a` characters in the buffer, but got: {all_selections:?}"
            );
-        });
-        search_bar.update(cx, |search_bar, _| {
            assert_eq!(
                search_bar.active_match_index,
                Some(1),
@ -1250,6 +1277,14 @@ mod tests {

        search_bar.update(cx, |search_bar, cx| {
            search_bar.select_prev_match(&SelectPrevMatch, cx);
+        });
+        cx.read_window(window_id, |cx| {
+            assert!(
+                editor.is_focused(cx),
+                "Should still have editor focused after SelectPrevMatch"
+            );
+        });
+        let last_match_selections = search_bar.update(cx, |search_bar, cx| {
            let all_selections =
                editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
            assert_eq!(
@ -1261,13 +1296,41 @@ mod tests {
                all_selections, initial_selections,
                "Previous match should be the same as the first selection"
            );
-        });
-        search_bar.update(cx, |search_bar, _| {
            assert_eq!(
                search_bar.active_match_index,
                Some(0),
                "Match index should be updated to the previous one"
            );
+            all_selections
+        });
+
+        search_bar
+            .update(cx, |search_bar, cx| {
+                cx.focus(search_bar.query_editor.as_any());
+                search_bar.search("abas_nonexistent_match", None, cx)
+            })
+            .await
+            .unwrap();
+        search_bar.update(cx, |search_bar, cx| {
+            search_bar.select_all_matches(&SelectAllMatches, cx);
+        });
+        cx.read_window(window_id, |cx| {
+            assert!(
+                !editor.is_focused(cx),
+                "Should not switch focus to editor if SelectAllMatches does not find any matches"
+            );
+        });
+        search_bar.update(cx, |search_bar, cx| {
+            let all_selections =
+                editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
+            assert_eq!(
+                all_selections, last_match_selections,
+                "Should not select anything new if there are no matches"
+            );
+            assert!(
+                search_bar.active_match_index.is_none(),
+                "For no matches, there should be no active match index"
+            );
        });
    }
 }
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@ -632,6 +632,7 @@ impl ProjectSearchView {

            let range_to_select = match_ranges[new_index].clone();
            self.results_editor.update(cx, |editor, cx| {
+                let range_to_select = editor.range_for_match(&range_to_select);
                editor.unfold_ranges([range_to_select.clone()], false, true, cx);
                editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
                    s.select_ranges([range_to_select])
@ -673,8 +674,12 @@ impl ProjectSearchView {
            let is_new_search = self.search_id != prev_search_id;
            self.results_editor.update(cx, |editor, cx| {
                if is_new_search {
+                    let range_to_select = match_ranges
+                        .first()
+                        .clone()
+                        .map(|range| editor.range_for_match(range));
                    editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
-                        s.select_ranges(match_ranges.first().cloned())
+                        s.select_ranges(range_to_select)
                    });
                }
                editor.highlight_background::<Self>(
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@ -73,10 +73,12 @@ const DEBUG_CELL_WIDTH: f32 = 5.;
 const DEBUG_LINE_HEIGHT: f32 = 5.;

 lazy_static! {
-    // Regex Copied from alacritty's ui_config.rs
-    static ref URL_REGEX: RegexSearch = RegexSearch::new("(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)[^\u{0000}-\u{001F}\u{007F}-\u{009F}<>\"\\s{-}\\^⟨⟩`]+").unwrap();
+    // Regex Copied from alacritty's ui_config.rs and modified its declaration slightly:
+    // * avoid Rust-specific escaping.
+    // * use more strict regex for `file://` protocol matching: original regex has `file:` inside, but we want to avoid matching `some::file::module` strings.
+    static ref URL_REGEX: RegexSearch = RegexSearch::new(r#"(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file://|git://|ssh:|ftp://)[^\u{0000}-\u{001F}\u{007F}-\u{009F}<>"\s{-}\^⟨⟩`]+"#).unwrap();

-    static ref WORD_REGEX: RegexSearch = RegexSearch::new("[\\w.:/@-]+").unwrap();
+    static ref WORD_REGEX: RegexSearch = RegexSearch::new(r#"[\w.:/@\-~]+"#).unwrap();
 }

 ///Upward flowing events, for changing the title and such
@ -875,8 +877,10 @@ impl Terminal {
                } else if let Some(word_match) = regex_match_at(term, point, &WORD_REGEX) {
                    let maybe_url_or_path =
                        term.bounds_to_string(*word_match.start(), *word_match.end());
-                    let is_url = regex_match_at(term, point, &URL_REGEX).is_some();
-
+                    let is_url = match regex_match_at(term, point, &URL_REGEX) {
+                        Some(url_match) => url_match == word_match,
+                        None => false,
+                    };
                    Some((maybe_url_or_path, is_url, word_match))
                } else {
                    None
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@ -411,6 +411,10 @@ impl TerminalElement {
            })
            // Update drag selections
            .on_drag(MouseButton::Left, move |event, _: &mut TerminalView, cx| {
+                if event.end {
+                    return;
+                }
+
                if cx.is_self_focused() {
                    if let Some(conn_handle) = connection.upgrade(cx) {
                        conn_handle.update(cx, |terminal, cx| {
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@ -187,37 +187,56 @@ impl TerminalView {
                    }
                    let potential_abs_paths = possible_open_targets(&workspace, maybe_path, cx);
                    if let Some(path) = potential_abs_paths.into_iter().next() {
-                        let visible = path.path_like.is_dir();
+                        let is_dir = path.path_like.is_dir();
                        let task_workspace = workspace.clone();
                        cx.spawn(|_, mut cx| async move {
-                            let opened_item = task_workspace
+                            let opened_items = task_workspace
                                .update(&mut cx, |workspace, cx| {
-                                    workspace.open_abs_path(path.path_like, visible, cx)
+                                    workspace.open_paths(vec![path.path_like], is_dir, cx)
                                })
                                .context("workspace update")?
-                                .await
-                                .context("workspace update")?;
-                            if let Some(row) = path.row {
-                                let col = path.column.unwrap_or(0);
-                                if let Some(active_editor) = opened_item.downcast::<Editor>() {
-                                    active_editor
-                                        .downgrade()
-                                        .update(&mut cx, |editor, cx| {
-                                            let snapshot = editor.snapshot(cx).display_snapshot;
-                                            let point = snapshot.buffer_snapshot.clip_point(
-                                                language::Point::new(
-                                                    row.saturating_sub(1),
-                                                    col.saturating_sub(1),
-                                                ),
-                                                Bias::Left,
-                                            );
-                                            editor.change_selections(
-                                                Some(Autoscroll::center()),
-                                                cx,
-                                                |s| s.select_ranges([point..point]),
-                                            );
-                                        })
-                                        .log_err();
+                                .await;
+                            anyhow::ensure!(
+                                opened_items.len() == 1,
+                                "For a single path open, expected single opened item"
+                            );
+                            let opened_item = opened_items
+                                .into_iter()
+                                .next()
+                                .unwrap()
+                                .transpose()
+                                .context("path open")?;
+                            if is_dir {
+                                task_workspace.update(&mut cx, |workspace, cx| {
+                                    workspace.project().update(cx, |_, cx| {
+                                        cx.emit(project::Event::ActivateProjectPanel);
+                                    })
+                                })?;
+                            } else {
+                                if let Some(row) = path.row {
+                                    let col = path.column.unwrap_or(0);
+                                    if let Some(active_editor) =
+                                        opened_item.and_then(|item| item.downcast::<Editor>())
+                                    {
+                                        active_editor
+                                            .downgrade()
+                                            .update(&mut cx, |editor, cx| {
+                                                let snapshot = editor.snapshot(cx).display_snapshot;
+                                                let point = snapshot.buffer_snapshot.clip_point(
+                                                    language::Point::new(
+                                                        row.saturating_sub(1),
+                                                        col.saturating_sub(1),
+                                                    ),
+                                                    Bias::Left,
+                                                );
+                                                editor.change_selections(
+                                                    Some(Autoscroll::center()),
+                                                    cx,
+                                                    |s| s.select_ranges([point..point]),
+                                                );
+                                            })
+                                            .log_err();
+                                    }
                                }
                            }
                            anyhow::Ok(())
@ -425,6 +444,16 @@ fn possible_open_targets(
    let maybe_path = path_like.path_like;
    let potential_abs_paths = if maybe_path.is_absolute() {
        vec![maybe_path]
+    } else if maybe_path.starts_with("~") {
+        if let Some(abs_path) = maybe_path
+            .strip_prefix("~")
+            .ok()
+            .and_then(|maybe_path| Some(dirs::home_dir()?.join(maybe_path)))
+        {
+            vec![abs_path]
+        } else {
+            Vec::new()
+        }
    } else if let Some(workspace) = workspace.upgrade(cx) {
        workspace.update(cx, |workspace, cx| {
            workspace
--- a/crates/vim/src/editor_events.rs
+++ b/crates/vim/src/editor_events.rs
@ -13,7 +13,7 @@ fn focused(EditorFocused(editor): &EditorFocused, cx: &mut AppContext) {
        cx.update_window(previously_active_editor.window_id(), |cx| {
            Vim::update(cx, |vim, cx| {
                vim.update_active_editor(cx, |previously_active_editor, cx| {
-                    Vim::unhook_vim_settings(previously_active_editor, cx);
+                    vim.unhook_vim_settings(previously_active_editor, cx)
                });
            });
        });
@ -35,7 +35,7 @@ fn blurred(EditorBlurred(editor): &EditorBlurred, cx: &mut AppContext) {
                }
            }

-            editor.update(cx, |editor, cx| Vim::unhook_vim_settings(editor, cx))
+            editor.update(cx, |editor, cx| vim.unhook_vim_settings(editor, cx))
        });
    });
 }
--- a/crates/vim/src/normal/search.rs
+++ b/crates/vim/src/normal/search.rs
@ -282,4 +282,21 @@ mod test {
        cx.simulate_keystrokes(["enter"]);
        cx.assert_state("aa\nˇbb\ndd\ncc\nbb\n", Mode::Normal);
    }
+
+    #[gpui::test]
+    async fn test_non_vim_search(
+        cx: &mut gpui::TestAppContext,
+        deterministic: Arc<gpui::executor::Deterministic>,
+    ) {
+        let mut cx = VimTestContext::new(cx, false).await;
+        cx.set_state("ˇone one one one", Mode::Normal);
+        cx.simulate_keystrokes(["cmd-f"]);
+        deterministic.run_until_parked();
+
+        cx.assert_editor_state("«oneˇ» one one one");
+        cx.simulate_keystrokes(["enter"]);
+        cx.assert_editor_state("one «oneˇ» one one");
+        cx.simulate_keystrokes(["shift-enter"]);
+        cx.assert_editor_state("«oneˇ» one one one");
+    }
 }
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@ -91,6 +91,7 @@ impl VimState {

    pub fn keymap_context_layer(&self) -> KeymapContext {
        let mut context = KeymapContext::default();
+        context.add_identifier("VimEnabled");
        context.add_key(
            "vim_mode",
            match self.mode {
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@ -14,8 +14,8 @@ use anyhow::Result;
 use collections::CommandPaletteFilter;
 use editor::{Bias, Editor, EditorMode, Event};
 use gpui::{
-    actions, impl_actions, AppContext, Subscription, ViewContext, ViewHandle, WeakViewHandle,
-    WindowContext,
+    actions, impl_actions, keymap_matcher::KeymapContext, AppContext, Subscription, ViewContext,
+    ViewHandle, WeakViewHandle, WindowContext,
 };
 use language::CursorShape;
 use motion::Motion;
@ -304,17 +304,28 @@ impl Vim {
                // Note: set_collapse_matches is not in unhook_vim_settings, as that method is called on blur,
                // but we need collapse_matches to persist when the search bar is focused.
                editor.set_collapse_matches(false);
-                Self::unhook_vim_settings(editor, cx);
+                self.unhook_vim_settings(editor, cx);
            }
        });
    }

-    fn unhook_vim_settings(editor: &mut Editor, cx: &mut ViewContext<Editor>) {
+    fn unhook_vim_settings(&self, editor: &mut Editor, cx: &mut ViewContext<Editor>) {
        editor.set_cursor_shape(CursorShape::Bar, cx);
        editor.set_clip_at_line_ends(false, cx);
        editor.set_input_enabled(true);
        editor.selections.line_mode = false;
-        editor.remove_keymap_context_layer::<Self>(cx);
+
+        // we set the VimEnabled context on all editors so that we
+        // can distinguish between vim mode and non-vim mode in the BufferSearchBar.
+        // This is a bit of a hack, but currently the search crate does not depend on vim,
+        // and it seems nice to keep it that way.
+        if self.enabled {
+            let mut context = KeymapContext::default();
+            context.add_identifier("VimEnabled");
+            editor.set_keymap_context_layer::<Self>(context, cx)
+        } else {
+            editor.remove_keymap_context_layer::<Self>(cx);
+        }
    }
 }

--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@ -522,7 +522,7 @@ impl SplitDirection {
 }

 mod element {
-    use std::{cell::RefCell, ops::Range, rc::Rc};
+    use std::{cell::RefCell, iter::from_fn, ops::Range, rc::Rc};

    use gpui::{
        geometry::{
@ -531,8 +531,9 @@ mod element {
        },
        json::{self, ToJson},
        platform::{CursorStyle, MouseButton},
-        AnyElement, Axis, CursorRegion, Element, LayoutContext, MouseRegion, RectFExt,
-        SceneBuilder, SizeConstraint, Vector2FExt, ViewContext,
+        scene::MouseDrag,
+        AnyElement, Axis, CursorRegion, Element, EventContext, LayoutContext, MouseRegion,
+        RectFExt, SceneBuilder, SizeConstraint, Vector2FExt, ViewContext,
    };

    use crate::{
@ -613,6 +614,96 @@ mod element {
                *cross_axis_max = cross_axis_max.max(child_size.along(cross_axis));
            }
        }
+
+        fn handle_resize(
+            flexes: Rc<RefCell<Vec<f32>>>,
+            axis: Axis,
+            preceding_ix: usize,
+            child_start: Vector2F,
+            drag_bounds: RectF,
+        ) -> impl Fn(MouseDrag, &mut Workspace, &mut EventContext<Workspace>) {
+            let size = move |ix, flexes: &[f32]| {
+                drag_bounds.length_along(axis) * (flexes[ix] / flexes.len() as f32)
+            };
+
+            move |drag, workspace: &mut Workspace, cx| {
+                if drag.end {
+                    // TODO: Clear cascading resize state
+                    return;
+                }
+                let min_size = match axis {
+                    Axis::Horizontal => HORIZONTAL_MIN_SIZE,
+                    Axis::Vertical => VERTICAL_MIN_SIZE,
+                };
+                let mut flexes = flexes.borrow_mut();
+
+                // Don't allow resizing to less than the minimum size, if elements are already too small
+                if min_size - 1. > size(preceding_ix, flexes.as_slice()) {
+                    return;
+                }
+
+                let mut proposed_current_pixel_change = (drag.position - child_start).along(axis)
+                    - size(preceding_ix, flexes.as_slice());
+
+                let flex_changes = |pixel_dx, target_ix, next: isize, flexes: &[f32]| {
+                    let flex_change = pixel_dx / drag_bounds.length_along(axis);
+                    let current_target_flex = flexes[target_ix] + flex_change;
+                    let next_target_flex =
+                        flexes[(target_ix as isize + next) as usize] - flex_change;
+                    (current_target_flex, next_target_flex)
+                };
+
+                let mut successors = from_fn({
+                    let forward = proposed_current_pixel_change > 0.;
+                    let mut ix_offset = 0;
+                    let len = flexes.len();
+                    move || {
+                        let result = if forward {
+                            (preceding_ix + 1 + ix_offset < len).then(|| preceding_ix + ix_offset)
+                        } else {
+                            (preceding_ix as isize - ix_offset as isize >= 0)
+                                .then(|| preceding_ix - ix_offset)
+                        };
+
+                        ix_offset += 1;
+
+                        result
+                    }
+                });
+
+                while proposed_current_pixel_change.abs() > 0. {
+                    let Some(current_ix) = successors.next() else {
+                            break;
+                        };
+
+                    let next_target_size = f32::max(
+                        size(current_ix + 1, flexes.as_slice()) - proposed_current_pixel_change,
+                        min_size,
+                    );
+
+                    let current_target_size = f32::max(
+                        size(current_ix, flexes.as_slice())
+                            + size(current_ix + 1, flexes.as_slice())
+                            - next_target_size,
+                        min_size,
+                    );
+
+                    let current_pixel_change =
+                        current_target_size - size(current_ix, flexes.as_slice());
+
+                    let (current_target_flex, next_target_flex) =
+                        flex_changes(current_pixel_change, current_ix, 1, flexes.as_slice());
+
+                    flexes[current_ix] = current_target_flex;
+                    flexes[current_ix + 1] = next_target_flex;
+
+                    proposed_current_pixel_change -= current_pixel_change;
+                }
+
+                workspace.schedule_serialize(cx);
+                cx.notify();
+            }
+        }
    }

    impl Extend<AnyElement<Workspace>> for PaneAxisElement {
@ -718,8 +809,7 @@ mod element {
                    Axis::Vertical => child_origin += vec2f(0.0, child.size().y()),
                }

-                if let Some(Some((next_ix, next_child))) = can_resize.then(|| children_iter.peek())
-                {
+                if can_resize && children_iter.peek().is_some() {
                    scene.push_stacking_context(None, None);

                    let handle_origin = match self.axis {
@ -748,67 +838,34 @@ mod element {
                        style,
                    });

-                    let axis = self.axis;
-                    let child_size = child.size();
-                    let next_child_size = next_child.size();
-                    let drag_bounds = visible_bounds.clone();
-                    let flexes = self.flexes.clone();
-                    let current_flex = flexes.borrow()[ix];
-                    let next_ix = *next_ix;
-                    let next_flex = flexes.borrow()[next_ix];
                    enum ResizeHandle {}
                    let mut mouse_region = MouseRegion::new::<ResizeHandle>(
                        cx.view_id(),
                        self.basis + ix,
                        handle_bounds,
                    );
-                    mouse_region = mouse_region.on_drag(
-                        MouseButton::Left,
-                        move |drag, workspace: &mut Workspace, cx| {
-                            let min_size = match axis {
-                                Axis::Horizontal => HORIZONTAL_MIN_SIZE,
-                                Axis::Vertical => VERTICAL_MIN_SIZE,
-                            };
-                            // Don't allow resizing to less than the minimum size, if elements are already too small
-                            if min_size - 1. > child_size.along(axis)
-                                || min_size - 1. > next_child_size.along(axis)
-                            {
-                                return;
+                    mouse_region = mouse_region
+                        .on_drag(
+                            MouseButton::Left,
+                            Self::handle_resize(
+                                self.flexes.clone(),
+                                self.axis,
+                                ix,
+                                child_start,
+                                visible_bounds.clone(),
+                            ),
+                        )
+                        .on_click(MouseButton::Left, {
+                            let flexes = self.flexes.clone();
+                            move |e, v: &mut Workspace, cx| {
+                                if e.click_count >= 2 {
+                                    let mut borrow = flexes.borrow_mut();
+                                    *borrow = vec![1.; borrow.len()];
+                                    v.schedule_serialize(cx);
+                                    cx.notify();
+                                }
                            }
-
-                            let mut current_target_size = (drag.position - child_start).along(axis);
-
-                            let proposed_current_pixel_change =
-                                current_target_size - child_size.along(axis);
-
-                            if proposed_current_pixel_change < 0. {
-                                current_target_size = f32::max(current_target_size, min_size);
-                            } else if proposed_current_pixel_change > 0. {
-                                // TODO: cascade this change to other children if current item is at min size
-                                let next_target_size = f32::max(
-                                    next_child_size.along(axis) - proposed_current_pixel_change,
-                                    min_size,
-                                );
-                                current_target_size = f32::min(
-                                    current_target_size,
-                                    child_size.along(axis) + next_child_size.along(axis)
-                                        - next_target_size,
-                                );
-                            }
-
-                            let current_pixel_change = current_target_size - child_size.along(axis);
-                            let flex_change = current_pixel_change / drag_bounds.length_along(axis);
-                            let current_target_flex = current_flex + flex_change;
-                            let next_target_flex = next_flex - flex_change;
-
-                            let mut borrow = flexes.borrow_mut();
-                            *borrow.get_mut(ix).unwrap() = current_target_flex;
-                            *borrow.get_mut(next_ix).unwrap() = next_target_flex;
-
-                            workspace.schedule_serialize(cx);
-                            cx.notify();
-                        },
-                    );
+                        });
                    scene.push_mouse_region(mouse_region);

                    scene.pop_stacking_context();
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@ -884,6 +884,18 @@ impl Workspace {
    pub fn add_panel<T: Panel>(&mut self, panel: ViewHandle<T>, cx: &mut ViewContext<Self>)
    where
        T::Event: std::fmt::Debug,
+    {
+        self.add_panel_with_extra_event_handler(panel, cx, |_, _, _, _| {})
+    }
+
+    pub fn add_panel_with_extra_event_handler<T: Panel, F>(
+        &mut self,
+        panel: ViewHandle<T>,
+        cx: &mut ViewContext<Self>,
+        handler: F,
+    ) where
+        T::Event: std::fmt::Debug,
+        F: Fn(&mut Self, &ViewHandle<T>, &T::Event, &mut ViewContext<Self>) + 'static,
    {
        let dock = match panel.position(cx) {
            DockPosition::Left => &self.left_dock,
@ -951,6 +963,8 @@ impl Workspace {
                    }
                    this.update_active_view_for_followers(cx);
                    cx.notify();
+                } else {
+                    handler(this, &panel, event, cx)
                }
            }
        }));
@ -1403,45 +1417,65 @@ impl Workspace {
        // Sort the paths to ensure we add worktrees for parents before their children.
        abs_paths.sort_unstable();
        cx.spawn(|this, mut cx| async move {
-            let mut project_paths = Vec::new();
-            for path in &abs_paths {
-                if let Some(project_path) = this
+            let mut tasks = Vec::with_capacity(abs_paths.len());
+            for abs_path in &abs_paths {
+                let project_path = match this
                    .update(&mut cx, |this, cx| {
-                        Workspace::project_path_for_path(this.project.clone(), path, visible, cx)
+                        Workspace::project_path_for_path(
+                            this.project.clone(),
+                            abs_path,
+                            visible,
+                            cx,
+                        )
                    })
                    .log_err()
                {
-                    project_paths.push(project_path.await.log_err());
-                } else {
-                    project_paths.push(None);
-                }
-            }
+                    Some(project_path) => project_path.await.log_err(),
+                    None => None,
+                };

-            let tasks = abs_paths
-                .iter()
-                .cloned()
-                .zip(project_paths.into_iter())
-                .map(|(abs_path, project_path)| {
-                    let this = this.clone();
-                    cx.spawn(|mut cx| {
-                        let fs = fs.clone();
-                        async move {
-                            let (_worktree, project_path) = project_path?;
-                            if fs.is_file(&abs_path).await {
-                                Some(
-                                    this.update(&mut cx, |this, cx| {
-                                        this.open_path(project_path, None, true, cx)
+                let this = this.clone();
+                let task = cx.spawn(|mut cx| {
+                    let fs = fs.clone();
+                    let abs_path = abs_path.clone();
+                    async move {
+                        let (worktree, project_path) = project_path?;
+                        if fs.is_file(&abs_path).await {
+                            Some(
+                                this.update(&mut cx, |this, cx| {
+                                    this.open_path(project_path, None, true, cx)
+                                })
+                                .log_err()?
+                                .await,
+                            )
+                        } else {
+                            this.update(&mut cx, |workspace, cx| {
+                                let worktree = worktree.read(cx);
+                                let worktree_abs_path = worktree.abs_path();
+                                let entry_id = if abs_path == worktree_abs_path.as_ref() {
+                                    worktree.root_entry()
+                                } else {
+                                    abs_path
+                                        .strip_prefix(worktree_abs_path.as_ref())
+                                        .ok()
+                                        .and_then(|relative_path| {
+                                            worktree.entry_for_path(relative_path)
+                                        })
+                                }
+                                .map(|entry| entry.id);
+                                if let Some(entry_id) = entry_id {
+                                    workspace.project().update(cx, |_, cx| {
+                                        cx.emit(project::Event::ActiveEntryChanged(Some(entry_id)));
                                    })
-                                    .log_err()?
-                                    .await,
-                                )
-                            } else {
-                                None
-                            }
+                                }
+                            })
+                            .log_err()?;
+                            None
                        }
-                    })
-                })
-                .collect::<Vec<_>>();
+                    }
+                });
+                tasks.push(task);
+            }

            futures::future::join_all(tasks).await
        })
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathansobo@gmail.com>"]
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.96.0"
+version = "0.96.4"
 publish = false

 [lib]
--- a/crates/zed/RELEASE_CHANNEL
+++ b/crates/zed/RELEASE_CHANNEL
@ -1 +1 @@
-dev
+stable
--- a/crates/zed/src/languages/bash/highlights.scm
+++ b/crates/zed/src/languages/bash/highlights.scm
@ -27,6 +27,8 @@
  "unset"
  "until"
  "while"
+  "local"
+  "declare"
 ] @keyword

 (comment) @comment
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@ -717,9 +717,7 @@ async fn watch_languages(_: Arc<dyn Fs>, _: Arc<LanguageRegistry>) -> Option<()>
 }

 #[cfg(not(debug_assertions))]
-fn watch_file_types(fs: Arc<dyn Fs>, cx: &mut AppContext) {
-    None
-}
+fn watch_file_types(fs: Arc<dyn Fs>, cx: &mut AppContext) {}

 fn connect_to_cli(
    server_name: &str,
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@ -338,9 +338,19 @@ pub fn initialize_workspace(
        let assistant_panel = AssistantPanel::load(workspace_handle.clone(), cx.clone());
        let (project_panel, terminal_panel, assistant_panel) =
            futures::try_join!(project_panel, terminal_panel, assistant_panel)?;
+
        workspace_handle.update(&mut cx, |workspace, cx| {
            let project_panel_position = project_panel.position(cx);
-            workspace.add_panel(project_panel, cx);
+            workspace.add_panel_with_extra_event_handler(
+                project_panel,
+                cx,
+                |workspace, _, event, cx| match event {
+                    project_panel::Event::ActivatePanel => {
+                        workspace.focus_panel::<ProjectPanel>(cx);
+                    }
+                    _ => {}
+                },
+            );
            workspace.add_panel(terminal_panel, cx);
            workspace.add_panel(assistant_panel, cx);

@ -1085,8 +1095,46 @@ mod tests {
            )
            .await;

-        let project = Project::test(app_state.fs.clone(), ["/dir1".as_ref()], cx).await;
-        let (_, workspace) = cx.add_window(|cx| Workspace::test_new(project, cx));
+        cx.update(|cx| open_paths(&[PathBuf::from("/dir1/")], &app_state, None, cx))
+            .await
+            .unwrap();
+        assert_eq!(cx.window_ids().len(), 1);
+        let workspace = cx
+            .read_window(cx.window_ids()[0], |cx| cx.root_view().clone())
+            .unwrap()
+            .downcast::<Workspace>()
+            .unwrap();
+
+        #[track_caller]
+        fn assert_project_panel_selection(
+            workspace: &Workspace,
+            expected_worktree_path: &Path,
+            expected_entry_path: &Path,
+            cx: &AppContext,
+        ) {
+            let project_panel = [
+                workspace.left_dock().read(cx).panel::<ProjectPanel>(),
+                workspace.right_dock().read(cx).panel::<ProjectPanel>(),
+                workspace.bottom_dock().read(cx).panel::<ProjectPanel>(),
+            ]
+            .into_iter()
+            .find_map(std::convert::identity)
+            .expect("found no project panels")
+            .read(cx);
+            let (selected_worktree, selected_entry) = project_panel
+                .selected_entry(cx)
+                .expect("project panel should have a selected entry");
+            assert_eq!(
+                selected_worktree.abs_path().as_ref(),
+                expected_worktree_path,
+                "Unexpected project panel selected worktree path"
+            );
+            assert_eq!(
+                selected_entry.path.as_ref(),
+                expected_entry_path,
+                "Unexpected project panel selected entry path"
+            );
+        }

        // Open a file within an existing worktree.
        workspace
@ -1095,9 +1143,10 @@ mod tests {
            })
            .await;
        cx.read(|cx| {
+            let workspace = workspace.read(cx);
+            assert_project_panel_selection(workspace, Path::new("/dir1"), Path::new("a.txt"), cx);
            assert_eq!(
                workspace
-                    .read(cx)
                    .active_pane()
                    .read(cx)
                    .active_item()
@ -1118,8 +1167,9 @@ mod tests {
            })
            .await;
        cx.read(|cx| {
+            let workspace = workspace.read(cx);
+            assert_project_panel_selection(workspace, Path::new("/dir2/b.txt"), Path::new(""), cx);
            let worktree_roots = workspace
-                .read(cx)
                .worktrees(cx)
                .map(|w| w.read(cx).as_local().unwrap().abs_path().as_ref())
                .collect::<HashSet<_>>();
@ -1132,7 +1182,6 @@ mod tests {
            );
            assert_eq!(
                workspace
-                    .read(cx)
                    .active_pane()
                    .read(cx)
                    .active_item()
@ -1153,8 +1202,9 @@ mod tests {
            })
            .await;
        cx.read(|cx| {
+            let workspace = workspace.read(cx);
+            assert_project_panel_selection(workspace, Path::new("/dir3"), Path::new("c.txt"), cx);
            let worktree_roots = workspace
-                .read(cx)
                .worktrees(cx)
                .map(|w| w.read(cx).as_local().unwrap().abs_path().as_ref())
                .collect::<HashSet<_>>();
@ -1167,7 +1217,6 @@ mod tests {
            );
            assert_eq!(
                workspace
-                    .read(cx)
                    .active_pane()
                    .read(cx)
                    .active_item()
@ -1188,8 +1237,9 @@ mod tests {
            })
            .await;
        cx.read(|cx| {
+            let workspace = workspace.read(cx);
+            assert_project_panel_selection(workspace, Path::new("/d.txt"), Path::new(""), cx);
            let worktree_roots = workspace
-                .read(cx)
                .worktrees(cx)
                .map(|w| w.read(cx).as_local().unwrap().abs_path().as_ref())
                .collect::<HashSet<_>>();
@ -1202,7 +1252,6 @@ mod tests {
            );

            let visible_worktree_roots = workspace
-                .read(cx)
                .visible_worktrees(cx)
                .map(|w| w.read(cx).as_local().unwrap().abs_path().as_ref())
                .collect::<HashSet<_>>();
@ -1216,7 +1265,6 @@ mod tests {

            assert_eq!(
                workspace
-                    .read(cx)
                    .active_pane()
                    .read(cx)
                    .active_item()
Author	SHA1	Message	Date
Joseph T. Lyons	d6a72f17d1	zed 0.96.4	2023-07-28 18:31:58 -04:00
Conrad Irwin	eab58fe4b7	Don't highlight project search matches either (#2807 ) @JosephTLyons this is probably worth merging alongside #2803 - vim: Fix a bug where focusing project search results unexpectedly entered visual mode	2023-07-28 16:24:01 -04:00
Conrad Irwin	eaf227b5f5	Fix jumping to definition in a new file (#2803 ) This is broken because vim currently sets settings only on the active editor. Fix this by correcting the range on the currently active editor. It would be nice (at some point) to refactor how vim sets settings, but that's for another day. Release Notes: - vim: Fix bug when jumping to definition in new file accidentally entered visual mode.	2023-07-28 16:24:01 -04:00
Joseph T. Lyons	16201b7224	zed 0.96.3	2023-07-27 12:24:12 -04:00
Mikayla Maki	4709fa658d	Block extra drag events in original drag handlers (#2793 ) In https://github.com/zed-industries/zed/pull/2790 I added an extra drag event on mouse_up which signaled the end of a drag event, as mouse_up event themselves wouldn't reliably fire if users moved their mouse too quickly. This broke the assumptions of the terminal element. This PR adds filters to all current on_drag handlers which removes this new event. Release Notes: - Fixed a bug causing terminal links to never open (preview only) - Fixed a bug in terminal link detection causing it to miss files with a `-` in it	2023-07-27 14:38:20 +03:00
Joseph T. Lyons	5fb94d39c2	v0.96.x stable	2023-07-26 13:27:34 -04:00
Mikayla Maki	713d3ee8ba	Simple cascading split (#2790 ) This PR cascades the split resizing to adjacent splits, if the current split has already hit the minimum size. This PR also adds support for detecting the end of a drag event to GPUI, via a bool on the dispatched drag. Release Notes: - Made split resizing more flexible	2023-07-26 12:50:48 -04:00
Kirill Bulatov	3558e65364	Fixes a crash when SelectAllMatches action was called on no matches (#2783 ) Release Notes: - Fixes a crash when SelectAllMatches action was called on no matches	2023-07-24 15:49:11 +03:00
Kirill Bulatov	9de99a7036	In terminal, open paths starting with ~ and focus on project panel when opening directories (#2780 ) Further improves terminal navigation with cmd+click, now allowing to open paths starting with `~` (if they are present otherwise) and focusing project panel with highlighted entry for the directories opened. Release Notes: - Further improves terminal navigation with cmd+click, now allowing to open paths starting with `~` (if they are present otherwise) and focusing project panel with highlighted entry for the directories opened.	2023-07-23 00:37:08 +03:00
Joseph T. Lyons	a4132b939f	zed 0.96.2	2023-07-21 12:03:41 -04:00
Conrad Irwin	61bb05b978	Fix shift-enter in search (#2772 ) Fixes shift-enter to go to previous result. Release Notes: - To type a newline in search use `ctrl-enter` (or `ctrl-shift-enter` for a newline below).	2023-07-21 11:54:39 -04:00
Conrad Irwin	8213c3328e	Fix enter in search (#2768 ) Fixes a regression in non-vim search caused by my changes to vim search. Release Notes: - N/A	2023-07-21 11:54:12 -04:00
Kirill Bulatov	e65ddbc11c	Do not highlight fake URLs in terminal (#2770 ) Closes https://github.com/zed-industries/community/issues/1794 See also https://github.com/alacritty/alacritty/pull/7101 Release Notes: - Fixed terminal incorrectly highlighting certain strings as URLs	2023-07-21 11:59:17 +03:00
Joseph T. Lyons	3722de4506	zed 0.96.1	2023-07-20 17:08:19 -04:00
Derek Briggs	65b565656c	Icon adjustments (#2766 ) Icon tweaks	2023-07-20 17:07:35 -04:00
Mikayla Maki	d080220e9e	Folder icons (#2764 ) - Updates icons and adds more - Adds ability to choose folders or chevrons in user settings - Adds ability to set indent size in user settings	2023-07-20 17:00:03 -04:00
Mikayla Maki	0be56d6a30	Add a double click to reset resized splits (#2762 ) fixes https://github.com/zed-industries/community/issues/1791 Release Notes: - Double clicking on split resize handles now resets the split's dimensions	2023-07-20 16:55:31 -04:00
Nate Butler	0472a6ff83	Add the `local` and `declare` keywords to bash syntax highlighting (#2761 ) Release Notes: - Improved Bash / Shell Script syntax highlighting	2023-07-20 16:55:05 -04:00
Joseph T. Lyons	04a1a96f8c	Reuse previously-obtained call object	2023-07-20 16:21:30 -04:00
Joseph T. Lyons	28e04bb412	Add microphone toggle events (#2765 ) Release Notes: - N/A	2023-07-20 16:13:03 -04:00
Joseph T. Lyons	4274ccee62	Fix return type in watch_file_types()	2023-07-19 16:24:38 -04:00
Mikayla Maki	05cd06177c	Mute mics by default (#2754 ) This adds a setting to mute mics by default. fixes https://github.com/zed-industries/community/issues/1769 Release notes: - Fixed a bug with gutter spacing on files that end on a new significant digit - Added a setting for muting on join, and set it to true by default.	2023-07-19 15:43:40 -04:00
Joseph T. Lyons	760fece112	v0.96.x preview	2023-07-19 15:33:38 -04:00