Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debugger implementation #13433

Draft
wants to merge 738 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
738 commits
Select commit Hold shift + click to select a range
b3aa18d
Update variable list test to cover hide sub variables
RemcoSmitsDev Dec 29, 2024
f682077
Remove dbg! statement
Anthony-Eid Dec 29, 2024
9cd7e07
Keep scroll position in variable list when opening nested variables (…
RemcoSmitsDev Dec 29, 2024
f0947c1
Fix bug where untoggling last breakpoint in buffer wouldn't send to d…
Anthony-Eid Dec 30, 2024
0b68944
Fix bug where toggling breakpoints on line 1 wouldn't work
Anthony-Eid Dec 30, 2024
dd5083a
Remove empty log breakpoints when confirming log message
Anthony-Eid Dec 30, 2024
acb3ee2
Clean up remove breakpoint code
RemcoSmitsDev Dec 30, 2024
3afda61
Add editor toggle breakpoint test
RemcoSmitsDev Dec 30, 2024
7223bf9
Update toggle breakpoint test so cover more cases
RemcoSmitsDev Dec 30, 2024
42d1b48
Testing: Allow sending error response inside request handler
RemcoSmitsDev Dec 30, 2024
1c59d22
Send error response message back for StartDebugging request
RemcoSmitsDev Dec 30, 2024
1698965
Create set breakpoint context menu
Anthony-Eid Jan 2, 2025
f9c88fb
Add edit log breakpoint action
Anthony-Eid Jan 2, 2025
331aafd
Add log breakpoint tests
Anthony-Eid Jan 2, 2025
9497987
Add workspace breakpoint persistence test
Anthony-Eid Jan 2, 2025
cbbf2da
Update debugger docs with more basic information
Anthony-Eid Jan 2, 2025
e551923
Merge branch 'main' into debugger
Anthony-Eid Jan 2, 2025
020623a
Fix regression causing some debugger tests to fail
Anthony-Eid Jan 3, 2025
f0cd2bf
Fix unused test import
Anthony-Eid Jan 3, 2025
f2722db
Fix crash with RunInTerminal request
RemcoSmitsDev Jan 3, 2025
78d342d
Fix CWD is not correctly respected when appending child paths
RemcoSmitsDev Jan 3, 2025
5010733
Merge branch 'main' into debugger
RemcoSmitsDev Jan 7, 2025
2551a0f
Fix variable list for participants during collab debugging
Anthony-Eid Jan 8, 2025
72f1389
Make respond to start debugging code more readable
RemcoSmitsDev Jan 8, 2025
d99653f
Add basic test to validate StartDebugging reverse request works
RemcoSmitsDev Jan 8, 2025
404f773
Use title from adapter when spawning a debug terminal
RemcoSmitsDev Jan 8, 2025
8911c96
Send error response back for RunInTerminal response for debugging
RemcoSmitsDev Jan 8, 2025
dd4a1f7
Only change the request timeout for tests
RemcoSmitsDev Jan 8, 2025
01648b9
Integrate Debugger within Collab DB (#81)
Anthony-Eid Jan 8, 2025
fa17737
Correctly set thread state in SetDebuggerPanelItem handler
Anthony-Eid Jan 9, 2025
73627a3
Get downstream collab clients to set their own active debug line
Anthony-Eid Jan 10, 2025
46b72f6
Reset thread status to stop after failed step{over,in,out,back} & con…
Anthony-Eid Jan 10, 2025
918869f
Merge branch 'main' into debugger
Anthony-Eid Jan 11, 2025
14a2f75
Variable list keyboard navigation (#84)
RemcoSmitsDev Jan 11, 2025
797f5bd
Merge branch 'main' into debugger
RemcoSmitsDev Jan 11, 2025
c91f51d
Log errors ins stepping tasks, and update tests
RemcoSmitsDev Jan 11, 2025
887e2a6
Use Toast Notification for Debug Session Warning (#83)
Anthony-Eid Jan 11, 2025
943609f
Fix failing editor test
RemcoSmitsDev Jan 11, 2025
4e13a00
Add missing action handler for OpenDebugTasks
RemcoSmitsDev Jan 11, 2025
4baa7f7
Don't show Telemetry data in output console
RemcoSmitsDev Jan 12, 2025
5aa816e
Fix telemetry spelling error
Anthony-Eid Jan 12, 2025
2736b2f
Update rust-embed version to fix cicd build error (#87)
Anthony-Eid Jan 13, 2025
f9f2810
Add launch delay for gdb debugger
Anthony-Eid Jan 14, 2025
a7e26bb
Proxy dap requests to upstream clients (#77)
Anthony-Eid Jan 14, 2025
8ecd547
Debug output grouping (#86)
RemcoSmitsDev Jan 14, 2025
06c11f9
Move send request to dap client to background thread
RemcoSmitsDev Jan 14, 2025
a9d7858
Add restart stack frame (#85)
RemcoSmitsDev Jan 14, 2025
41b7028
Fix only allow autocompletion for variables that are from the current…
RemcoSmitsDev Jan 15, 2025
8694650
Send synced breakpoints to active DAP servers in collab (#89)
Anthony-Eid Jan 16, 2025
d03e414
Fix CustomEvent type field are not public
RemcoSmitsDev Jan 16, 2025
bc49c18
Fix Collab Module List Bug (#91)
Anthony-Eid Jan 17, 2025
568f127
Fix name error in module list func
Anthony-Eid Jan 17, 2025
a193efd
Re-send breakpoints when source file has been changed (#92)
RemcoSmitsDev Jan 19, 2025
f34fc7f
Use arc for dap command request instead of cloning the command itself
RemcoSmitsDev Jan 19, 2025
272721a
Merge branch 'main' into debugger
RemcoSmitsDev Jan 19, 2025
868f55c
Fix failing test
RemcoSmitsDev Jan 19, 2025
5ecfef0
Fix failing test because of race condition
RemcoSmitsDev Jan 19, 2025
4de9921
Add support for adapter specific clipboard value formatting
RemcoSmitsDev Jan 19, 2025
1a5feff
Implment Variable List Toggling Function in Collab (#88)
Anthony-Eid Jan 19, 2025
675fb2f
Fix only show restart frame icon for frames that allow it
RemcoSmitsDev Jan 20, 2025
7b6d20b
Stack frame presentation hint (#94)
RemcoSmitsDev Jan 20, 2025
e1392c9
Allow sending breakpoint request for unopened buffers
RemcoSmitsDev Jan 20, 2025
647f411
Add test for sending breakpoints for unopened buffers
RemcoSmitsDev Jan 20, 2025
9bca023
Shutdown debug session when launch/attach fails
RemcoSmitsDev Jan 20, 2025
5a52c7e
Add test to for shutdown on launch/attach failure
RemcoSmitsDev Jan 20, 2025
953843a
Add stack frame source origin to tooltip
RemcoSmitsDev Jan 21, 2025
8ceb115
Fix typo in docs
RemcoSmitsDev Jan 21, 2025
a89e295
Rename `server` to `adapter` inside the dap log
RemcoSmitsDev Jan 21, 2025
56abc60
Collab - Toggle Ignore Breakpoints (#93)
Anthony-Eid Jan 21, 2025
ec547b8
Add debug configuration documentation (#96)
RemcoSmitsDev Jan 21, 2025
1fb0c5b
Fix bug where lldb user installed path wasn't used in some cases
Anthony-Eid Jan 24, 2025
7886582
Transition to gpui3 (#103)
Anthony-Eid Jan 29, 2025
25db814
Merge branch 'main' into debugger
Anthony-Eid Jan 29, 2025
a2e0b67
Merge branch 'main' into debugger
Anthony-Eid Jan 29, 2025
dfe978b
Add toolchain support for python debug adapter (#90)
RemcoSmitsDev Jan 29, 2025
197166a
Fix clippy errors
Anthony-Eid Jan 31, 2025
ef3a6de
Improve the visibility of process entries (#105)
RemcoSmitsDev Feb 1, 2025
889949c
Add lldb attach support
Anthony-Eid Feb 2, 2025
e81a7e1
Merge branch 'main' into debugger
RemcoSmitsDev Feb 3, 2025
b6b7ad3
Remove commented code in lldb attach code
RemcoSmitsDev Feb 3, 2025
c994075
Clean up Debugger collab tests (#104)
Anthony-Eid Feb 3, 2025
47b3f55
Minor cleanup of breakpoint context menu code
Anthony-Eid Feb 3, 2025
3bf5833
Make Pane take non-optional double click action again
osiewicz Feb 3, 2025
945e322
Lazy load stack frame information (scopes & variables) (#106)
RemcoSmitsDev Feb 3, 2025
26f14fd
Remove futures from debugger ui crate
RemcoSmitsDev Feb 3, 2025
c45b6e9
Clean up naming in activity_indicator.rs
osiewicz Feb 3, 2025
69548f5
Clean up naming around activity indicator and binary statuses
osiewicz Feb 3, 2025
44e9444
Fix choose debugger action didn't work anymore
RemcoSmitsDev Feb 3, 2025
4c93065
Use workspace values for edition and publish in new crates
osiewicz Feb 3, 2025
d600898
Show console output on remote debug clients (#107)
Anthony-Eid Feb 3, 2025
5cd93ca
Fix test_extension_store_with_test_extension
Anthony-Eid Feb 3, 2025
dfeddaa
Remove unused dep from activity indicator
osiewicz Feb 3, 2025
080d0c4
Remove sqlez dependency on project
osiewicz Feb 3, 2025
ad98bf4
Trigger CLA check
osiewicz Feb 3, 2025
a56e3ea
Merge branch 'main' into debugger
osiewicz Feb 3, 2025
5235024
cargo fmt
osiewicz Feb 3, 2025
dcde289
Merge branch 'main' into debugger
osiewicz Feb 4, 2025
28874b6
Fix up symlinks for license files
osiewicz Feb 4, 2025
27b6043
Revert "Lazy load stack frame information (scopes & variables) (#106)"
Anthony-Eid Feb 4, 2025
3cf9658
Revert "Remove futures from debugger ui crate"
Anthony-Eid Feb 4, 2025
aa268d1
Merge branch 'main' into debugger
RemcoSmitsDev Feb 5, 2025
c76144e
Re-Apply Lazy load stack frame information (#108)
RemcoSmitsDev Feb 5, 2025
1be2836
Refactor session id to use entity instead (#109)
RemcoSmitsDev Feb 5, 2025
4fcb10d
lsp: Add support for default rename behavior in prepareRename request…
osiewicz Feb 5, 2025
180ce5e
edit prediction: Allow enabling OSS data collection with no project o…
agu-z Feb 5, 2025
6ec4adf
Accept edit predictions with `alt-tab` in addition to `tab` (#24272)
agu-z Feb 5, 2025
b7f0a1f
windows: Fix tests on Windows (#22616)
JunkuiZhang Feb 5, 2025
da66f75
Revert "copilot: Correct o3-mini context length" (#24275)
notpeter Feb 5, 2025
33e3928
languages: Sort dependencies in `Cargo.toml` (#24277)
maxdeviant Feb 5, 2025
cee4e25
edit predictions: Onboarding funnel telemetry (#24237)
agu-z Feb 5, 2025
e21ea19
edit prediction: Don't log an error if license file isn't found (#24278)
danilo-leal Feb 5, 2025
9c3e85a
Rework shared commit editors (#24274)
SomeoneToIgnore Feb 5, 2025
dac2873
Fix the worktree's repository_for_path (#24279)
cole-miller Feb 5, 2025
b6182d0
edit prediction: Fix license detection error logging + check for diff…
danilo-leal Feb 5, 2025
2973b46
Revise the `MessageNotification` component (#24287)
danilo-leal Feb 5, 2025
9ef8ace
edit prediction: Improve UX around `disabled_globs` and `show_inline_…
bennetbo Feb 5, 2025
64bc112
Revert recent anti-aliasing improvements (#24289)
SomeoneToIgnore Feb 5, 2025
16eff80
Merge branch 'main' into debugger
osiewicz Feb 5, 2025
af77b2f
WIP refactor (#110)
RemcoSmitsDev Feb 7, 2025
2fc7c17
Remove debugger collab db tables (#111)
Anthony-Eid Feb 7, 2025
05ca096
Use observe for module list instead of clearing only when the length …
RemcoSmitsDev Feb 8, 2025
dad39ab
Move module list to new structure
RemcoSmitsDev Feb 8, 2025
39d4d62
Merge branch 'main' into debugger
osiewicz Feb 10, 2025
062e64d
cargo fmt
osiewicz Feb 10, 2025
e216805
Add check if request is support inside dap command
RemcoSmitsDev Feb 10, 2025
8b45634
Invalidate dap session information on stopped event
RemcoSmitsDev Feb 10, 2025
90deb4a
Merge branch 'main' into debugger
osiewicz Feb 10, 2025
9ac18e9
Add assert for unexpected debug command
osiewicz Feb 10, 2025
9d5525e
Move DAP modules in project into debugger submodule
osiewicz Feb 10, 2025
c8ba6d7
Move caps onto the debug client state
osiewicz Feb 11, 2025
041e1ee
Move sessions mapping to DapStore itself
osiewicz Feb 11, 2025
661e5b0
Merge branch 'main' into debugger
osiewicz Feb 13, 2025
ecfc0ef
Move requests into client (#112)
RemcoSmitsDev Feb 13, 2025
91e60d7
Add `BreakpointStore` to debugger crate (#114)
Anthony-Eid Feb 14, 2025
3833788
Add missing init for breakpointstore
RemcoSmitsDev Feb 14, 2025
c820f12
Check capabilities outside of dap_session
osiewicz Feb 14, 2025
00c24ce
Simplify DapCommand::is_supported
osiewicz Feb 14, 2025
be80ded
Merge branch 'main' into debugger
osiewicz Feb 14, 2025
90440d9
fixup! Check capabilities outside of dap_session
osiewicz Feb 14, 2025
debcb1f
WIP
osiewicz Feb 14, 2025
936ac21
Another WIP
osiewicz Feb 14, 2025
cdb5af2
Remove project from toggle breakpoint dependencies
Anthony-Eid Feb 14, 2025
3aab70c
Fix some warnings
Anthony-Eid Feb 14, 2025
53336ee
Move breakpoint serialization/deserialization to breakpoint store fro…
Anthony-Eid Feb 14, 2025
e285ae6
WIP
osiewicz Feb 14, 2025
d0f64d4
Add placeholder for thread dropdown
osiewicz Feb 14, 2025
6648d62
Use dropdown menu instead
osiewicz Feb 14, 2025
43e2c4d
Keep going
osiewicz Feb 14, 2025
7fe8c62
Fix up one call site
osiewicz Feb 15, 2025
36b430a
Add a doc comment for the debugger module
osiewicz Feb 15, 2025
12c02a1
WIP
osiewicz Feb 15, 2025
bc5904e
Fix breakpoint line numbers not being colored
Anthony-Eid Feb 16, 2025
f7886ad
Remove display_row from line number layout struct
Anthony-Eid Feb 16, 2025
294ce96
WIP
osiewicz Feb 16, 2025
0233152
Get rid of supports_attach (we'll configure it differently later on)
osiewicz Feb 17, 2025
f8e2482
Merge branch 'main' into debugger
osiewicz Feb 17, 2025
b1ca8c3
Merge branch 'debugger' into remove-dap-session
osiewicz Feb 17, 2025
a0c91d6
WIP
osiewicz Feb 17, 2025
45db28a
Project compiles, yay
osiewicz Feb 17, 2025
ad356d9
Building! And crashing
osiewicz Feb 17, 2025
fbf4eb9
fixup! Building! And crashing
osiewicz Feb 17, 2025
cf13a62
Rename client module to session
osiewicz Feb 17, 2025
c9a9ab2
And the rename is complete
osiewicz Feb 17, 2025
f81463c
WIP
osiewicz Feb 17, 2025
1e0a0fa
Renames
osiewicz Feb 17, 2025
0dc90fd
UI shred
osiewicz Feb 17, 2025
9786da2
WIP
osiewicz Feb 17, 2025
9559096
WIP
osiewicz Feb 17, 2025
0633896
WIP
osiewicz Feb 17, 2025
b67a382
WIP
osiewicz Feb 17, 2025
24e816b
WIP
osiewicz Feb 17, 2025
c07526f
Fix focus on inert state
osiewicz Feb 17, 2025
45cf5b5
Add basic tab content
osiewicz Feb 17, 2025
16dba67
UI touchups
osiewicz Feb 17, 2025
6737555
Add launch/attach buttons
osiewicz Feb 17, 2025
7797b70
Wire up click handler
osiewicz Feb 17, 2025
edfeea2
Add a new item to pane if it's empty
osiewicz Feb 17, 2025
9b8ea48
Split out local part from DapCommand
osiewicz Feb 18, 2025
abda28f
Use LocalDapCommand in bounds
osiewicz Feb 18, 2025
28d6e76
Add Initialize command
osiewicz Feb 18, 2025
05a3537
cleanups
osiewicz Feb 18, 2025
bd27f87
Rename DebugAdapterClientId to SessionId
osiewicz Feb 18, 2025
b8383be
Renames
osiewicz Feb 18, 2025
afaaf24
Renames
osiewicz Feb 18, 2025
a8f59b8
Renames
osiewicz Feb 18, 2025
c308a8c
Reduce visibility of modes
osiewicz Feb 18, 2025
ced8514
Merge pull request #115 from zed-industries/remove-dap-session
osiewicz Feb 18, 2025
04a1e56
fmt
osiewicz Feb 18, 2025
1d5fc37
Change dap name on click in inert state
osiewicz Feb 18, 2025
e82520c
Move from inert to starting state
osiewicz Feb 18, 2025
083fca4
Style starting state a bit
osiewicz Feb 18, 2025
9ea14ec
Touchups
osiewicz Feb 18, 2025
b891172
client_id -> session_id some more
osiewicz Feb 18, 2025
1c10133
^
osiewicz Feb 18, 2025
b4c2de0
Oops
osiewicz Feb 18, 2025
27bda50
Remove another session id
osiewicz Feb 18, 2025
2ca2942
Adjust DAP store to return session from start methods
osiewicz Feb 18, 2025
b159e3c
Remove start_client_internal
osiewicz Feb 18, 2025
4d2ecb2
Remove some more code
osiewicz Feb 18, 2025
4bb00ad
Merge branch 'main' into debugger
osiewicz Feb 18, 2025
5908d5d
Cherry pick from remove-dap-session
Anthony-Eid Feb 18, 2025
4e0408a
Start wiring in running state
osiewicz Feb 18, 2025
286532e
Handle initialize event
Anthony-Eid Feb 18, 2025
df6c364
Clean up handle initialized event return func
Anthony-Eid Feb 18, 2025
c1ad987
Rename event handler to message handle in debug client func
Anthony-Eid Feb 18, 2025
1644871
Start work on handling stopped event
Anthony-Eid Feb 18, 2025
060c8df
Remove code
osiewicz Feb 18, 2025
859cc67
WIP
osiewicz Feb 19, 2025
1af8c11
Initialization sequence
osiewicz Feb 19, 2025
95eca60
Bring back old UI
osiewicz Feb 19, 2025
ac68f31
Allow session to handle toggling ignore breakpoint
Anthony-Eid Feb 19, 2025
13dd3aa
Enable session to send changed breakpoints to active dap servers
Anthony-Eid Feb 19, 2025
83a8933
Merge branch 'main' into debugger
osiewicz Feb 19, 2025
650984b
Send out breakpoints in the configuration sequence
osiewicz Feb 19, 2025
b43a2d1
Bubble up event handling to Session and Dap Store
osiewicz Feb 19, 2025
c711168
Start wiring through thread state handling
osiewicz Feb 19, 2025
14eab34
Show threads in the dropdown
osiewicz Feb 19, 2025
2e83b37
Fix didn't do anything with returned task
RemcoSmitsDev Feb 19, 2025
8a5e754
Impl continued event
RemcoSmitsDev Feb 19, 2025
03144d7
Mark thread list as disabled when there are no threads.
osiewicz Feb 19, 2025
f4cb78f
Fix a few clippy errors
RemcoSmitsDev Feb 19, 2025
c8632a3
Show stack frames when you a select thread
RemcoSmitsDev Feb 19, 2025
26502cd
Read thread status from session
RemcoSmitsDev Feb 19, 2025
55a39d5
Use LocalDapCommand::is_supported for ConfigurationDone
osiewicz Feb 19, 2025
0358cdc
Start sketching out config view
osiewicz Feb 19, 2025
9815a8f
Clean up errors and only send modules requests when thread is stopped
Anthony-Eid Feb 19, 2025
6e17f91
send out breakpoints in the initial batch
osiewicz Feb 19, 2025
9bac1ff
Display selected thread & auto-select first thread if we don't have a…
osiewicz Feb 19, 2025
eeded3d
Allow starting session from action and add new session as item to deb…
Anthony-Eid Feb 19, 2025
3378b7a
Get module list to render correctly
Anthony-Eid Feb 19, 2025
5973719
Invalidate all stack frames on thread event
osiewicz Feb 20, 2025
58640da
Annotate cacheable requests on LocalDapCommand level
osiewicz Feb 20, 2025
6375d34
Start work on enabling getting active debug line to show in editor
Anthony-Eid Feb 20, 2025
38a634c
Merge branch 'main' into debugger
osiewicz Feb 20, 2025
d327e60
Remove unused import
osiewicz Feb 20, 2025
0c7cd6f
Make one-based rows explicit by use of NonZeroU32
osiewicz Feb 20, 2025
0e998cd
Change stack frame data structure to index map instead of vec
Anthony-Eid Feb 21, 2025
ef87cc3
Merge branch 'main' into debugger
osiewicz Feb 21, 2025
97ed70d
Merge branch 'debugger' of github.com:RemcoSmitsDev/zed into debugger
osiewicz Feb 21, 2025
d34726f
Fix compile error
RemcoSmitsDev Feb 21, 2025
f957e79
Fix incorrect if statement logic for when to fetch stack frames
RemcoSmitsDev Feb 21, 2025
76b2004
Fix some clippy errors
RemcoSmitsDev Feb 21, 2025
7b0dd68
Update if statement for fetching modules and loaded sources
RemcoSmitsDev Feb 21, 2025
c391ff8
Remove unused method
RemcoSmitsDev Feb 21, 2025
14472db
Invalidate modules and loaded source when receiving events
RemcoSmitsDev Feb 21, 2025
104980a
Impl capabilities event
RemcoSmitsDev Feb 21, 2025
7b49c7a
Remove unused function
osiewicz Feb 21, 2025
a8c79cc
Oopps
RemcoSmitsDev Feb 21, 2025
417e1d9
Get scopes to render when selecting a stack frame
Anthony-Eid Feb 21, 2025
255c86c
Make output console work again (#116)
RemcoSmitsDev Feb 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .zed/debug.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[
{
"label": "Debug Zed with LLDB",
"adapter": "lldb",
"program": "$ZED_WORKTREE_ROOT/target/debug/zed",
"request": "launch",
"cwd": "$ZED_WORKTREE_ROOT"
},
{
"label": "Debug Zed with GDB",
"adapter": "gdb",
"program": "$ZED_WORKTREE_ROOT/target/debug/zed",
"request": "launch",
"cwd": "$ZED_WORKTREE_ROOT",
"initialize_args": {
"stopAtBeginningOfMainSubprogram": true
}
}
]
124 changes: 124 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ members = [
"crates/context_server",
"crates/context_server_settings",
"crates/copilot",
"crates/dap",
"crates/dap_adapters",
"crates/debugger_ui",
"crates/db",
"crates/deepseek",
"crates/diagnostics",
Expand Down Expand Up @@ -186,6 +189,7 @@ members = [
#

"tooling/xtask",
"crates/debugger_tools",
]
default-members = ["crates/zed"]

Expand Down Expand Up @@ -228,7 +232,11 @@ command_palette_hooks = { path = "crates/command_palette_hooks" }
context_server = { path = "crates/context_server" }
context_server_settings = { path = "crates/context_server_settings" }
copilot = { path = "crates/copilot" }
dap = { path = "crates/dap" }
dap_adapters = { path = "crates/dap_adapters" }
db = { path = "crates/db" }
debugger_ui = { path = "crates/debugger_ui" }
debugger_tools = { path = "crates/debugger_tools" }
deepseek = { path = "crates/deepseek" }
diagnostics = { path = "crates/diagnostics" }
editor = { path = "crates/editor" }
Expand Down Expand Up @@ -465,7 +473,7 @@ runtimelib = { version = "0.25.0", default-features = false, features = [
"async-dispatcher-runtime",
] }
rustc-demangle = "0.1.23"
rust-embed = { version = "8.4", features = ["include-exclude"] }
rust-embed = { version = "8.5", features = ["include-exclude"] }
rustc-hash = "2.1.0"
rustls = "0.21.12"
rustls-native-certs = "0.8.0"
Expand Down
1 change: 1 addition & 0 deletions assets/icons/debug.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/debug_breakpoint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/debug_continue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/debug_disconnect.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/debug_ignore_breakpoints.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/debug_log_breakpoint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/debug_pause.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/debug_restart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/debug_step_back.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/icons/debug_step_into.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/icons/debug_step_out.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/icons/debug_step_over.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/debug_stop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions assets/keymaps/default-macos.json
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit/todo: we'll have to fill in key bindings before merging.

Copy link
Contributor

Choose a reason for hiding this comment

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

Btw I have a branch where i started adding the key bindings. Will merge it by Wednesday

Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,14 @@
"space": "project_panel::Open"
}
},
{
"context": "VariableList",
"use_key_equivalents": true,
"bindings": {
"left": "variable_list::CollapseSelectedEntry",
"right": "variable_list::ExpandSelectedEntry"
}
},
{
"context": "GitPanel && !CommitEditor",
"use_key_equivalents": true,
Expand Down
8 changes: 7 additions & 1 deletion assets/settings/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,12 @@
// }
// ]
"ssh_connections": [],

// Configures context servers for use in the Assistant.
"context_servers": {}
"context_servers": {},
"debugger": {
"stepping_granularity": "line",
"save_breakpoints": true,
"button": true
}
}
32 changes: 32 additions & 0 deletions assets/settings/initial_debug_tasks.json
Copy link
Contributor

Choose a reason for hiding this comment

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

We'll prolly want to define default debug tasks on an adapter-by-adapter basis.

Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[
{
"label": "Debug active PHP file",
"adapter": "php",
"program": "$ZED_FILE",
"request": "launch",
"cwd": "$ZED_WORKTREE_ROOT"
},
{
"label": "Debug active Python file",
"adapter": "python",
"program": "$ZED_FILE",
"request": "launch",
"cwd": "$ZED_WORKTREE_ROOT"
},
{
"label": "Debug active JavaScript file",
"adapter": "javascript",
"program": "$ZED_FILE",
"request": "launch",
"cwd": "$ZED_WORKTREE_ROOT"
},
{
"label": "JavaScript debug terminal",
"adapter": "javascript",
"request": "launch",
"cwd": "$ZED_WORKTREE_ROOT",
"initialize_args": {
"console": "integratedTerminal"
}
}
]
Loading
Loading