Skip to content

Commit fc34b7f

Browse files
Anthony-EidAnthony-Eid
committed
Revert "Merge main with GPUI3 refactor (#101)"
Using a rebase rewrote too much of Zed's history which we don't want so I'm reverting this then using a merge instead of rebase" This reverts commit 5bcf1c8.
1 parent 5bcf1c8 commit fc34b7f

File tree

807 files changed

+41686
-56986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

807 files changed

+41686
-56986
lines changed

‎.github/ISSUE_TEMPLATE/0_feature_request.yml

+28-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,34 @@
11
name: Feature Request
22
description: "Tip: open this issue template from within Zed with the `request feature` command palette action"
3-
type: "Feature"
3+
labels: ["admin read", "triage", "enhancement"]
44
body:
5+
- type: checkboxes
6+
attributes:
7+
label: Check for existing issues
8+
description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
9+
options:
10+
- label: Completed
11+
required: true
512
- type: textarea
613
attributes:
714
label: Describe the feature
8-
description: A one line summary, and description of what you want to happen.
9-
value: |
10-
Summary:
11-
12-
Description:
13-
14-
Screenshots:
15-
<!-- drag files here -->
15+
description: A clear and concise description of what you want to happen.
16+
validations:
17+
required: true
18+
- type: textarea
19+
id: environment
20+
attributes:
21+
label: Zed Version and System Specs
22+
description: Zed version, release channel, architecture (x86_64 or aarch64), OS (macOS version / Linux distro and version) and RAM amount.
23+
placeholder: |
24+
<!-- In Zed run `copy system specs into clipboard` from the Zed command palette and paste here. -->
25+
<!-- Alternatively spawn `request feature` and this field will be autopopulated -->
26+
validations:
27+
required: true
28+
- type: textarea
29+
attributes:
30+
label: |
31+
If applicable, add mockups / screenshots to help present your vision of the feature
32+
description: Drag images into the text input below
33+
validations:
34+
required: false

‎.github/ISSUE_TEMPLATE/1_bug_report.yml

+39-19
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,54 @@
11
name: Bug Report
22
description: |
3-
Something is broken in Zed (exclude crashing).
4-
type: "Bug"
3+
Use this template for **non-crash-related** bug reports.
4+
Tip: open this issue template from within Zed with the `file bug report` command palette action.
5+
labels: ["admin read", "triage", "bug"]
56
body:
7+
- type: checkboxes
8+
attributes:
9+
label: Check for existing issues
10+
description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
11+
options:
12+
- label: Completed
13+
required: true
614
- type: textarea
715
attributes:
816
label: Describe the bug / provide steps to reproduce it
9-
description: A one line summary, and detailed reproduction steps
10-
value: |
11-
Summary:
12-
13-
<!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
14-
Steps to trigger the problem:
15-
1.
16-
2.
17-
3.
18-
19-
Actual Behavior:
20-
21-
Expected Behavior:
22-
17+
description: A clear and concise description of what the bug is.
2318
validations:
2419
required: true
25-
2620
- type: textarea
2721
id: environment
2822
attributes:
2923
label: Zed Version and System Specs
30-
description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
24+
description: Zed version, release channel, architecture (x86_64 or aarch64), OS (macOS version / Linux distro and version) and RAM amount.
3125
placeholder: |
32-
Output of "zed: Copy System Specs Into Clipboard"
26+
<!-- In Zed run `copy system specs into clipboard` from the Zed command palette and paste here. -->
27+
<!-- Alternatively spawn `file bug report` and this field will be autopopulated -->
28+
<!-- If Zed won't launch, include the equivalent with other relevant details (e.g. video card driver version for display bugs, etc) -->
29+
<!-- Zed Version: 0.xxx.x; Channel: Stable, OS: macOS xx.xx, RAM: XXGB, Architecture: x86_64"
3330
validations:
3431
required: true
32+
- type: textarea
33+
attributes:
34+
label: If applicable, add screenshots or screencasts of the incorrect state / behavior
35+
description: Drag images / videos into the text input below
36+
validations:
37+
required: false
38+
- type: textarea
39+
attributes:
40+
label: If applicable, attach your Zed.log file to this issue.
41+
description: |
42+
macOS: `~/Library/Logs/Zed/Zed.log`
43+
Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
44+
If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
45+
value: |
46+
<details><summary>Zed.log</summary>
47+
48+
<!-- Click below this line and paste or drag-and-drop your log-->
49+
```
50+
51+
```
52+
<!-- Click above this line and paste or drag-and-drop your log--></details>
53+
validations:
54+
required: false

‎.github/ISSUE_TEMPLATE/2_crash_report.yml

+13-20
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,26 @@
11
name: Crash Report
2-
description: Zed is Crashing or Hanging
3-
type: "Crash"
2+
description: |
3+
Use this template for crash reports.
4+
labels: ["admin read", "triage", "bug", "panic / crash"]
45
body:
6+
- type: checkboxes
7+
attributes:
8+
label: Check for existing issues
9+
description: Check the backlog of issues to reduce the chances of creating duplicates; if an issue already exists, place a `+1` (👍) on it.
10+
options:
11+
- label: Completed
12+
required: true
513
- type: textarea
614
attributes:
715
label: Describe the bug / provide steps to reproduce it
8-
description: A one line summary, and detailed reproduction steps
9-
value: |
10-
Summary:
11-
12-
<!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
13-
Steps to trigger the problem:
14-
1.
15-
2.
16-
3.
17-
18-
Actual Behavior:
19-
20-
Expected Behavior:
21-
16+
description: A clear and concise description of what the bug is.
2217
validations:
2318
required: true
2419
- type: textarea
2520
id: environment
2621
attributes:
27-
label: Zed Version and System Specs
28-
description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
29-
placeholder: |
30-
Output of "zed: Copy System Specs Into Clipboard"
22+
label: Environment
23+
description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below. If you are unable to run the command, please include your Zed version and release channel, operating system and version, RAM amount, and architecture.
3124
validations:
3225
required: true
3326
- type: textarea

‎.github/ISSUE_TEMPLATE/config.yml

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
# yaml-language-server: $schema=https://json.schemastore.org/github-issue-config.json
22
blank_issues_enabled: false
33
contact_links:
4-
- name: Zed Discussion Forum
5-
url: https://github.com/zed-industries/zed/discussions
6-
about: A community discussion forum
7-
- name: "Zed Discord: #Support Channel"
8-
url: https://zed.dev/community-links
9-
about: Real-time discussion and user support
4+
- name: Language Request
5+
url: https://github.com/zed-industries/extensions/issues/new?assignees=&labels=language&projects=&template=1_language_request.yml&title=%3Cname_of_language%3E
6+
about: Request a language in the extensions repository
7+
- name: Theme Request
8+
url: https://github.com/zed-industries/extensions/issues/new?assignees=&labels=theme&projects=&template=0_theme_request.yml&title=%3Cname_of_theme%3E+theme
9+
about: Request a theme in the extensions repository
10+
- name: Top-Ranking Issues
11+
url: https://github.com/zed-industries/zed/issues/5393
12+
about: See an overview of the most popular Zed issues
13+
- name: Platform Support
14+
url: https://github.com/zed-industries/zed/issues/5391
15+
about: A quick note on platform support
16+
- name: Positive Feedback
17+
url: https://github.com/zed-industries/zed/discussions/5397
18+
about: A central location for kind words about Zed

‎.github/workflows/ci.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ on:
77
- "v[0-9]+.[0-9]+.x"
88
tags:
99
- "v*"
10+
paths-ignore:
11+
- "docs/**/*"
12+
- ".github/workflows/community_*"
1013

1114
pull_request:
1215
branches:
1316
- "**"
17+
paths-ignore:
18+
- "docs/**/*"
19+
- ".github/workflows/community_*"
1420

1521
concurrency:
1622
# Allow only one workflow per any non-`main` branch.
@@ -327,14 +333,14 @@ jobs:
327333
mv target/x86_64-apple-darwin/release/Zed.dmg target/x86_64-apple-darwin/release/Zed-x86_64.dmg
328334
329335
- name: Upload app bundle (aarch64) to workflow run if main branch or specific label
330-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
336+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
331337
if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
332338
with:
333339
name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-aarch64.dmg
334340
path: target/aarch64-apple-darwin/release/Zed-aarch64.dmg
335341

336342
- name: Upload app bundle (x86_64) to workflow run if main branch or specific label
337-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
343+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
338344
if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
339345
with:
340346
name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-x86_64.dmg
@@ -385,7 +391,7 @@ jobs:
385391
run: script/bundle-linux
386392

387393
- name: Upload Linux bundle to workflow run if main branch or specific label
388-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
394+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
389395
if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
390396
with:
391397
name: zed-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-linux-gnu.tar.gz
@@ -433,7 +439,7 @@ jobs:
433439
run: script/bundle-linux
434440

435441
- name: Upload Linux bundle to workflow run if main branch or specific label
436-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
442+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
437443
if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
438444
with:
439445
name: zed-${{ github.event.pull_request.head.sha || github.sha }}-aarch64-unknown-linux-gnu.tar.gz

‎.github/workflows/community_close_stale_issues.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: github.repository_owner == 'zed-industries'
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
12+
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
stale-issue-message: >

‎.github/workflows/community_update_all_top_ranking_issues.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Update All Top Ranking Issues
2+
3+
on:
4+
schedule:
5+
- cron: "0 */12 * * *"
6+
workflow_dispatch:
7+
8+
jobs:
9+
update_top_ranking_issues:
10+
runs-on: ubuntu-latest
11+
if: github.repository == 'zed-industries/zed'
12+
steps:
13+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
14+
- name: Set up uv
15+
uses: astral-sh/setup-uv@caf0cab7a618c569241d31dcd442f54681755d39 # v3
16+
with:
17+
version: "latest"
18+
enable-cache: true
19+
cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
20+
- name: Install Python 3.13
21+
run: uv python install 3.13
22+
- name: Install dependencies
23+
run: uv sync --project script/update_top_ranking_issues -p 3.13
24+
- name: Run script
25+
run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 5393

‎.github/workflows/community_update_weekly_top_ranking_issues.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Update Weekly Top Ranking Issues
2+
3+
on:
4+
schedule:
5+
- cron: "0 15 * * *"
6+
workflow_dispatch:
7+
8+
jobs:
9+
update_top_ranking_issues:
10+
runs-on: ubuntu-latest
11+
if: github.repository == 'zed-industries/zed'
12+
steps:
13+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
14+
- name: Set up uv
15+
uses: astral-sh/setup-uv@caf0cab7a618c569241d31dcd442f54681755d39 # v3
16+
with:
17+
version: "latest"
18+
enable-cache: true
19+
cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
20+
- name: Install Python 3.13
21+
run: uv python install 3.13
22+
- name: Install dependencies
23+
run: uv sync --project script/update_top_ranking_issues -p 3.13
24+
- name: Run script
25+
run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 6952 --query-day-interval 7

‎.github/workflows/deploy_cloudflare.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,28 @@ jobs:
3737
mdbook build ./docs --dest-dir=../target/deploy/docs/
3838
3939
- name: Deploy Docs
40-
uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # v3
40+
uses: cloudflare/wrangler-action@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
4141
with:
4242
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
4343
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
4444
command: pages deploy target/deploy --project-name=docs
4545

4646
- name: Deploy Install
47-
uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # v3
47+
uses: cloudflare/wrangler-action@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
4848
with:
4949
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
5050
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
5151
command: r2 object put -f script/install.sh zed-open-source-website-assets/install.sh
5252

5353
- name: Deploy Docs Workers
54-
uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # v3
54+
uses: cloudflare/wrangler-action@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
5555
with:
5656
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
5757
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
5858
command: deploy .cloudflare/docs-proxy/src/worker.js
5959

6060
- name: Deploy Install Workers
61-
uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # v3
61+
uses: cloudflare/wrangler-action@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
6262
with:
6363
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
6464
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}

‎.mailmap

+2-15
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
# Keep these entries sorted alphabetically.
1010
# In Zed: `editor: sort lines case insensitive`
1111

12-
Agus Zubiaga <[email protected]>
13-
Agus Zubiaga <[email protected]> <[email protected]>
1412
Alex Viscreanu <[email protected]>
1513
Alex Viscreanu <[email protected]> <[email protected]>
1614
Alexander Mankuta <[email protected]>
@@ -26,7 +24,6 @@ Bennet Bo Fenner <[email protected]> <[email protected]>
2624
Bennet Bo Fenner <[email protected]> <[email protected]>
2725
Boris Cherny <[email protected]>
2826
Boris Cherny <[email protected]> <[email protected]>
29-
Brian Tan <[email protected]>
3027
Chris Hayes <[email protected]>
3128
Christian Bergschneider <[email protected]>
3229
Christian Bergschneider <[email protected]> <[email protected]>
@@ -35,16 +32,11 @@ Conrad Irwin <[email protected]> <[email protected]>
3532
Dairon Medina <[email protected]>
3633
Danilo Leal <[email protected]>
3734
Danilo Leal <[email protected]> <[email protected]>
38-
Edwin Aronsson <[email protected]>
3935
Evren Sen <[email protected]>
4036
Evren Sen <[email protected]> <[email protected]>
4137
Evren Sen <[email protected]> <[email protected]>
4238
Fernando Tagawa <[email protected]>
4339
Fernando Tagawa <[email protected]> <[email protected]>
44-
Finn Evers <[email protected]>
45-
Finn Evers <[email protected]> <[email protected]>
46-
Finn Evers <[email protected]> <[email protected]>
47-
Gowtham K <[email protected]>
4840
Greg Morenz <[email protected]>
4941
Greg Morenz <[email protected]> <[email protected]>
5042
Ihnat Aŭtuška <[email protected]>
@@ -62,14 +54,11 @@ Kirill Bulatov <[email protected]>
6254
Kirill Bulatov <[email protected]> <[email protected]>
6355
Kyle Caverly <[email protected]>
6456
Kyle Caverly <[email protected]> <[email protected]>
65-
Lilith Iris <[email protected]>
66-
Lilith Iris <[email protected]> <[email protected]>
6757
LoganDark <[email protected]>
6858
LoganDark <[email protected]> <[email protected]>
6959
LoganDark <[email protected]> <[email protected]>
70-
Marshall Bowers <[email protected]>
71-
Marshall Bowers <[email protected]> <[email protected]>
72-
Marshall Bowers <[email protected]> <[email protected]>
60+
Marshall Bowers <[email protected]>
61+
Marshall Bowers <[email protected]> <[email protected]>
7362
Matt Fellenz <[email protected]>
7463
Matt Fellenz <[email protected]> <[email protected]>
7564
Max Brunsfeld <[email protected]>
@@ -123,7 +112,5 @@ Uladzislau Kaminski <[email protected]>
123112
Uladzislau Kaminski <[email protected]> <[email protected]>
124113
Vitaly Slobodin <[email protected]>
125114
Vitaly Slobodin <[email protected]> <[email protected]>
126-
Will Bradley <[email protected]>
127-
Will Bradley <[email protected]> <[email protected]>
128115
WindSoilder <[email protected]>
129116
张小白 <[email protected]>

0 commit comments

Comments
 (0)