Skip to content

Commit

Permalink
Merge pull request #683 from yyk808/main
Browse files Browse the repository at this point in the history 
zed integration: buggy but work
  • Loading branch information
@genedna
genedna authored Nov 12, 2024
2 parents c64b9e9 + 9da1cc4 commit 6a2e337
Show file tree
Hide file tree
Showing 15 changed files with 1,699 additions and 11 deletions.
2 changes: 1 addition & 1 deletion scripts/zed-intergration/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
zed/
/zed/
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0001-add-new-module-mega-and-mega_panel.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 006bd0e01b5deba6792af824a5a73c32e96efa2c Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Sat, 19 Oct 2024 21:24:00 +0800
Subject: [PATCH 01/10] add new module mega and mega_panel
Subject: [PATCH 01/14] add new module mega and mega_panel

---
Cargo.lock | 23 ++++++
Expand Down
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0002-mega-integrate-basic-panel-code-with-zed.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From afca3aee776df6674d0c6d17858d944c64ec56ae Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Mon, 21 Oct 2024 09:18:40 +0800
Subject: [PATCH 02/10] mega: integrate basic panel code with zed
Subject: [PATCH 02/14] mega: integrate basic panel code with zed

---
Cargo.lock | 7 +-
Expand Down
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0003-add-mega-panel-trait-implementation.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a6636b00e11cfa284e2e152cb2ac0a6d92508a34 Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Mon, 21 Oct 2024 09:33:24 +0800
Subject: [PATCH 03/10] add: mega `panel` trait implementation
Subject: [PATCH 03/14] add: mega `panel` trait implementation

---
Cargo.lock | 1 +
Expand Down
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0004-fix-make-mega_panel-runnable.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 5e676b9b1669d078a25bcee9a0d1b87743862a30 Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Mon, 21 Oct 2024 10:00:36 +0800
Subject: [PATCH 04/10] fix: make mega_panel runnable
Subject: [PATCH 04/14] fix: make mega_panel runnable

---
assets/settings/default.json | 8 ++++++++
Expand Down
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0005-mega_panel-very-basic-info-render-support.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e04d4b01af7991ed4b40fcd9553f20e67f2ec53f Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Tue, 22 Oct 2024 16:15:01 +0800
Subject: [PATCH 05/10] mega_panel: very basic info render support
Subject: [PATCH 05/14] mega_panel: very basic info render support

---
Cargo.lock | 4 +-
Expand Down
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0006-mega-basic-rest-api-support.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8b57a9f693c95e92ee5299ff30b6cd791c08da71 Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Tue, 22 Oct 2024 19:12:08 +0800
Subject: [PATCH 06/10] mega: basic rest api support
Subject: [PATCH 06/14] mega: basic rest api support

---
Cargo.lock | 1 +
Expand Down
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0007-mega_panel-control-pad-and-information-display.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0ae6bfb40025aca376878982579a322eaa231143 Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Sat, 26 Oct 2024 22:02:19 +0800
Subject: [PATCH 07/10] mega_panel: control pad and information display
Subject: [PATCH 07/14] mega_panel: control pad and information display

---
crates/mega/src/mega.rs | 56 ++++++++---
Expand Down
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0008-mega-feat-toggle-fuse-mount.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 8f8d3a30a45fa4f3b2359060d63a51f065c327d9 Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Tue, 29 Oct 2024 18:50:39 +0800
Subject: [PATCH 08/10] mega: feat toggle fuse mount
Subject: [PATCH 08/14] mega: feat toggle fuse mount

---
Cargo.lock | 6 +-
Expand Down
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0009-Fix-dont-restore-previous-workspace.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 69f92bb2dbb1b2facf7b60cb6c6e1c0d211c4f4d Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Tue, 29 Oct 2024 21:08:56 +0800
Subject: [PATCH 09/10] Fix: dont restore previous workspace
Subject: [PATCH 09/14] Fix: dont restore previous workspace

---
crates/project/src/project.rs | 106 ++++++++++++++++++++++
Expand Down
2 changes: 1 addition & 1 deletion scripts/zed-intergration/patches/0010-Fix-checkout-in-project_panel.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From f2551513e804e8f43f6fac39d58befffd9dcda39 Mon Sep 17 00:00:00 2001
From: Neon <[email protected]>
Date: Wed, 30 Oct 2024 10:53:59 +0800
Subject: [PATCH 10/10] Fix checkout in project_panel
Subject: [PATCH 10/14] Fix checkout in project_panel

---
crates/mega/src/mega.rs | 18 +++++++++-
Expand Down
Loading

1 comment on commit 6a2e337

@vercel
Copy link

@vercel vercel bot commented on 6a2e337 Nov 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

mega – ./

gitmega.dev
mega-git-main-gitmono.vercel.app
www.gitmega.dev
mega-gitmono.vercel.app

Please sign in to comment.