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

..

bat

…

clojure

…

coffeescript

…

configuration-editing

Configurations ${WorkSpace} autocomplete broken after update (#155713)

2022-07-20 08:01:52 -04:00

cpp

Update grammars (#154099)

2022-07-05 09:53:51 +02:00

csharp

…

css

Update css grammar (#150724)

2022-05-30 17:42:17 +02:00

css-language-features

html: observe insertFinalNewline (#152446)

2022-06-17 12:38:36 +02:00

dart

Update grammars

2022-05-02 11:20:10 +02:00

debug-auto-launch

joh/ts transpile (#152199)

2022-06-15 16:52:48 +02:00

debug-server-ready

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

diff

…

docker

…

emmet

Emmet: Add back trigger character arguments (#154940)

2022-07-12 09:15:01 -07:00

extension-editing

json: use default word pattern (#151754)

2022-06-13 14:36:42 +02:00

fsharp

Update fsharp grammar (#152048)

2022-06-14 14:41:04 +02:00

git

show "Accept Merge" only for files currently under conflict. (#155822)

2022-07-21 13:25:23 +02:00

git-base

Debt - Prevent icon translations (#154094)

2022-07-04 14:37:52 +00:00

github

Add ability to continue desktop edit session in vscode.dev

2022-07-15 15:51:51 -07:00

github-authentication

Switch extensions to 1DS (#154299)

2022-07-06 17:18:41 -07:00

go

…

groovy

…

grunt

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

gulp

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

handlebars

Contribute to html language server with a custom language. (#146731)

2022-07-21 13:19:01 +02:00

hlsl

…

html

…

html-language-features

Contribute to html language server with a custom language. (#146731)

2022-07-21 13:19:01 +02:00

image-preview

Switch extensions to 1DS (#154299)

2022-07-06 17:18:41 -07:00

ini

Add syntax highlighting for .env files without extensions (#155298)

2022-07-15 12:24:40 +00:00

ipynb

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

jake

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

java

…

javascript

Update grammars (#151383)

2022-06-07 09:37:14 -07:00

json

json indent pattern: handle escape characters (#152475)

2022-06-17 14:31:03 +00:00

json-language-features

Adding keepLines feature to the settings (#154790)

2022-07-12 09:59:33 +02:00

julia

…

latex

Update grammars (#154099)

2022-07-05 09:53:51 +02:00

less

…

log

Update grammars (#154099)

2022-07-05 09:53:51 +02:00

lua

…

make

Update make grammar (#154789)

2022-07-11 12:14:40 +02:00

markdown-basics

Add latex to markdown embedded languages (#151732)

2022-06-15 00:01:37 +00:00

markdown-language-features

Documenting markdown LS (#155789)

2022-07-21 11:48:30 +02:00

markdown-math

Switch extensions to 1DS (#154299)

2022-07-06 17:18:41 -07:00

merge-conflict

Switch extensions to 1DS (#154299)

2022-07-06 17:18:41 -07:00

microsoft-authentication

Switch extensions to 1DS (#154299)

2022-07-06 17:18:41 -07:00

notebook-renderers

Clean up HtmlRenderingHook (#154961)

2022-07-12 11:27:47 -07:00

npm

npm: remove icon from localization

2022-07-06 10:57:16 -07:00

objective-c

Update C grammar locations (#151733)

2022-06-10 13:55:11 +00:00

perl

…

php

Bump php grammar, fix #142824, fix #116103 (#150067)

2022-05-21 00:18:25 +00:00

php-language-features

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

powershell

…

pug

…

python

…

r

…

razor

…

references-view

joh/issue152834 (#153298)

2022-06-27 15:26:49 +02:00

restructuredtext

…

ruby

…

rust

…

scss

Add onEnterRule for SassDoc documentation (fix #150598) (#150599)

2022-05-30 15:43:12 +02:00

search-result

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

shaderlab

…

shellscript

…

simple-browser

Switch extensions to 1DS (#154299)

2022-07-06 17:18:41 -07:00

sql

Update grammars (#154099)

2022-07-05 09:53:51 +02:00

swift

…

theme-abyss

…

theme-defaults

Add listActiveSelectionFocus color token (#152260)

2022-06-22 12:24:49 -07:00

theme-kimbie-dark

…

theme-monokai

…

theme-monokai-dimmed

…

theme-quietlight

…

theme-red

…

theme-seti

Update seti for the gitcommit language (#153711)

2022-06-29 21:40:21 +02:00

theme-solarized-dark

…

theme-solarized-light

Fix terminal selection contrast in solarized light

2022-06-23 06:05:06 -07:00

theme-tomorrow-night-blue

fix jsx text foreground in tomorrow-night theme (#151478)

2022-06-08 14:15:32 +02:00

types

…

typescript-basics

Add support for angle bracket matching and colorization in Typescript

2022-06-29 01:59:31 +08:00

typescript-language-features

Switch extensions to 1DS (#154299)

2022-07-06 17:18:41 -07:00

vb

…

vscode-api-tests

skip test & 💄 (#155826)

2022-07-21 12:47:23 +02:00

vscode-colorize-tests

Add Makefile tests for upgraded grammar: comma, comment, shebang (#154625)

2022-07-12 13:11:36 +02:00

vscode-notebook-tests

Remove notebook editor decoration type (#151574)

2022-06-13 13:51:10 -07:00

vscode-test-resolver

auto-fixed prefer-const violation

2022-06-08 17:49:21 +02:00

xml

fix word range in XML. For #149318

2022-05-13 10:22:33 +02:00

yaml

…

cgmanifest.json

…

package.json

Pick up TS 4.7.3 (#151246)

2022-06-03 20:08:35 +00:00

postinstall.mjs

…

shared.webpack.config.js

Disable chunking to prevent importScripts calls in web (#155226)

2022-07-14 18:55:38 +00:00

tsconfig.base.json

…

yarn.lock

Pick up TS 4.7.3 (#151246)

2022-06-03 20:08:35 +00:00