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

..

bat

…

clojure

…

coffeescript

…

configuration-editing

adopt snippets with profile change (#153079)

2022-06-24 10:10:22 +02:00

cpp

Pull in cpp grammar fixes (#152449)

2022-06-17 11:17:09 +00:00

csharp

…

css

…

css-language-features

html: observe insertFinalNewline (#152446)

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

dart

…

debug-auto-launch

joh/ts transpile (#152199)

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

debug-server-ready

…

diff

…

docker

…

emmet

Fix Emmet integration test warning, fixes #152827 (#152925)

2022-06-23 06:57:26 -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

fix 153492 (#153667)

2022-06-29 14:08:09 +02:00

git-base

add progress reporting for fetching repos (#153082)

2022-06-24 07:42:01 -07:00

github

Share link shows with untitled document (#153671)

2022-06-29 14:02:34 +02:00

github-authentication

Update extension telemetry modules (#153057)

2022-06-24 00:53:23 +00:00

go

…

groovy

…

grunt

…

gulp

…

handlebars

…

hlsl

…

html

…

html-language-features

html: observe insertFinalNewline (#152446)

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

image-preview

Update extension telemetry modules (#153057)

2022-06-24 00:53:23 +00:00

ini

…

ipynb

…

jake

…

java

…

javascript

…

json

json indent pattern: handle escape characters (#152475)

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

json-language-features

[json] use language indicator for folding limit warnings (#153104)

2022-06-24 15:01:02 +02:00

julia

…

latex

…

less

…

log

…

lua

…

make

…

markdown-basics

Add latex to markdown embedded languages (#151732)

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

markdown-language-features

Only compute diagnostics for opened md files (#153395)

2022-06-27 15:55:38 -07:00

markdown-math

…

merge-conflict

rename setting to git.mergeEditor, no more experimental

2022-06-27 12:54:55 +02:00

microsoft-authentication

Update extension telemetry modules (#153057)

2022-06-24 00:53:23 +00:00

notebook-renderers

Fix command encoding. Fixes #151364 (#152896)

2022-06-22 14:12:32 -07:00

npm

use const instead of literal (#151742)

2022-06-10 13:56:43 +00:00

objective-c

Update C grammar locations (#151733)

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

perl

…

php

…

php-language-features

…

powershell

…

pug

…

python

…

r

…

razor

…

references-view

joh/issue152834 (#153298)

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

restructuredtext

…

ruby

…

rust

…

scss

…

search-result

…

shaderlab

…

shellscript

…

simple-browser

Update extension telemetry modules (#153057)

2022-06-24 00:53:23 +00:00

sql

…

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 (#152157)

2022-06-15 16:13:17 +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

…

types

…

typescript-basics

…

typescript-language-features

[typescript-language-features] Add setting for autoImportFileExcludePatterns (#153160)

2022-06-28 16:43:24 -07:00

vb

…

vscode-api-tests

tests - skip all flaky webview tests (#153066) (#153067)

2022-06-23 22:51:58 -07:00

vscode-colorize-tests

Pull in cpp grammar fixes (#152449)

2022-06-17 11:17:09 +00:00

vscode-notebook-tests

Remove notebook editor decoration type (#151574)

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

vscode-test-resolver

…

xml

…

yaml

…

cgmanifest.json

…

package.json

…

postinstall.mjs

…

shared.webpack.config.js

…

tsconfig.base.json

…

yarn.lock

…