microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-11 05:30:03 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity
98,876 Commits 4,445 Branches 376 Tags
bbbae594da8035c790c7f62bb8a80fe588daaecd
Commit Graph

98876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Angelo
cef02dae8d Contribute to html language server with a custom language. (#146731) 
* Contribute to html language server with a custom language.

Fixes #146730

Signed-off-by: azerr <azerr@redhat.com>

* refactor out LanguageParticipants

* restart client on language selector change

* htmlLanguage -> htmlLanguageParticipants

* tune autoInsert wording

* tune autoInsert description

Co-authored-by: azerr <azerr@redhat.com>
Co-authored-by: Martin Aeschlimann <martinae@microsoft.com>
 2022-07-21 13:19:01 +02:00
Benjamin Pasero
6cad4b9494 skip test & 💄 (#155826) 2022-07-21 12:47: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
Matt Bierner
924dde5c1e Documenting markdown LS (#155789) 2022-07-21 11:48:30 +02:00
Alexandru Dima
e7bf4c6a75 Clarify that size is about the minimap's vertical size and remove rarely used scale (#155805) 
Fixes #154418: Clarify that size is about the minimap's vertical size and remove rarely used scale
 2022-07-21 11:47:25 +02:00
Benjamin Pasero
477af8c842 skip flaky test (#152145) (#155809) 2022-07-21 11:46:51 +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
SteVen Batten
62469028a6 make system context menu code more understandable (#155747) 
* removing unnecessary enablements
refs #155276

* add some comments

* address feedback, bring back enablements
but comment them
 2022-07-21 06:20:23 +02:00
Andrea Mah
9776b9d437 Add file decorations to search results (#155549) 
* added file decoration args to search
 2022-07-21 02:01:34 +02:00
Logan Ramos
eaeb3a74ab Ensure extensions are properly deregistered from walkthrough (#155770) 
Ensure extensions are properly deregistered
 2022-07-20 16:02:25 -07:00
Justin Chen
3f454e9211 Merge pull request #155666 from justschen/justin/CodeActionMenu-Widget 
Drop in CodeAction Menu w/List Widget #152913
 2022-07-20 15:37:04 -07:00
Ladislau Szomoru
85e47d315f Action button - remove button borders that are adjacent to the separator. (#155779) 2022-07-20 15:29:40 -07:00
SteVen Batten
1998b33403 consistent verb for show menu bar in titlebar context (#155784) 2022-07-20 15:26:26 -07:00
Justin Chen
565b23b88c Merge branch 'main' into justin/CodeActionMenu-Widget 2022-07-20 15:22:00 -07:00
Raymond Zhao
d745b88c2d Add Settings indicator for application-scoped settings (#155212) 2022-07-20 15:01:07 -07:00
Justin Chen
892b716803 removed disposables unused, still shadowroot issue 2022-07-20 13:52:49 -07:00
Justin Chen
a05b8cd098 Merge pull request #2 from microsoft/main 
context view fix
 2022-07-20 13:32:06 -07:00
Justin Chen
d7ff038767 fix on mutable disposables and context view 2022-07-20 13:31:22 -07:00
David Dossett
82c6c5547f Show only one active focused tab across editor groups in hc themes (Fix #145563) (#155776) 
* Show only one active & focused tab across editor groups in hc themes

* Use dotted line for active, dashed for hover
 2022-07-20 15:49:01 -04:00
SteVen Batten
b419fdfe3f allow changes in shadow root for same context view container (#155771) 2022-07-20 20:52:29 +02:00
Tyler James Leonhardt
4d215cb441 comment telemetry events (#155758) 2022-07-20 18:55:57 +02:00
Alex Ross
3d12b57d82 Fix tree error from telemetry (#155719) 
Fixes #155496
 2022-07-20 18:51:39 +02:00
Joyce Er
e88e580556 Bump distro (#155754) 2022-07-20 18:18:18 +02:00
Alex Ross
09259abf3c Comments panel: css issue causing the position of "Ln" to be shifted (#155751) 
Fixes #155198
 2022-07-20 18:08:54 +02:00
Justin Chen
7d352660c2 code clean up and addressing comments 2022-07-20 09:06:19 -07:00
Justin Chen
843fd7ff9b fix on some theming, added experimental setting 2022-07-20 09:06:18 -07:00
Benjamin Pasero
1c1c0d5062 sandbox - deprecate process.pid (#155750) 2022-07-20 17:57:48 +02:00
Johannes Rieken
6ec95c9cb4 add menus for input1 and input2, render toolbar for them respectively (#155749) 
fixes https://github.com/microsoft/vscode/issues/153489
 2022-07-20 17:55:46 +02: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
Daniel Imms
316cf3e57e Merge pull request #155741 from microsoft/tyriar/155648 
Simplify bash PROMPT_COMMAND handling
 2022-07-20 08:00:32 -07:00
Daniel Imms
dfc99af92a Simplify bash PROMPT_COMMAND handling 
This change attempts to evaluate PROMPT_COMMAND in the same way that
bash would, adding support or many more cases and removing the check
that disables unsupported PROMPT_COMMANDS.

Fixes #155221
Fixes #146197
 2022-07-20 07:38:47 -07:00
João Moreno
0cf530cd3c AsyncDataTree: calling getChildren on collapsed element should not trigger getChildren (#155729) 
fixes #121567
 2022-07-20 16:33:38 +02:00
Alexandru Dima
fbb7f4188e Don't poll for parent process existance in the sandboxed case (#155737) 
Fixes #154235: `process.pid` is always `1` on a sandboxed renderer, so avoid polling for the renderer process still running from the extension host, since the extension host is a `UtilityProcess` anyways, with a lifecycle managed by Electron.
 2022-07-20 16:19:58 +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
Rob Lourens
60f09d6f7d Adopt argsCanBeInterpretedByShell from DAP (#155663) 
For #149910
 2022-07-20 15:02:48 +02:00
Logan Ramos
5465f25538 Update new file to create a new file (#155544) 
* Update new file to create a new file

* Address PR feedback
 2022-07-20 14:57:42 +02:00
Martin Aeschlimann
d0769c7e7f [html] update service and fix url resolving (#155725) 2022-07-20 14:38:10 +02:00
Johannes Rieken
fa155a39b7 add more GDPR comments, https://github.com/microsoft/vscode-internalbacklog/issues/2762 (#155724) 2022-07-20 14:32:09 +02:00
Daniel Imms
40ca7ae5ba Merge pull request #155606 from microsoft/tyriar/tasks_args 
Don't fill in tasks type/labels
 2022-07-20 05:30:34 -07:00
Martin Aeschlimann
28be5d9906 Configurations ${WorkSpace} autocomplete broken after update (#155713) 
Configurations ${WorkSpace} autocomplete broken after update. Fixes #155638
 2022-07-20 08:01:52 -04: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
7a1f7101db Merge pull request #155701 from microsoft/joh/realistic-duck 
joh/realistic duck
 2022-07-20 13:48:53 +02:00
Alexandru Dima
9794671356 Parse markers regular expressions like other regular expressions from the language configuration file (#155688) 
Fixes #154766: Parse markers regular expressions like other regular expressions from the language configuration file
 2022-07-20 13:12:05 +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
Alexandru Dima
c79556aed3 Also use the first line which has a begin state when tokenizing the viewport (#155698) 2022-07-20 12:04:01 +02:00
dependabot[bot]
abf921bd9c Bump terser from 4.8.0 to 4.8.1 (#155680) 
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-07-20 11:38:23 +02:00
Alexandru Dima
2936058b31 Fixes #154755 (#155706) 2022-07-20 11:36:33 +02:00
Benjamin Pasero
a237707f58 editors - limit length of error message (#155337) (#155705) 2022-07-20 11:35:59 +02:00