Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
111,740 Commits 3,672 Branches 359 Tags
cbdfe4e0b4e31575549496093617df08f011f370
Commit Graph

1801 Commits

Author SHA1 Message Date
Matt Bierner
5e92794be6 Re-enable running our eslint rules using ts-node (#159495) 
Resubmission of #157532 with the following changes:

- Use `eslint-plugin-local` instead of `yarn` link to run our plugins
- Move our plugins to a top level `.eslintplugin` dir (as required by `eslint-plugin-local`)
- Update all names to `local/`
 2022-08-30 08:40:04 +02:00
Matt Bierner
9e5248072a Fix ts-node for eslint (#159483) 
Bumps the cachesalt to make sure ts-node is installed
 2022-08-29 20:51:12 +02:00
Matt Bierner
5b21c7f28b Run our custom eslint rules using ts-node (#157532) 
* Run our custom eslint rules using ts-node

Use `ts-node` to run our custom eslint rules.  This lets us delete the pre-compiled js. It also means you can don't have to compile the rules while editing them

As part of this change, I've also switched us to using an eslint plugin instead of a rulesDir. This is now the preferred way to ship custom rules

* Fix two more disables

* Move ts-node to project root

* Enable transpileOnly
 2022-08-29 09:39:09 -07:00
Henning Dieterichs
7688a40249 Implements commands to recompute merge with git merge-file 2022-08-28 16:41:13 +02:00
Matt Bierner
b5a1bb34e9 Pick up latest TS for building VS Code (#158420) 2022-08-26 23:00:38 +02: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
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
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
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
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
Ladislau Szomoru
81e6a02c18 Git - Upgrade file-type package (#156411) 2022-08-09 11:30:49 -04:00
Ladislau Szomoru
fe946068ba Commit keyboard shortcut to honor the post commit command setting (#157617) 2022-08-09 11:14:56 +02:00
Ladislau Szomoru
d01945923c Git - Fix regression with Commit action button icon (#156417) 
Fix regression with Commit action button icon
 2022-07-27 13:11:07 +02:00
Ladislau Szomoru
e210bbfea4 Git - fix edge case during rebase (#156410) 
Fix blocking issue while resolving conflicts during rebase
 2022-07-27 12:03:47 +03:00
易良
fbdc848c29 fix: typos (#155310) 
* fix: typos

* chore: revert formatting changes

* fix: Remove redundant blank lines
 2022-07-25 15:41:30 -07:00
Johannes Rieken
bbbae594da show "Accept Merge" only for files currently under conflict. (#155822) 
While the merge editor shows users can handle merge conflicts outside of it, e.g on the console via `git add <FILE>`. The merge editor should have this graceful and step one is to hide the "Accept Merge" command when the file isn't conflicting anymore

* Adds a git-context key that contains all resource-uri-strings under conflict
* Enable/placement of the Accept Merge command is driven by that
* some merge editor context key sugar
 2022-07-21 13:25:23 +02:00
Ladislau Szomoru
ace330ba2c SCM - Fixed a regression due to which post-commit commands were not being executed (#155824) 
Fixed a regression due to which post-commit commands were not being executed
 2022-07-21 12:25:15 +02:00
Ladislau Szomoru
cd90b2b5ad Git - Add telemetry comments (#155811) 
Add telemetry comments
 2022-07-21 09:34:19 +02:00
Ladislau Szomoru
e0e7ad368e Git - Enable action button while rebasing (#155744) 
Enable action button while rebasing
 2022-07-20 23:35:05 -07:00
Ladislau Szomoru
f19251a4ca Git - Use GIT_EDITOR environment variable to suppress the git commit editor during rebase (#155748) 
Use GIT_EDITOR environment variable to suppress the git commit editor during rebase
 2022-07-20 17:52:56 +02:00
Ping
0b2c56eb7b Fix #114461 (#151824) 
suppress the editor during git rebase, fix #114461

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2022-07-20 15:03:43 +02:00
Johannes Rieken
ce5d92e998 use commit-icon for description, tweak codicon font-size (#155714) 
https://github.com/microsoft/vscode/issues/150863
 2022-07-20 13:49:24 +02:00
Johannes Rieken
7cdaa57928 also default to opening merge editor when conflict is about adding (#155711) 
fixes https://github.com/microsoft/vscode/issues/153737#issuecomment-1189357241
 2022-07-20 12:36:08 +02:00
Ladislau Szomoru
03c16c9c00 Git - The git.sync command should use the git.rebaseWhenSync setting (#155511) 
The git.sync command should use the git.rebaseWhenSync setting
 2022-07-18 18:38:58 +02:00
Ladislau Szomoru
b3218963c4 Git - Do not show SmartCommit dialog when using "Commit All" (#155486) 
Do not show SmartCommit dialog when using "Commit All"
 2022-07-18 16:55:41 +02:00
Johannes Rieken
8bada27fdd Merge pull request #155148 from microsoft/joh/double-barnacle 
joh/double barnacle
 2022-07-18 16:45:00 +02: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
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
Ladislau Szomoru
70a1ebd595 Git - Add events to IPostCommitCommandsProviderRegistry (#155051) 
* Add events to IPostCommitCommandsProviderRegistry

* Pull request feedback
 2022-07-14 10:46:57 +02: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
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
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
Ladislau Szomoru
c7c0acd2ce Git - Commit action button extension api (#154555) 2022-07-12 17:06:16 +02:00
Ladislau Szomoru
acd1db24f2 Git - fix edge case with Windows mapped drives (#154342) 
* Fix an edge case with computing relative path on Windows

* Refactor the fix
 2022-07-12 12:20:41 +02:00
Ladislau Szomoru
5d18f94bb0 Git - Maintain spaces in the arguments (#154685) 
Maintain spaces in the arguments
 2022-07-11 02:28:57 -07:00
Ladislau Szomoru
eb2e5d8558 Git - Commit action button should use smart commit settings (#154169) 
Consider smart commit settings when rendering the commit action button
 2022-07-07 21:31:10 +02:00
Ladislau Szomoru
57609a19da Git - Update commit button icon and tooltip based on branch protection (#154101) 
Update commit button icon and tooltip based on branch protection
 2022-07-04 20:18:16 +02:00
Ladislau Szomoru
32406a7157 Debt - Prevent icon translations (#154094) 
Prevent icon translations
 2022-07-04 14:37:52 +00:00
João Moreno
2fcd34a41b Fixes #148568 (#154008) 
fixes #148568
 2022-07-04 07:41:54 +02:00
Ladislau Szomoru
53c752ac8a Git - Disable commit button while merge is in progress (#153890) 
Disable commit button while merge is in progress
 2022-07-01 02:56:29 -07:00
Ladislau Szomoru
b18f9e0630 Git - Do not show Sync Changes and Publish Branch action button when commit is in progress (#153821) 
Do not show Sync Changes and Publish Branch action button when commit is in progress
 2022-06-30 07:27:42 -07:00
Ladislau Szomoru
1230b7c300 Git - "Commit & Push" command now publishes the branch if there is no tracking remote (#153749) 
"Commit & Push" command now publishes the branch if there is no tracking remote
 2022-06-30 02:12:31 -07:00
Ladislau Szomoru
8045df1b94 Git - Add commands to the editor title to accept/discard commit message (#153692) 
Add commands to the editor title to accept/discard commit message
 2022-06-29 14:00:09 +00:00
Johannes Rieken
7aec222831 joh/issue150862 (#153677) 
* execute `workbench.view.scm` to reval SCM view after accepting merge

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

* only reveal viewlet when stage/accept was done
 2022-06-29 12:20:49 +00:00
Johannes Rieken
bd24f72d42 fix 153492 (#153667) 
* enable "accept merge" for merge editor only
* close merge editor before staging file, only stage file when editor has been closed

fixes https://github.com/microsoft/vscode/issues/153492
 2022-06-29 14:08:09 +02:00