development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-04 02:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
122588 commits 1118 branches 297 tags 1.3 GiB
Commit graph

2390 commits

Author SHA1 Message Date
Ladislau Szomoru 68ca9a7f4c
SCM - improve merge-base detection (#216823) 2024-06-21 17:53:13 +02:00
Ladislau Szomoru eb4092a6de
Git - more cleanup of the history item labels (#216648) 
* Git - 💄 history provider cleanup

* Git - more cleanup of the history item labels
 2024-06-20 01:23:05 +02:00
Ladislau Szomoru f280d9980f
Git - 💄 history provider cleanup (#216647) 2024-06-19 16:01:02 -07:00
Ladislau Szomoru 856fba0b67
SCM - more work related to history (#216641) 
* Rename base to remote

* introduce base

* Remove resolveHistoryItemGroupBase

* 💄

* More 💄

* Remove file that is out of scope
 2024-06-19 22:05:10 +02:00
Ladislau Szomoru 484cd68eff
SCM - history view (#216629) 
* Hacked up the starting point

* More progress

* More progress

* Simplified algo, basic support for colors

* Add the concept of secondary colors for merge commits

* Further optimizations of the algo

* Bug fixes to clean-up algo

* Add support for curved branches

* Keep track of nodes that are moved so that the second parent for the merge commit is rendered in the correct swimlane

* Account for offset when drawing a base commit

* Algo rework completed

* Revert some of the hacks that were put in place to quickly get going

* Add caching to the history items used in the graph
Remove more hacks that were in place

* Added initial tests

* More work so that incoming/outgoing works along history

* Uncomment more code

* Bug fixes to edge cases

* Experiment with a new rendering for curved branches

* Handle repository with a single commit

* Maintain swimlanes

* Fix condition

* Saving my changes

* More polish and clean-up

* Remove code that is not needed

* Revert change

* Revert more changes

* More fixes

* Rename interface

* One last minor change

* Pull request feedback

* More refactoring

* More pull request feedback

* Fix layering issues
 2024-06-19 19:45:06 +02:00
Ladislau Szomoru a8e00a00dd
Git - expose untracked changes group (#216414) 2024-06-18 10:59:53 +02:00
Ladislau Szomoru 5422f5f940
Git - do not show smart commit dialog when using Commit (Amend) (#214595) 2024-06-07 15:51:20 +02:00
Ladislau Szomoru 3d7e352d2d
Git - empty commit should not include unstaged changes (#214587) 2024-06-07 14:08:33 +02:00
yutotnh 3ab7948e14
Add the ability to specify a list of candidate encodings when guessing encoding (#36951) (#208550) 
* Allow to configure a list of encodings to use when guessing #36951

* Bump up the jschardet version into 3.1.2 #36951

* missing merge

* some polish

* renames

* some polish

* some polish

* cleanup

---------

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
 2024-06-05 10:23:20 +00:00
Benjamin Pasero 9b17067697
debt - 🆙 jschardet@3.1.2 (#214136) 2024-06-03 06:22:13 -07:00
Ladislau Szomoru cf3e34fc2f
Git - add error handling for traversing workspace folders during repository discovery (#213975) 2024-05-31 11:24:12 +02:00
Connor Peet 6629c4e0a9
git: allow querying whether files are gitignore (#212982) 
* git: allow querying whether files are gitignore

This exposes `checkIgnore`, which I want to use in copilot to determine
which files I should go into when checking references.

* rename method
 2024-05-23 21:28:04 +02:00
Robo 5216c04428
chore: update to electron 29 (#209818) 
* chore: update electron@29.1.0

* chore: update typings to 20.x

* chore: bump electron@29.1.5

* ci: fix crash in compiling extensions-ci

* chore: disable .d.ts check for build/

$ ../node_modules/.bin/tsc -p tsconfig.build.json
node_modules/@types/chokidar/index.d.ts:21:14 - error TS2420: Class 'import("/Users/demohan/github/vscode/build/node_modules/@types/chokidar/index").FSWatcher' incorrectly implements interface 'import("fs").FSWatcher'.
  Type 'FSWatcher' is missing the following properties from type 'FSWatcher': ref, unref

21 export class FSWatcher extends EventEmitter implements fs.FSWatcher {
                ~~~~~~~~~

node_modules/chokidar/types/index.d.ts:8:14 - error TS2420: Class 'import("/Users/demohan/github/vscode/build/node_modules/chokidar/types/index").FSWatcher' incorrectly implements interface 'import("fs").FSWatcher'.
  Type 'FSWatcher' is missing the following properties from type 'FSWatcher': ref, unref

8 export class FSWatcher extends EventEmitter implements fs.FSWatcher {
               ~~~~~~~~~

Found 2 errors in 2 files.

Errors  Files
     1  node_modules/@types/chokidar/index.d.ts:21
     1  node_modules/chokidar/types/index.d.ts:8

Refs a0f9e09f64

* chore: update core types

* temp: fix layer validation

* chore: update nodejs checksums

* ci: use latest v20 LTS for missing node-gyp

Refs eacec5f490

* ci: define LIBCPP_HARDENING_MODE

* ci: fix crash in vscode-web-min-ci

* chore: update rpm deps-list

* chore: bump tree-sitter-typescript@0.20.5

* chore: bump electron@29.3.0

* chore: bump electron@29.3.1

* chore: update rpm deps-list for x86_64

* ci: disable io_uring UV backend on linux

* ci: disable io_uring backend for oss as well

* chore: update typings to 20.x

* ci: add TODO for io_uring workaround

* chore: bump distro

* chore: update preinstall node version checks

* chore: update @types/gulp

Refs https://github.com/microsoft/vscode/issues/212442

* ci: disable io_uring in more test suites
 2024-05-11 01:20:28 +09:00
Ladislau Szomoru b4b87ffac4
Git - show notification when there are no staged changes/changes/untracked changes (#211170) 2024-04-23 21:21:02 +02:00
Ladislau Szomoru 0991b0053f
Git - fix view untracked changes command visibility (#211167) 2024-04-23 21:09:25 +02:00
Pig Fang a7d0bc8982
Auto close Git multi-diff editor when all files staged or comitted (#210327) 
* auto close multi-diff editor when all files staged or comitted

* remove unused vars
 2024-04-17 11:16:33 +00:00
Ladislau Szomoru f9554073cc
Git - add dedicated commands to view changes (#209942) 2024-04-09 14:33:13 +02:00
Alex Ross a1815b994a
Fix git merge editor for renames (#209542) 2024-04-08 23:34:48 +02:00
Ladislau Szomoru 45b5423f72
Git - only add --ignore-case if it is a supported flag (#209819) 2024-04-08 12:47:18 +02:00
Ladislau Szomoru 8d1ecd7b94
SCM - 💄 API cleanup (#209339) 
* SCM - 💄 API cleanup

* Fix compilation
 2024-04-02 14:51:36 +02:00
Ladislau Szomoru a7f384badb
Git - remove deprecated extension API (#209010) 2024-03-28 05:25:40 -07:00
Ladislau Szomoru 4a6ebe0ee5
Git - fix #208562 (#208761) 2024-03-26 12:32:02 +01:00
Ladislau Szomoru 8d02db45e9
GitProtocolHandler - update supported schemes based on the platform (#208730) 2024-03-25 15:55:49 -07:00
Ladislau Szomoru 85eea4a9b2
Git - emit change event as soon as file is staged (#208376) 2024-03-22 08:53:04 +01:00
Henning Dieterichs 2a14ad4b71 Fixes diff editor gutter menu focus problems 2024-03-21 15:40:37 +01:00
Ladislau Szomoru d3877fb1dd
Git - improve performance for "Stage Block" command (#208181) 2024-03-20 12:00:03 +01:00
Henning Dieterichs b7d35c8bdd Implements #206808 2024-03-15 17:08:36 +01:00
Ladislau Szomoru 967170aa0a
Git - add the capability to filter git log based on the author (#207169) 2024-03-08 16:41:40 +01:00
Ladislau Szomoru 052fbcb851
Git - re-enable incoming files decoration (#206815) 2024-03-04 18:11:32 +01:00
Henning Dieterichs 12997e68fd
Fixes #196084 (#206100) 2024-02-23 10:14:21 -07:00
Ladislau Szomoru 414f2cd189
Git - fix reopen closed repositories action visibility issue (#205851) 2024-02-21 12:20:59 +01:00
Ladislau Szomoru 8895f460c6
Git - better handle edge case when hard wrapping a line (#205831) 2024-02-21 10:26:15 +01:00
Ladislau Szomoru 94ad9a4199
Git - rename code action (#205712) 2024-02-20 17:45:25 +01:00
Ladislau Szomoru 5bc6776982
Gix - recompute diagnostics when settings change (#205711) 2024-02-20 17:41:42 +01:00
Ladislau Szomoru 232e9a2bef
Git - comment out GitIncomingChangesFileDecorationProvider (#205583) 2024-02-19 21:25:13 +01:00
Ladislau Szomoru 9b0d74345c
Git - remove git.experimental.inputValidation setting (#205550) 
* Git - remove git.experimental.inputValidation setting

* Fix compilation error

* Fix migration code
 2024-02-19 10:45:24 -08:00
Ladislau Szomoru 9aa943b890
Git - toggle diagnostics when git.experimental.inputValidation setting changes (#205355) 2024-02-16 15:06:36 +01:00
Ladislau Szomoru ae7a786d1b
Git - do not invoke post commit commands when calling commit through the git extension api (#205364) 2024-02-16 14:32:31 +01:00
Ladislau Szomoru e713ba0fb9
Git - Add context menu to history items (#205359) 2024-02-16 12:48:08 +01:00
Ladislau Szomoru 0f8cab37f1
Git - add "Hard wrap all lines" code action is there are multiple long lines (#205349) 
* Git - add "Hard wrap all lines" code action is there are multiple long lines

* 💄 Moved code around
 2024-02-16 10:58:44 +01:00
Ladislau Szomoru 4f9a706c79
Git - add command to close all unmodified editors (#205278) 
* Git - add command to close all unmodified tabs

* Fix compilation error
 2024-02-15 14:33:02 +01:00
Ladislau Szomoru f396fe0e2b
Git - refresh decorators when incoming/outgoing changes (#205282) 2024-02-15 14:26:25 +01:00
Ladislau Szomoru 9576c1a7c5
Git - Add button/setting to always replace local tags in case of a conflict during the pull operation (#205148) 2024-02-13 22:04:29 +01:00
Ladislau Szomoru 4194cbfdf8
Git - 💄 more history provider logging (#205101) 
* Git - 💄 more history provider logging

* Fix up more logging
 2024-02-13 14:56:22 +01:00
Ladislau Szomoru 45e2e2072f
Git - fix upstream state management check (#205078) 2024-02-13 11:53:50 +01:00
Ladislau Szomoru 2f6b7e163c
Git - Update showProgress value in DiffOperation (#205012) 2024-02-12 17:40:02 +01:00
Ladislau Szomoru c19383a66d
Git - add file decoration provider for incoming changes (#204919) 
* Initial implementation of a file decoration provider and quick diff provider

* Refactor file decoration provider

* Add incomingChanges to history provider

* Move decoration provider

* Move things around

* Add separate color for renamed incoming change

* Remove include that is not needed
 2024-02-11 07:39:43 +01:00
Ladislau Szomoru c9215c87ba
Git - fix commit action button when detached/rebase (#204857) 2024-02-09 21:02:24 +01:00
Ladislau Szomoru 20c0f83f1b
Git - experimental input validation using diagnostics (#204822) 
* Initial implementation

* Add setting + code actions
 2024-02-09 14:19:30 +01:00
Ladislau Szomoru d25c50303e
Git - Add more telemetry to history provider to investigate issue (#204689) 2024-02-08 09:02:47 +01:00