Skip to content

Commit 5bcf1c8

Browse files
Anthony-EidRemcoSmitsDev
Anthony-Eid
and
RemcoSmitsDev
authored
Merge main with GPUI3 refactor (#101)
Co-authored-by: Remco Smits <[email protected]>
1 parent 1fb0c5b commit 5bcf1c8

File tree

807 files changed

+56989
-41689
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

+56989
-41689
lines changed

‎.github/ISSUE_TEMPLATE/0_feature_request.yml

+9-28
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,15 @@
11
name: Feature Request
22
description: "Tip: open this issue template from within Zed with the `request feature` command palette action"
3-
labels: ["admin read", "triage", "enhancement"]
3+
type: "Feature"
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
125
- type: textarea
136
attributes:
147
label: Describe the feature
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
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 -->

‎.github/ISSUE_TEMPLATE/1_bug_report.yml

+19-39
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,34 @@
11
name: Bug Report
22
description: |
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"]
3+
Something is broken in Zed (exclude crashing).
4+
type: "Bug"
65
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
146
- type: textarea
157
attributes:
168
label: Describe the bug / provide steps to reproduce it
17-
description: A clear and concise description of what the bug is.
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+
1823
validations:
1924
required: true
25+
2026
- type: textarea
2127
id: environment
2228
attributes:
2329
label: Zed Version and System Specs
24-
description: Zed version, release channel, architecture (x86_64 or aarch64), OS (macOS version / Linux distro and version) and RAM amount.
30+
description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
2531
placeholder: |
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"
32+
Output of "zed: Copy System Specs Into Clipboard"
3033
validations:
3134
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

+20-13
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
11
name: Crash Report
2-
description: |
3-
Use this template for crash reports.
4-
labels: ["admin read", "triage", "bug", "panic / crash"]
2+
description: Zed is Crashing or Hanging
3+
type: "Crash"
54
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
135
- type: textarea
146
attributes:
157
label: Describe the bug / provide steps to reproduce it
16-
description: A clear and concise description of what the bug is.
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+
1722
validations:
1823
required: true
1924
- type: textarea
2025
id: environment
2126
attributes:
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.
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"
2431
validations:
2532
required: true
2633
- type: textarea

‎.github/ISSUE_TEMPLATE/config.yml

+6-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
# yaml-language-server: $schema=https://json.schemastore.org/github-issue-config.json
22
blank_issues_enabled: false
33
contact_links:
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
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

‎.github/workflows/ci.yml

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

1411
pull_request:
1512
branches:
1613
- "**"
17-
paths-ignore:
18-
- "docs/**/*"
19-
- ".github/workflows/community_*"
2014

2115
concurrency:
2216
# Allow only one workflow per any non-`main` branch.
@@ -333,14 +327,14 @@ jobs:
333327
mv target/x86_64-apple-darwin/release/Zed.dmg target/x86_64-apple-darwin/release/Zed-x86_64.dmg
334328
335329
- name: Upload app bundle (aarch64) to workflow run if main branch or specific label
336-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
330+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
337331
if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
338332
with:
339333
name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-aarch64.dmg
340334
path: target/aarch64-apple-darwin/release/Zed-aarch64.dmg
341335

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

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

441435
- name: Upload Linux bundle to workflow run if main branch or specific label
442-
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
436+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
443437
if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
444438
with:
445439
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@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
12+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
stale-issue-message: >

‎.github/workflows/community_update_all_top_ranking_issues.yml

-25
This file was deleted.

‎.github/workflows/community_update_weekly_top_ranking_issues.yml

-25
This file was deleted.

‎.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@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
40+
uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # 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@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
47+
uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # 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@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
54+
uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # 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@6d58852c35a27e6034745c5d0bc373d739014f7f # v3
61+
uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # v3
6262
with:
6363
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
6464
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}

‎.mailmap

+15-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
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]>
1214
Alex Viscreanu <[email protected]>
1315
Alex Viscreanu <[email protected]> <[email protected]>
1416
Alexander Mankuta <[email protected]>
@@ -24,6 +26,7 @@ Bennet Bo Fenner <[email protected]> <[email protected]>
2426
Bennet Bo Fenner <[email protected]> <[email protected]>
2527
Boris Cherny <[email protected]>
2628
Boris Cherny <[email protected]> <[email protected]>
29+
Brian Tan <[email protected]>
2730
Chris Hayes <[email protected]>
2831
Christian Bergschneider <[email protected]>
2932
Christian Bergschneider <[email protected]> <[email protected]>
@@ -32,11 +35,16 @@ Conrad Irwin <[email protected]> <[email protected]>
3235
Dairon Medina <[email protected]>
3336
Danilo Leal <[email protected]>
3437
Danilo Leal <[email protected]> <[email protected]>
38+
Edwin Aronsson <[email protected]>
3539
Evren Sen <[email protected]>
3640
Evren Sen <[email protected]> <[email protected]>
3741
Evren Sen <[email protected]> <[email protected]>
3842
Fernando Tagawa <[email protected]>
3943
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]>
4048
Greg Morenz <[email protected]>
4149
Greg Morenz <[email protected]> <[email protected]>
4250
Ihnat Aŭtuška <[email protected]>
@@ -54,11 +62,14 @@ Kirill Bulatov <[email protected]>
5462
Kirill Bulatov <[email protected]> <[email protected]>
5563
Kyle Caverly <[email protected]>
5664
Kyle Caverly <[email protected]> <[email protected]>
65+
Lilith Iris <[email protected]>
66+
Lilith Iris <[email protected]> <[email protected]>
5767
LoganDark <[email protected]>
5868
LoganDark <[email protected]> <[email protected]>
5969
LoganDark <[email protected]> <[email protected]>
60-
Marshall Bowers <[email protected]>
61-
Marshall Bowers <[email protected]> <[email protected]>
70+
Marshall Bowers <[email protected]>
71+
Marshall Bowers <[email protected]> <[email protected]>
72+
Marshall Bowers <[email protected]> <[email protected]>
6273
Matt Fellenz <[email protected]>
6374
Matt Fellenz <[email protected]> <[email protected]>
6475
Max Brunsfeld <[email protected]>
@@ -112,5 +123,7 @@ Uladzislau Kaminski <[email protected]>
112123
Uladzislau Kaminski <[email protected]> <[email protected]>
113124
Vitaly Slobodin <[email protected]>
114125
Vitaly Slobodin <[email protected]> <[email protected]>
126+
Will Bradley <[email protected]>
127+
Will Bradley <[email protected]> <[email protected]>
115128
WindSoilder <[email protected]>
116129
张小白 <[email protected]>

0 commit comments

Comments
 (0)