Commit graph

7101 commits

Author SHA1 Message Date
Matt Bierner
c69c1719bb Add enumDescriptions for merge-conflict.diffViewPosition
Fixes #74500
2019-05-28 14:54:29 -07:00
Matt Bierner
0f19fa2d60 Update to latest TS@next 2019-05-28 14:54:02 -07:00
Alex Ross
5af4d57908 Use old c++ grammar for objective c++
There is a conflict with the new grammar.

Fixes #74219
2019-05-28 11:22:38 +02:00
Alex Ross
a1a7af52a7 In gulp tasks use task args so that gulp path can be escaped
Fixes #71154
2019-05-27 16:47:38 +02:00
Joao Moreno
ddc397dac2 Merge remote-tracking branch 'origin/master' 2019-05-27 15:40:40 +02:00
Joao Moreno
f454c2c402 💄 2019-05-27 15:40:23 +02:00
Martin Aeschlimann
235262c05c
Merge pull request #69899 from c0m3tx/region-fold-golang
Add region markers folding for Go
2019-05-27 15:32:21 +02:00
Martin Aeschlimann
88fc7e755e Make conistent with other languages 2019-05-27 15:25:10 +02:00
Joao Moreno
5540e01820 Merge commit 'refs/pull/61149/head' of github.com:Microsoft/vscode into pr/61149 2019-05-27 15:20:08 +02:00
Martin Aeschlimann
afb0837035 Update Snakemake files types to include Snakefile to provide syntax detection. Fixes #73737 2019-05-27 12:40:04 +02:00
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
Peng Lyu
c3fe962b89 Open the diff view in current editor, to the side or below. 2019-05-24 15:26:50 -07:00
Peng Lyu
93944674c9 Open the new editor group below 2019-05-24 14:55:26 -07:00
Peng Lyu
9cd81dcb5b Always compare change with context. 2019-05-24 14:43:44 -07:00
Matt Bierner
6b081a9f00 Update pug test fixtures 2019-05-24 14:09:55 -07:00
Peng Lyu
bbeeefd713 Merge branch 'master' into rebornix/bettermerge 2019-05-24 11:29:41 -07:00
Peng Lyu
b917a0341d Support open diff in new editor group 2019-05-24 11:29:30 -07:00
Chris Dias
c24694c892
clean up the readme (#74293)
* Tidy up the readme, update graphic
2019-05-24 10:04:01 -07:00
Daniel Imms
28d06f0288
Merge pull request #74228 from microsoft/tyriar/72518_runInBackground
Add runInBackground option to Terminal API
2019-05-24 06:46:37 -07:00
Johannes Rieken
4976cffba7
Merge pull request #73890 from markspanbroek/master
Support negated .gitignore rules.
2019-05-24 15:18:05 +02:00
Daniel Imms
93f93d0961 Merge remote-tracking branch 'origin/master' into tyriar/72518_runInBackground 2019-05-24 06:16:37 -07:00
Andre Weinand
e480cea725 address translation issue; fixes #72065 2019-05-24 10:41:41 +02:00
Matt Bierner
f3b8d15b0d Add DocumentLink.tooltip api proposal
For #72824
2019-05-23 17:57:04 -07:00
Matt Bierner
a9e31b19d7 Make sure we don't de-prioritize this. member suggestions
Fixes #74164
2019-05-23 16:06:34 -07:00
Matt Bierner
a4532de9af Make sure we reset editors being iterations of test 2019-05-23 16:06:34 -07:00
Peng Lyu
fa69b4e7d6 Show context for diff view of merge conflict and introduce compareAll. 2019-05-23 14:19:09 -07:00
Daniel Imms
1f6bf9b92c Add some runInBackground terminal tests 2019-05-23 12:38:25 -07:00
Hao Hu
2058f27615 Add git.pullTags setting 2019-05-23 11:28:28 +02:00
Matt Bierner
c2b02df9ab Allow hidden (but persisted) webviews to recieve messages
Fixes #47534
2019-05-22 15:25:48 -07:00
Matt Bierner
71deb5b6ee Extend disposable 2019-05-22 15:25:48 -07:00
Matt Bierner
519eb3690c Extract duplicated escaping code 2019-05-22 15:25:48 -07:00
Matt Bierner
150b3d98a3 Pick up new TS version 2019-05-22 15:25:48 -07:00
Matt Bierner
1db653c59e Simplify setting of preselect and sort text 2019-05-22 15:25:48 -07:00
Matt Bierner
f250d19bb5 Use relative size for markdown code font size
Fixes #74125
2019-05-22 10:53:49 -07:00
Pine Wu
27819b3902 Path completion for <area href=""> and <input src="">. Fix #74129 2019-05-22 09:25:28 -07:00
Christof Marti
8076181795 Machine specific settings in devcontainer.json (fixes microsoft/vscode-remote-release#409) 2019-05-22 17:22:17 +02:00
Daniel Imms
573db67461
Merge pull request #74076 from hwhung0111/Fix-couple-typos
Fix couple typos
2019-05-22 07:44:07 -07:00
Martin Aeschlimann
90cfe12a63 Add vscode-test-resolver 2019-05-22 16:41:26 +02:00
Christof Marti
a7c7bdd32a Add workspaceMount option (fixes microsoft/vscode-remote-release#41) 2019-05-22 09:41:43 +00:00
Christof Marti
80ec2bf29b Add workspaceFolder for single container (fixes microsoft/vscode-remote-release#101) 2019-05-22 11:05:40 +02:00
Howard Hung
0ddd999172 Fix typo: showSecutitySelectorForResource -> showSecuritySelectorForResource 2019-05-22 01:25:59 +08:00
Howard Hung
4582ec149c Fix typo: assigments -> assignments 2019-05-22 01:23:12 +08:00
Alex Ross
5a97b520c9 Add devContainer schema+validation 2019-05-21 14:21:42 +02:00
Khaja Nizamuddin
36e7f1871a Normalize tsconfig path (#73001)
Fixes #68812
2019-05-21 04:01:54 -07:00
Dan McCarthy
728c6a68ba Allow multi-line comment auto-closing for C++ files
Fixes #72801
2019-05-21 03:35:13 -07:00
Alex Ross
b8b79709b7 Update C++ grammar to fix freeze 2019-05-21 11:19:36 +02:00
Matt Bierner
ada4bddb8e Change documentation for TS importModuleSpecifier.auto
Fixes #52485

Based on code in d53efdf380/src/compiler/moduleSpecifiers.ts (L139)
2019-05-17 18:14:40 -07:00
Matt Bierner
b1aad4b755 Supress potential null errors related to updated @types/node 2019-05-17 16:14:49 -07:00
Matt Bierner
12cf3eb0f8 Pick up latest TS@next 2019-05-17 13:39:55 -07:00
Logan Ramos
ca9887459b
Delete vscode-typescript upon close of VS Code (#73801)
* Cleans up vs-typescript temp directoy upon VS code close

* Fixed typing errors preventing build from succeeding

* Moved deletion to the deactivate method. Added folders per extension host

* Removed yarn watch script used in testing
2019-05-17 18:55:31 +00:00