Peng Lyu 146115b78c Merge pull request #74231 from microsoft/rebornix/bettermerge ...

Show context for diff view of merge conflict and introduce compareAll.

2019-05-24 16:55:04 -07:00

..

bat

…

clojure

Update grammars

2019-05-16 10:17:43 -07:00

coffeescript

…

configuration-editing

Machine specific settings in devcontainer.json (fixes microsoft/vscode-remote-release#409)

2019-05-22 17:22:17 +02:00

cpp

Allow multi-line comment auto-closing for C++ files

2019-05-21 03:35:13 -07:00

csharp

Fix colorization tests for c languages

2019-04-11 11:25:34 +02:00

css

Update grammars

2019-04-05 12:51:44 +00:00

css-language-features

Update css dependencies for #71715 and #71791

2019-04-08 14:55:28 -07:00

debug-auto-launch

…

debug-server-ready

address translation issue; fixes #72065

2019-05-24 10:41:41 +02:00

docker

…

emmet

…

extension-editing

…

fsharp

Update grammars

2019-05-16 10:17:43 -07:00

git

Merge pull request #73890 from markspanbroek/master

2019-05-24 15:18:05 +02:00

go

…

groovy

…

grunt

…

gulp

…

handlebars

Update grammars

2019-05-16 10:17:43 -07:00

hlsl

…

html

…

html-language-features

Path completion for <area href=""> and <input src="">. Fix #74129

2019-05-22 09:25:28 -07:00

ini

Don't register "ini" for all files named "config"

2019-03-31 01:12:15 +00:00

jake

…

java

Update grammars

2019-05-16 10:17:43 -07:00

javascript

Update js/ts grammar

2019-05-10 15:43:38 -07:00

json

…

json-language-features

clean up the readme (#74293)

2019-05-24 10:04:01 -07:00

less

…

log

double log language, only one works. Fixes #72192

2019-04-12 10:08:36 +02:00

lua

…

make

Makefile test case about the bug fix with "@,-,+" colorizing in the recipe (#72265)

2019-04-16 11:41:37 +02:00

markdown-basics

…

markdown-language-features

Add DocumentLink.tooltip api proposal

2019-05-23 17:57:04 -07:00

merge-conflict

Open the diff view in current editor, to the side or below.

2019-05-24 15:26:50 -07:00

npm

…

objective-c

Update grammars

2019-05-16 10:17:43 -07:00

perl

…

php

Fix #71138

2019-03-27 15:43:49 -07:00

php-language-features

Refresh PHP documentation.

2019-04-12 14:16:06 -07:00

powershell

Update grammars

2019-05-16 10:17:43 -07:00

pug

Update pug test fixtures

2019-05-24 14:09:55 -07:00

python

Update grammars

2019-04-05 12:51:44 +00:00

r

…

razor

…

ruby

…

rust

…

scss

…

shaderlab

…

shellscript

Add 'qsh' as a valid shellscript firstline

2019-04-26 13:45:36 +01:00

sql

…

swift

…

theme-abyss

adopt remote color names

2019-04-30 09:14:47 +02:00

theme-defaults

Update remote background defaults

2019-05-03 20:11:20 -07:00

theme-kimbie-dark

adopt remote color names

2019-04-30 09:14:47 +02:00

theme-monokai

adopt remote color names

2019-04-30 09:14:47 +02:00

theme-monokai-dimmed

adopt remote color names

2019-04-30 09:14:47 +02:00

theme-quietlight

adopt remote color names

2019-04-30 09:14:47 +02:00

theme-red

adopt remote color names

2019-04-30 09:14:47 +02:00

theme-seti

Use strict equality in darkenColor()

2019-04-12 23:33:08 +10:00

theme-solarized-dark

adopt remote color names

2019-04-30 09:14:47 +02:00

theme-solarized-light

adopt remote color names

2019-04-30 09:14:47 +02:00

theme-tomorrow-night-blue

adopt remote color names

2019-04-30 09:14:47 +02:00

typescript-basics

Update js/ts grammar

2019-05-10 15:43:38 -07:00

typescript-language-features

Make sure we don't de-prioritize this. member suggestions

2019-05-23 16:06:34 -07:00

vb

…

vscode-api-tests

Add some runInBackground terminal tests

2019-05-23 12:38:25 -07:00

vscode-colorize-tests

Use vscode.d.ts we ship instead of version from vscode package

2019-05-16 10:38:29 -07:00

vscode-test-resolver

Add vscode-test-resolver

2019-05-22 16:41:26 +02:00

xml

…

yaml

…

cgmanifest.json

…

package.json

Pick up new TS version

2019-05-22 15:25:48 -07:00

postinstall.js

…

shared.tsconfig.json

…

shared.webpack.config.js

…

yarn.lock

Pick up new TS version

2019-05-22 15:25:48 -07:00