Commit graph

12756 commits

Author SHA1 Message Date
Michael Lively 1076180257
Merge branch 'main' into mlively/newCellPasteBug 2022-08-22 14:57:15 -07:00
Harald Kirschner bb70d7ab19
Instrument slow git status updates (#158325)
* Instrument slow git status updates

* Add expiration
2022-08-22 22:01:51 +02:00
Johannes Rieken 337cd4b1cf
Expose editor "blue button" as menu (#158740)
* Expose editor "blue button" as menu

* rename proposed `MergeToolbar` to `EditorContent` menu
* adopt GIT and sync conflicts usage
* use content menu for "open in 3wm" command
* add new `ctxIsMergeResultEditor` context key

Better fix for https://github.com/microsoft/vscode/issues/153800

* fix typo
2022-08-22 15:24:56 +02:00
Ladislau Szomoru 052b1e4d1b
Git - Clear global state if setting is not enabled (#158747)
Clear global state if setting is not enabled
2022-08-22 04:39:02 -07:00
Ladislau Szomoru 3cfc74c52e
Git - Add setting to remember post commit command (#158449) 2022-08-22 12:34:47 +02:00
Joyce Er fa4ff1519d
Implement and adopt edit session identifier API proposal (#157733)
* Add canonical workspace identifier proposed API

* Use canonical id to store and resume edit sessions

* Add git extension workspace identity provider

* Fix warning incorrectly showing up

* Make auto resume behavior opt in

* * Create a separate service
* Accept WorkspaceFolder instead of URI
* Return string instead of object

* Make edit session restores resilient to provider registration races

* Introduce an activation event
* Activate contributing extension before using provider

* `CanonicalWorkspaceIdentity` -> `EditSessionIdentity`

* Show progress while resuming edit session

* Store edit session even if extension will take care of opening target workspace

* Address most of PR feedback

* `IEditSessionsWorkbenchService` -> `IEditSessionsStorageService`

* Unregister provider in renderer

* Split out proposal into new `editSessionIdentityProvider.d.ts`

* Fix bad merge

* Always show progress in window

* Convert URI schemes
2022-08-19 08:01:43 -07:00
João Moreno 6dbddd8b91
fix: freeze Resource#command (#158579)
Fixes: #157904
2022-08-19 14:24:36 +02:00
Johannes Rieken 11b6d009a4
Merge branch 'main' into cs-reference-view-api 2022-08-19 12:57:24 +02:00
Michael Lively 519082320b Merge branch 'main' into mlively/newCellPasteBug 2022-08-18 11:58:52 -07:00
Michael Lively 6f7189b7bb refactor metadata into own fxn 2022-08-18 11:58:44 -07:00
Joyce Er 65abd2b037
Add icon for Open on vscode.dev command (#158519) 2022-08-18 20:11:41 +02:00
Logan Ramos 67e628e18a
The quest to debug vscode.open continues (#158483) 2022-08-18 15:13:18 +02:00
Benjamin Pasero 032662071c
openIntegration test failure: openTextDocument, untitled closes on save (#157897) (#158482) 2022-08-18 14:56:50 +02:00
Johannes Rieken c592ef8e18
use "Incoming" and "Current" everywhere (#158478)
fixes https://github.com/microsoft/vscode/issues/156229
2022-08-18 14:21:06 +02:00
Johannes Rieken c0ade8bc81
joh/unknown lemming (#158460)
* make git's `openMergeEditor` user-facing command and show it for editors that have conflicts

also includes a workaround for an issue with untyped editor inputs... fyi @lramos15

* Patch matches

* Remove TODO

* set nowrap for white-space

fixes https://github.com/microsoft/vscode/issues/156402

Co-authored-by: Logan Ramos <lramos15@gmail.com>
2022-08-18 06:58:30 -04:00
Michael Lively 880fda6ed9 fix pasting image into newly created cell bug 2022-08-17 12:17:39 -07:00
Matt Bierner 129f5bc976
Use own calls to localize (#158372)
Fixes #156684
2022-08-17 10:27:29 -04:00
Daniel Imms 95d21cbc37
Merge pull request #157654 from microsoft/tyriar/fish_lang
Add .fish to shell script language
2022-08-17 07:06:08 -07:00
Johannes Rieken 9759525167
push workaround for https://github.com/microsoft/vscode/issues/157904 (#158368) 2022-08-17 14:40:36 +01:00
Joyce Er e1628628a8
Provide context on which repository is being cloned (#158324) 2022-08-17 00:11:28 +01:00
Matt Bierner 3393b785de
Bump server version (#158297) 2022-08-16 14:38:41 -04:00
Matt Bierner 720a61fc28
Fix markdown link diagnostics not updated when directories are renamed / deleted (#157956)
Fix markdown link diagnostics not updated when directories are renamed/deleted

Turns our that `createFileSystemWatcher` will not fire if a parent dir is renamed / deleted. See #60813

To fix this, I believe we have to create watchers for all parent directories too (or watch everything in the entire workspace)
2022-08-12 13:48:40 -04:00
Rob Lourens 8c2fd550a3
Notebook cell execute in Interactive Window Test Fails on MacOS (#157963)
* Notebook cell execute in Interactive Window Test Fails on MacOS
Fixes #157826

* Remove .only
2022-08-12 09:31:11 -07:00
Henning Dieterichs 7dd5f05b6e
Enable conflict marker decorators even if merge editor is enabled. (#157982) 2022-08-12 15:21:38 +02:00
Matt Bierner dfe145441a
Pick up TS 4.8 RC (#157960)
For #157527
2022-08-11 16:58:48 -07:00
Matt Bierner b731beeef4
Use notebook document uri for drop / copy paste (#157939)
Fixes #157938
2022-08-11 19:52:55 +01:00
Aaron Munger 74f8a781d0
Merge pull request #157923 from amunger/interactiveExecute
add parameter to Interactive Execute to specify resource
2022-08-11 11:20:12 -07:00
aamunger 694324e3ac
add parameter to Interactive Execute to specify resource 2022-08-11 10:45:24 -07:00
Benjamin Pasero c6bcc3fcbf
API command test fail on MacOS (for #157824) (#157885)
API command test fail on MacOS (fix #157824)
2022-08-11 09:57:19 -04:00
Benjamin Pasero a3067cbbc6
assert that closed is defined (for #157897) (#157901) 2022-08-11 06:46:19 -07:00
Matt Bierner 38ea5c22a6
Pick up new markdown LS version (#157843) 2022-08-10 18:16:24 -07:00
Ladislau Szomoru b2212a1090
Git - Fix more scenarios where the post commit command setting is not honoured. (#157804)
* Revert "Commit keyboard shortcut to honor the post commit command setting (#157617)"

This reverts commit fe946068ba.

* Fix more scenarios where the post commit command setting is not honoured.
2022-08-10 16:12:26 -07:00
Alex Ross f146031624
Update grammars (#157773) 2022-08-10 06:40:17 -07:00
Matt Bierner 460768a452
Update TS versions (#157550)
* Update TS versions

Update the bundled TS and build TS version

* Add explicit annotations

* Recompile JS
2022-08-09 11:26:24 -07:00
Michael Lively 38477bf5f5
change dir of cellAttachmentRenderer (#157671)
* change dir of cellAttachmentRenderer

* add new directories to `.vscodeignore`

* add the .js directories back in...

* hopefully now understanding `.vscodeignore`
2022-08-09 20:00:24 +02:00
Tyler James Leonhardt bcb31b9cfb
disable nls on the web for now (#157665) 2022-08-09 18:30:23 +02:00
Matt Bierner 8bf82819fc
Add experimental support for update markdown links on file moves/renames (#157209)
* Add experimental support for update markdown links on file moves/renames

Fixes #148146

This adds a new experimental setting that automatically updates markdown

Note that this needs a new version of the vscode-markdown-languageservice so the build is expected to break for now

* Pick up new LS version
2022-08-09 08:31:40 -07:00
Ladislau Szomoru 81e6a02c18
Git - Upgrade file-type package (#156411) 2022-08-09 11:30:49 -04:00
Daniel Imms 5c2cbe2b7d
Add .fish to shell script language 2022-08-09 08:19:27 -07:00
Ladislau Szomoru fe946068ba
Commit keyboard shortcut to honor the post commit command setting (#157617) 2022-08-09 11:14:56 +02:00
Matt Bierner 389938998f
Show error when markdown preview restore fails (#157566)
Fixes #155493
2022-08-09 09:55:40 +02:00
ChaseKnowlden 19d0675506
Add offline_access to list of default scopes (#157453)
Add a new scope to default scopes
2022-08-08 14:55:13 -07:00
Michael Lively 9225503c85
Support for pasting images into markdown notebook cells (#156847)
* dataflow support for updated metadata

* update cellAttachmentRenderer.ts to reflect metadata being a getter() inside MarkupCell

* document paste additions

* update condition to re-render cells, now includes metadata changes

* paste API working, debugging command added

* paste working with metadata. needs numbering, and cleaning upon delete

* paste screenshot works fully

* remove debugging command. Cleaning.

* notebook cells now re-render upon metadata changes

* changed name validity checking, remove unneeded function

* use _document for cell data, use snippet choice, dto fix

* return subscription, for loop, uri fix, alter metadata in-place, better snippet

* metadata fix, object.equals, fix cellAttRenderer metadata call

* added comment with source of encodeBase64

* gate mkdn image paste behind experimental setting
2022-08-08 13:57:49 -07:00
Matt Bierner 0103536a60
Apply editor-font-family to all code in notebooks (#157554)
Apply editor-font-family to all `code` in notebook

Fixes #146696

This matches what we do in the markdown preview
2022-08-08 20:59:16 +02:00
Tyler James Leonhardt d8453c0440
Rev built-in versions of vscode-nls to 5.1.0 (#157530)
* rev version of vscode-nls to 5.1.0

* and yarn lock
2022-08-08 18:43:45 +02:00
Tyler James Leonhardt 49394cc44d
Enable translations for extension code for the web (#155355)
* Initial attempt

* alex feedback
2022-08-08 09:11:16 -07:00
Rob Lourens 8671778f8d
Fix notebook execution test failures (#157290)
* Fix notebook execution test failures
An error thrown in an event handler did not cause the test to fail, using DeferredPromise. Adjusting the api event to account for Unconfirmed vs Pending states. And accounting for onDidChangeNotebookDocument being fired multiple times during a test, causing the test to complete early while execution was still happening.
Fixes #157067

* Remove log
2022-08-05 11:07:20 -07:00
Benjamin Pasero 73fd3f1103
fix build (#157217)
* fix build

* fix compile

* flaky

* .
2022-08-05 09:16:20 +02:00
Matt Bierner 07e45c5a71
Fix package version (#157202)
Not sure why this was not caught by earlier builds
2022-08-04 21:40:06 -07:00
Matt Bierner b012216211
Fix markdown images having duplicate ids (#157177)
Fixes #153144
2022-08-05 06:31:42 +02:00