Commit graph

98753 commits

Author SHA1 Message Date
Peng Lyu 39c38c884a
Re #154948. No MenuItemAction in notebook (#155096) 2022-07-14 10:21:57 -07:00
Johannes Rieken 1878583319
read REBASE_HEAD when rebasing, swap yours/theirs (label, sides) as well (#155208)
https://github.com/microsoft/vscode/issues/153737
2022-07-14 09:23:44 -07:00
Sandeep Somavarapu 0abc5761ca
switch default - use browser request by default (#155205) 2022-07-14 15:28:25 +00:00
Daniel Imms 8f58d9df26
Use a non-capturing group to fix group indexes 2022-07-14 08:12:12 -07:00
Daniel Imms 44b7c86844
Merge pull request #155183 from microsoft/tyriar/155035
xterm@4.20.0-beta.13
2022-07-14 07:54:13 -07:00
João Moreno 385c0818cd
Move Web job into its own stage (#155193)
* split web from linux

fixes #155191

* reorder
2022-07-14 14:19:25 +00:00
Ladislau Szomoru 5022982829
Settings editor - Boolean setting description should take up the full width instead of just 60% (#155195)
Boolean setting description should take up the full width instead of just 60%
2022-07-14 14:07:06 +00:00
Sandeep Somavarapu ef1da197c1
add clear display language action (#155194) 2022-07-14 14:04:00 +00:00
Ladislau Szomoru ee18db8144
Sync Changes button - only show when local branch is ahead/behind the remote branch (#155192)
Only show Sync Changes button when local branch is ahead/behind the remote branch
2022-07-14 13:51:47 +00:00
Logan Ramos 89f9e79d5d
Polish New File... based on feedback (#155115) 2022-07-14 13:08:33 +00:00
Daniel Imms 2d126f6885
Fix link regex groups
Fixes #155065
2022-07-14 05:44:54 -07:00
Daniel Imms de91899be2
xterm@4.20.0-beta.13
Fixes #155035
2022-07-14 05:32:01 -07:00
Johannes Rieken 86fc94416c
tweak message when closing dirty and conflicting merge editor (#155176)
fyi @bpasero this ensures the close handler is always called with `IEditorIdentifier[]`

re https://github.com/microsoft/vscode/issues/152841
2022-07-14 14:29:42 +02:00
Daniel Imms e1146e0a25
Merge pull request #155046 from microsoft/tyriar/si_cli
Provide simpler route for activating shell integration
2022-07-14 04:47:22 -07:00
Alex Ross e06f679dbf
MainThreadHostTreeView: [createInstance] First service dependency of CustomTreeView at position 4 conflicts with 2 static arguments (#155160)
Fixes #155155
2022-07-14 09:03:35 +00:00
Johannes Rieken c12daa6ea9
add 'Open File' command to merge editor title bar (#155159)
fixes https://github.com/microsoft/vscode/issues/153690
2022-07-14 08:52:14 +00:00
Ladislau Szomoru 70a1ebd595
Git - Add events to IPostCommitCommandsProviderRegistry (#155051)
* Add events to IPostCommitCommandsProviderRegistry

* Pull request feedback
2022-07-14 10:46:57 +02:00
Benjamin Pasero c0e9fca625
electron - drop support for disable-color-correct-rendering (#155150) 2022-07-14 17:07:21 +09:00
Babak K. Shandiz c9ea02399b 💄 Improve field name for "Surround With Snippet" overflow code action
Signed-off-by: Babak K. Shandiz <babak.k.shandiz@gmail.com>
2022-07-14 07:42:00 +00:00
Johannes 0f0101be5f
use TabInputTextMerge in git extensions
For now only when checking for tabs, not yet for opening tabs
2022-07-14 09:41:54 +02:00
Babak K. Shandiz 191d74549c 🔨 Apply "Surround With Snippet" code actions via workspace edits
Signed-off-by: Babak K. Shandiz <babak.k.shandiz@gmail.com>
2022-07-14 07:41:08 +00:00
Babak K. Shandiz 6ea779daca 🐛 Fix not resolving variables SnippetSession.createEditsAndSnippetsFromEdits method
Signed-off-by: Babak K. Shandiz <babak.k.shandiz@gmail.com>
2022-07-14 07:38:57 +00:00
Babak K. Shandiz d2232aff83 ⚗️ Add test to verify SnippetSession.createEditsAndSnippetsFromEdits resolves $SELECTION variable
Signed-off-by: Babak K. Shandiz <babak.k.shandiz@gmail.com>
2022-07-14 07:38:15 +00:00
Babak K. Shandiz c6d246ebb8 ⚗️ Add stub implementation for IWorkspaceContextService.getWorkspace method
Signed-off-by: Babak K. Shandiz <babak.k.shandiz@gmail.com>
2022-07-14 07:38:01 +00:00
Johannes 40df705e1b
add API proposal for vscode.TabInputTextMerge 2022-07-14 09:33:13 +02:00
Sandeep Somavarapu 9ce77765dd
add application to restricted settings (#155143) 2022-07-14 07:24:12 +00:00
Ladislau Szomoru f6332bd86d
Git - Use cloud icon for remote branches (#155140)
Use cloud icon for remote branches
2022-07-14 08:55:29 +02:00
Logan Ramos 461f8694f5
Throw error on legacy walkthrough (#155104)
Remove old walkthrough format
2022-07-14 08:34:23 +02:00
Matt Bierner 9ee8961347
Move MD references, rename, and definition support to md LS (#155127) 2022-07-14 08:32:27 +02:00
Benjamin Pasero f992a90e32
Forking from the extension host fails when running tests (fix #154549) (#155139) 2022-07-14 06:30:08 +00:00
Matt Bierner 867acc336f
Remove references to finalized drop api (#155128) 2022-07-14 08:27:25 +02:00
Benjamin Pasero f947fab886
editors - clarify view state resource (#155136) 2022-07-14 08:26:56 +02:00
Megan Rogge e0a65a97d4
support watch task reconnection (#155120) 2022-07-13 18:16:53 -07:00
Daniel Imms 23f95b1e93
Merge pull request #155119 from microsoft/tyriar/155118
Add configure decorations ctx menu entry
2022-07-13 17:24:57 -07:00
Miguel Solorio f9bad09f62
Add button separator color token (#155103)
* Add button separator color token

* Fix compilation errors
2022-07-13 16:36:38 -07:00
Daniel Imms 63c044b462
Add configure decorations ctx menu entry
Fixes #155118
2022-07-13 16:33:51 -07:00
Matt Bierner 50056f3e78
Finalize drop into editor api (#155102)
Fixes #142990
Fixes #149779
2022-07-13 12:54:52 -07:00
Matt Bierner bec36ce756
Move md path completions and document links to language server (#155100) 2022-07-13 12:49:37 -07:00
Rich Chiodo 06443bcc10
Double check IW is the notebook changing when handling scroll events (#155095)
* Fix 155092

* Review feedback
2022-07-13 18:42:57 +00:00
Sandeep Somavarapu 6a900fc371
Fix #154950 (#155089) 2022-07-13 17:31:52 +00:00
Megan Rogge 6ce1ad6cfe
allow more args in run task (#154854) 2022-07-13 17:25:25 +00:00
Sandeep Somavarapu 2f5b5626e7
Merge pull request #154822 from microsoft/sandy081/shared-process-request-service
Shared process - Delegate requests to main
2022-07-13 19:24:15 +02:00
Joyce Er b5ffc79cc9
Add telemetry tracking edit session feature usage (#155084) 2022-07-13 13:20:38 -04:00
Logan Ramos 9bed8738a7
Fix #153860 (#155086) 2022-07-13 13:19:33 -04:00
Megan Rogge ff31a8c6fd
disable decorations (#154430) 2022-07-13 10:17:01 -07:00
Logan Ramos a03ebcaa0d
Fix #150836 (#155081) 2022-07-13 09:19:15 -07:00
Gavin McQuistin 2c992c7b7d
Fix typo in files.contribution.ts (#155016) 2022-07-13 16:01:25 +00:00
Ladislau Szomoru bc51adde6f
git - Add localization comment for Publish Branch action button (#155053)
* Add localization comment for Publish Branch action button

* Pull request feedback
2022-07-13 14:39:18 +00:00
Daniel Imms 1baeb71f07
Use TERM_PROGRAM conditional to activate 2022-07-13 07:32:24 -07:00
Daniel Imms b497c1c1ff
Revert code-cli.bat changes 2022-07-13 07:10:50 -07:00