Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 5ab0e684a752808473667caad6d8ce3a91ec3063
Merge: 5d4d823d81 29179eaa23
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:12 2019 -0800

    Merge commit '29179eaa23c9c93aede2da1c03e69f9ccf59b4e1' into merged-base

commit 5d4d823d81132dd41fd2ff098e9122efab19e1c1
Merge: eefc70f8e2 1881db074b
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:11 2019 -0800

    Merge commit '1881db074b7a6bacc7c2354db34fbc1de1ad8970' into merged-base

commit eefc70f8e200f8326222c8a74429ef1fc1d631c1
Merge: 89ffafa90a cc8b25b5ad
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:11 2019 -0800

    Merge commit 'cc8b25b5ada64b976b0573d959b4c347aef86b1b' into merged-base

commit 89ffafa90ad0af5b19424c7a2e1d7bcd47a935ca
Merge: d1c2fda25a 2b8d7248b8
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:10 2019 -0800

    Merge commit '2b8d7248b8165f33395e42fe02a186437b9412c2' into merged-base

commit d1c2fda25abaee038e0193ea7c4b35947139aa6d
Merge: 8c6e2522d5 066ee8c2d7
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:09 2019 -0800

    Merge commit '066ee8c2d7587f7f9596f4c06f433c2e1f089a07' into merged-base

commit 8c6e2522d5174624a118ee8d4c854b9f2a25b8d4
Merge: 58b8b37ae8 de57829fc3
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:09 2019 -0800

    Merge commit 'de57829fc38605c4bbe8c9993d242cab7a5922e0' into merged-base

commit 58b8b37ae8bc8e86eca0627df7a38635dc65e0e8
Merge: de1ecf7882 f80971cb61
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:08 2019 -0800

    Merge commit 'f80971cb610799954e4a1df488847d11bca8ad3c' into merged-base

commit de1ecf788234c0c99c9bbcf9e8c27d806ef4d968
Merge: 77cc6bba59 8f36acde0a
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:07 2019 -0800

    Merge commit '8f36acde0ae97f2c52bbc8c05f781a8e6f85eea6' into merged-base

commit 77cc6bba595487b95be990ad751c7927cff884fe
Merge: 07e7568222 0740633118
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:06 2019 -0800

    Merge commit '0740633118c88555e139624320ffc4825dade527' into merged-base

commit 07e75682222b22c3131dbc541dd589d495ad1de4
Merge: 3e09cc74ef d28f895d31
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:06 2019 -0800

    Merge commit 'd28f895d31bc5e2d445ec643350941257daeb787' into merged-base

commit 3e09cc74ef919d65f061c28347e9c45cc61d6e23
Merge: 756b4f290d 355b9809de
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:05 2019 -0800

    Merge commit '355b9809debb24ad1f0414fad20e75529db4297d' into merged-base

commit 756b4f290d301acfc810652312e0697d927ba294
Merge: 6d62a5df7b 4a7e742fb8
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:04 2019 -0800

    Merge commit '4a7e742fb86e077be3637066c8b73eb0de9834ec' into merged-base

commit 6d62a5df7ba82fee2accf2a9ea0f077cf49e80aa
Merge: a999793b03 a1d8f25b08
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:04 2019 -0800

    Merge commit 'a1d8f25b084d5400f1d60baa11d18bca7ca235b1' into merged-base

commit a999793b0379f3fd1e49f04f05835fd0b6936f9b
Merge: 63afb12c11 80db568032
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:03 2019 -0800

    Merge commit '80db56803277b84a5b168f8915b30571415cc2a7' into merged-base

commit 63afb12c11afdddd3c40e433eefcb223a0b564b9
Merge: 1c7c5783ea 369612899d
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:23:02 2019 -0800

    Merge commit '369612899dfa80c4e533757e85fd205089d77003' into merged-base

commit 1c7c5783ea85c661d1395353531cb79a7379704c
Merge: 46fb2f1ad4 47661d4ec3
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:22:58 2019 -0800

    Merge commit '47661d4ec3653b4b6147bef2ff6a7f7e468ea598' into merged-base

    # Conflicts:
    #	build/builtInExtensions.json

commit 46fb2f1ad44b94dc3212cde8f70d53d0ccb156d9
Merge: abcff4dd79 cd18eb9be8
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:22:18 2019 -0800

    Merge commit 'cd18eb9be8f4a765d4121e3ef7ed2faf8f50a157' into merged-base

commit abcff4dd79c5f43e586a2a17dc6d3d40236edbd5
Merge: 47e1704ef9 d63ebe3644
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:22:17 2019 -0800

    Merge commit 'd63ebe3644eb005855a8f3031be7c3d05d71f268' into merged-base

commit 47e1704ef9bfa903c99ca9491538dae1606e9188
Merge: 049909f4ba dad8b64482
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:22:17 2019 -0800

    Merge commit 'dad8b644821739d2a596887b42b4ee9a9298d849' into merged-base

commit 049909f4bab33c1cd8dbe5ce1e3e52a99d494dcf
Merge: 7a2a9ed142 5c298d1f4a
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:22:16 2019 -0800

    Merge commit '5c298d1f4aada252f9972d7495af2802daa370e8' into merged-base

commit 7a2a9ed1423cc34d698d39d0ba1ce8cb98b15cfe
Merge: 30149049ec 649c0aba5b
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:22:15 2019 -0800

    Merge commit '649c0aba5b3ddeec1171d9013b28e94d1c8f3146' into merged-base

    # Conflicts:
    #	.github/calendar.yml

commit 30149049ecde7d3609b5acac31506a165f579b5f
Merge: 8e7995f21f 16114454d5
Author: Anthony Dresser <andresse@Anthonys-MacBook-Pro.local>
Date:   Fri Mar 1 16:22:14 2019 -0800

    Merge commit '16114454d5718ee152b7ca81ca2b33088eed8c25' into merged-base

commit 8e7995f21f87c09cc1634eb6d31f8da706a192bc
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:52:34 2019 -0800

    update more unneded changes

commit f1ba2eaecaff6bb85c035946e9794a5084ffb974
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:50:10 2019 -0800

    remove diff

commit 3e31c5887d58f00ec579a4f3d6376b48a51c2841
Merge: d72b77bb23 0cdd4b1241
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:37:22 2019 -0800

    Merge commit '0cdd4b12417ee72dc7aa4f1492e499fe07ccc81a' into merged-base

    # Conflicts:
    #	.github/classifier.yml
    #	.github/commands.yml
    #	build/package.json
    #	package.json
    #	src/vs/base/browser/ui/inputbox/inputBox.ts

commit d72b77bb23fbc4914f549dedf7565d4c848c66aa
Merge: 775a2dc433 e27511826f
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:20 2019 -0800

    Merge commit 'e27511826f363156c616e5facbb60702e40b79f3' into merged-base

commit 775a2dc4337f96551dc83fd54178dcd2d63156a5
Merge: 6e84324cae 1054c555b5
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:20 2019 -0800

    Merge commit '1054c555b5889e6479544c68357d38d047605969' into merged-base

commit 6e84324caebf5f47ed1a185b2758fdb973ffd560
Merge: d57682ad3d e42a2a21da
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:19 2019 -0800

    Merge commit 'e42a2a21dab434a81a16aefbec2e75b26030941e' into merged-base

commit d57682ad3dc6be4fdf2eac989f4bf4b6cc619dcd
Merge: ac4c914b97 533f3dd8a6
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:19 2019 -0800

    Merge commit '533f3dd8a6f7fc7510c374874e84daa9c7413909' into merged-base

commit ac4c914b97f43154c5831f09b09c86c90b1317d2
Merge: 0d61556843 86adcc7fcf
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:18 2019 -0800

    Merge commit '86adcc7fcfca511b2d5c45a6ca76282e7dad40f8' into merged-base

commit 0d61556843c63a1649d68ae1e874c51d8959077a
Merge: c54dcf194d 18970ff0b9
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:06 2019 -0800

    Merge commit '18970ff0b9bfc788ff229ed4e1e81e9ac7e559e3' into merged-base

commit c54dcf194d4709972d4023bdaebbb1d31d9e2a07
Merge: 32f7e0b892 630698459b
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:06 2019 -0800

    Merge commit '630698459bf0b55369fc3706f3310de36081f583' into merged-base

commit 32f7e0b892153d7e598a441b61d3945d067b7fa9
Merge: 70817fef35 f8e854a087
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:05 2019 -0800

    Merge commit 'f8e854a0870a2224a7e3b1a205b26e1fdc4f46bc' into merged-base

commit 70817fef350c78e5b50a976704a1cd2cc8231c6d
Merge: 969c6d467d 3b2274b0aa
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:04 2019 -0800

    Merge commit '3b2274b0aa32fb4c433471481fd3fd18fbc46621' into merged-base

commit 969c6d467d62d5f8126a87259c3faabd6ac63bb7
Merge: 5e51884915 0d1ebce1a1
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:04 2019 -0800

    Merge commit '0d1ebce1a1ba6cc8a1fe9feadcd0d90f4cbd2536' into merged-base

commit 5e518849159864ee97b0815ae3e99ffa6d00096c
Merge: a8369384d1 70d86ce9a2
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:03 2019 -0800

    Merge commit '70d86ce9a256bf7e44eb6efc6a83bd9ff46372f8' into merged-base

commit a8369384d192e0f7bd54dec60681849b0fc86c99
Merge: 44493de573 291f591af3
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:02 2019 -0800

    Merge commit '291f591af3421899481725016ccb08a40424c036' into merged-base

commit 44493de573d94f5bc5d666984bca0b6d9c748dcd
Merge: 97bef8f085 5a48c52a95
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:02 2019 -0800

    Merge commit '5a48c52a95a2356dc84275e6ab5a58af6fecfc7c' into merged-base

commit 97bef8f0850cbbb12cddb5f06d7b6260d767d0c7
Merge: 87b91ffa2e 5625ef956d
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:01 2019 -0800

    Merge commit '5625ef956d1a0e75891b5fc30b68c00ff5250b15' into merged-base

commit 87b91ffa2e7bfc7de8dcb131e44b17cb89e56cd7
Merge: b856b86ea2 969733ab77
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:00 2019 -0800

    Merge commit '969733ab7763f938499ec635c70fdd51c2d234e0' into merged-base

commit b856b86ea228437f37d21078d23d6ceb1f4c0625
Merge: 96607b7eca 12a1ac1a7d
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:35:00 2019 -0800

    Merge commit '12a1ac1a7d667d1bbb8752f61c893d2fab1a6115' into merged-base

commit 96607b7ecaa2600f756b1ab5f16f9e56ce69e410
Merge: df987aaa58 4da322a03f
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:59 2019 -0800

    Merge commit '4da322a03f60abfd48d03f70c413fe4d3c6cd6ae' into merged-base

commit df987aaa58dec252308cb9326c88bcff5129f338
Merge: 0bdf3f374c d5754c00e2
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:53 2019 -0800

    Merge commit 'd5754c00e200ebb0c2b20e3b679f00fe242f730f' into merged-base

    # Conflicts:
    #	.github/classifier.yml
    #	.github/commands.yml
    #	.github/locker.yml
    #	.github/needs_more_info.yml
    #	.github/similarity.yml

commit 0bdf3f374c93f406ebaa99abbd8630bf50a3761f
Merge: d8a7ff381c 2e9b5f3a2b
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:05 2019 -0800

    Merge commit '2e9b5f3a2b0a5095b14631937134a12765ddcb6f' into merged-base

commit d8a7ff381c834795e8d796a6f03f54caa7512aeb
Merge: d41dcacd9c b11a8e9c0c
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:04 2019 -0800

    Merge commit 'b11a8e9c0cfe98eb291658f17b34db60896b097f' into merged-base

commit d41dcacd9c43ddd3803a4bc04144c17bce3a8a03
Merge: e076bb87c8 e37533afbb
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:04 2019 -0800

    Merge commit 'e37533afbb43753c8657106012b9a2f0ae2aba52' into merged-base

commit e076bb87c859f201fe25f5af212056966c91d13b
Merge: 1802b5befb 4a476673ac
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:03 2019 -0800

    Merge commit '4a476673ac3c210c2561dacbb52af7ed10fa405e' into merged-base

commit 1802b5befb1da661d2e0501bbb3d5621389aa835
Merge: 25e3608f3a fe5386cc08
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:02 2019 -0800

    Merge commit 'fe5386cc08db8da41010c802a737e7f4cf31258c' into merged-base

commit 25e3608f3ac66dc53066b6d7706686c381f3d957
Merge: 0eb5f9fff1 8bfb1a9d39
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:02 2019 -0800

    Merge commit '8bfb1a9d3926a97231f96ec5492aaff196e1cb89' into merged-base

commit 0eb5f9fff19135b6492dc6545724b262d174249a
Merge: ecdfd0d04b 109aafcbc0
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:01 2019 -0800

    Merge commit '109aafcbc0474992bd394056946bc7a480be0349' into merged-base

commit ecdfd0d04b0b01785132e0d2b16c59781434d83a
Merge: fd1f2b7043 e289c06d8d
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:00 2019 -0800

    Merge commit 'e289c06d8d149333beb538c73d76e7397bfcf49c' into merged-base

commit fd1f2b70437efebec5b3aad392e93381192e7f80
Merge: ac49c347ff 78c1c318c5
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:34:00 2019 -0800

    Merge commit '78c1c318c59d2750fc745e69474dd1ca86147187' into merged-base

commit ac49c347ff351d3d3ece0ed8625c6fff90d939fc
Merge: 98559964cf 07983d75ea
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:59 2019 -0800

    Merge commit '07983d75eab418a23b1b2348701ec781b125ee24' into merged-base

commit 98559964cf8f5008d78213bbb72cf473b3cb96f9
Merge: cf0b9a31ea d0a4a4242d
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:58 2019 -0800

    Merge commit 'd0a4a4242d410967fe67387262bc650bcbb2bb1e' into merged-base

commit cf0b9a31ea8f12526e2536b4ea180341f37b8de4
Merge: c05c44dad6 a71be2b193
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:58 2019 -0800

    Merge commit 'a71be2b19365a4b56adfa6f1dd81713aa9f46b06' into merged-base

commit c05c44dad625fc27e9a737476a272a1251fe90d2
Merge: ba90ea4d78 779ca13d48
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:57 2019 -0800

    Merge commit '779ca13d489a29b14c7e6c649e3af3e9aa6f896f' into merged-base

commit ba90ea4d787d1d281fead46ab817be3436de3d5b
Merge: f3b9a29c4c f3b0a50db7
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:56 2019 -0800

    Merge commit 'f3b0a50db7d39f612b9cd99b62473e9a36b16f84' into merged-base

commit f3b9a29c4c5dee6c20cc7bb141aa2f92459e55cd
Merge: 8be2080f91 c831596e02
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:56 2019 -0800

    Merge commit 'c831596e0258aceca2ea4647d2fa2420860f6217' into merged-base

commit 8be2080f91d5bb58daeaac8e729023baf643e903
Merge: 0c4076aecb 2ae369fbdb
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:55 2019 -0800

    Merge commit '2ae369fbdb3b795b384b4719c77cc3694dc7a256' into merged-base

commit 0c4076aecbdc0babae3c69703e7453cde1cad540
Merge: 93612ea9e8 f2c9d968a4
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:54 2019 -0800

    Merge commit 'f2c9d968a46827e2808a9ebd1fb47e418c403dd0' into merged-base

commit 93612ea9e89ffb84cefa9459815c1693bb9ae0a6
Merge: 83fb797483 c3f02980a0
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:54 2019 -0800

    Merge commit 'c3f02980a0e03c637aafe028bab76ef737d738ab' into merged-base

commit 83fb797483507ad7b9d602a1f0f313f743149747
Merge: 5e052ac28d 7d5ce7b5d7
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:53 2019 -0800

    Merge commit '7d5ce7b5d77c81a6667522bb8ecc88bc08879516' into merged-base

commit 5e052ac28d1871702cc03e31911f6a456d0edd2d
Merge: e3f1610177 8bb71eeb51
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:52 2019 -0800

    Merge commit '8bb71eeb51b91aaf68a0cc4897f8b94ebe263d93' into merged-base

commit e3f16101771784e1e391356f56e524963c972623
Merge: ef9caf3a3c 5a88598811
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:52 2019 -0800

    Merge commit '5a88598811e4d82fb15bc3aab52b6f3d2519750b' into merged-base

commit ef9caf3a3cd3ffa0b4195cf4047ca7650c4deb0a
Merge: 031a86e77a da3fbd386d
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:51 2019 -0800

    Merge commit 'da3fbd386d1454b104969e83f589f6fdeb5badce' into merged-base

commit 031a86e77ac589eedbfa6d33ce505c0537cdcb9a
Merge: 444d144a4f 1e915aad20
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:50 2019 -0800

    Merge commit '1e915aad2039c06914ca907d23b65bf1fefd29b1' into merged-base

commit 444d144a4f43ff2fa3f2e4f81561a03773b28547
Merge: e4ed6e083b 889d5e5b28
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:50 2019 -0800

    Merge commit '889d5e5b28e397680be8cca5bfb4b4ed61da581d' into merged-base

commit e4ed6e083be6b186ed89415c2860dae3451356b6
Merge: f411a0f82d 51cf2df2f8
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:49 2019 -0800

    Merge commit '51cf2df2f8e5c30ca83c5b410898ae69e04fd545' into merged-base

commit f411a0f82d6da3a2e92c49657fb4b96aefca1ec8
Merge: 4f8214b37e e690285d9d
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:48 2019 -0800

    Merge commit 'e690285d9d4c42a0047093b447b555b0e3921484' into merged-base

commit 4f8214b37e9cc6b67d8dc9e396f12295c49a0ead
Merge: 303f92fb11 81d6423f24
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:48 2019 -0800

    Merge commit '81d6423f241fede9410bd53f8aae7e1a098f63d1' into merged-base

commit 303f92fb119fdb4195dec06deb7cafa32e73e10d
Merge: 4f2ac743da a33a24dddf
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:42 2019 -0800

    Merge commit 'a33a24dddfc65111828dc8df867eb14d27e1b89d' into merged-base

    # Conflicts:
    #	.github/copycat.yml

commit 4f2ac743da048499b4f7f634e1e1979d4fc477fa
Merge: 55f921fb37 0ab3492afd
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:33:12 2019 -0800

    Merge commit '0ab3492afdbe21b9cb89a7d639770b124dc54e51' into merged-base

commit 55f921fb379af3146e3f8322bd34c18f3c5ad9ec
Merge: 826856c390 dea8705087
Author: Anthony Dresser <anthonydresserdev@gmail.com>
Date:   Thu Feb 28 23:30:39 2019 -0800

    Merge commit 'dea8705087adb1b5e5ae1d9123278e178656186a' into ads-1301-vscode

    # Conflicts:
    #	extensions/git/src/askpass-empty.sh
    #	extensions/git/src/askpass.sh
    #	extensions/theme-defaults/fileicons/images/Document_16x_inverse.svg
    #	extensions/theme-defaults/fileicons/images/FolderOpen_16x_inverse.svg
    #	extensions/theme-defaults/fileicons/images/Folder_16x_inverse.svg
    #	extensions/theme-defaults/fileicons/images/RootFolderOpen_16x.svg
    #	extensions/theme-defaults/fileicons/images/RootFolderOpen_16x_inverse.svg
    #	extensions/theme-defaults/fileicons/images/RootFolder_16x.svg
    #	extensions/theme-defaults/fileicons/images/RootFolder_16x_inverse.svg
    #	scripts/node-electron.sh
    #	src/vs/base/node/terminateProcess.sh
    #	src/vs/base/parts/tree/browser/collapsed-dark.svg
    #	src/vs/base/parts/tree/browser/collapsed.svg
    #	src/vs/base/parts/tree/browser/expanded-dark.svg
    #	src/vs/base/parts/tree/browser/expanded.svg
    #	src/vs/editor/contrib/documentSymbols/media/EnumItem_16x.svg
    #	src/vs/editor/contrib/documentSymbols/media/EnumItem_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Class_16x.svg
    #	src/vs/editor/contrib/suggest/media/Class_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/ColorPalette_16x.svg
    #	src/vs/editor/contrib/suggest/media/ColorPalette_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Document_16x.svg
    #	src/vs/editor/contrib/suggest/media/Document_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/EnumItem_16x.svg
    #	src/vs/editor/contrib/suggest/media/EnumItem_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Enumerator_16x.svg
    #	src/vs/editor/contrib/suggest/media/Enumerator_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Field_16x.svg
    #	src/vs/editor/contrib/suggest/media/Field_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Folder_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/IntelliSenseKeyword_16x.svg
    #	src/vs/editor/contrib/suggest/media/IntelliSenseKeyword_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Interface_16x.svg
    #	src/vs/editor/contrib/suggest/media/Interface_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Method_16x.svg
    #	src/vs/editor/contrib/suggest/media/Method_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Misc_16x.svg
    #	src/vs/editor/contrib/suggest/media/Misc_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Namespace_16x.svg
    #	src/vs/editor/contrib/suggest/media/Namespace_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Property_16x.svg
    #	src/vs/editor/contrib/suggest/media/Property_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/Ruler_16x.svg
    #	src/vs/editor/contrib/suggest/media/Ruler_inverse_16x.svg
    #	src/vs/editor/contrib/suggest/media/String_16x.svg
    #	src/vs/editor/contrib/suggest/media/String_inverse_16x.svg
    #	src/vs/workbench/browser/parts/editor/media/paragraph-inverse.svg
    #	src/vs/workbench/browser/parts/editor/media/paragraph.svg
    #	src/vs/workbench/browser/parts/notifications/media/down-inverse.svg
    #	src/vs/workbench/browser/parts/notifications/media/down.svg
    #	src/vs/workbench/browser/parts/notifications/media/error-inverse.svg
    #	src/vs/workbench/browser/parts/notifications/media/error.svg
    #	src/vs/workbench/browser/parts/notifications/media/info-inverse.svg
    #	src/vs/workbench/browser/parts/notifications/media/info.svg
    #	src/vs/workbench/browser/parts/notifications/media/up-inverse.svg
    #	src/vs/workbench/browser/parts/notifications/media/up.svg
    #	src/vs/workbench/browser/parts/notifications/media/warning-inverse.svg
    #	src/vs/workbench/browser/parts/notifications/media/warning.svg
    #	src/vs/workbench/browser/parts/panel/media/left-inverse.svg
    #	src/vs/workbench/browser/parts/panel/media/left.svg
    #	src/vs/workbench/browser/parts/panel/media/right-inverse.svg
    #	src/vs/workbench/browser/parts/panel/media/right.svg
    #	src/vs/workbench/browser/parts/views/media/collapsed-dark.svg
    #	src/vs/workbench/browser/parts/views/media/collapsed.svg
    #	src/vs/workbench/browser/parts/views/media/expanded-dark.svg
    #	src/vs/workbench/browser/parts/views/media/expanded.svg
    #	src/vs/workbench/parts/debug/browser/media/breakpoint-function-disabled.svg
    #	src/vs/workbench/parts/debug/browser/media/breakpoint-function-unverified.svg
    #	src/vs/workbench/parts/debug/browser/media/breakpoint-function.svg
    #	src/vs/workbench/parts/debug/browser/media/current-and-breakpoint.svg
    #	src/vs/workbench/parts/debug/browser/media/current-arrow.svg
    #	src/vs/workbench/parts/debug/browser/media/disconnect-inverse.svg
    #	src/vs/workbench/parts/debug/browser/media/disconnect.svg
    #	src/vs/workbench/parts/feedback/electron-browser/media/twitter.svg
    #	src/vs/workbench/parts/output/browser/media/output_lock.svg
    #	src/vs/workbench/parts/output/browser/media/output_lock_inverse.svg
    #	src/vs/workbench/parts/output/browser/media/output_unlock.svg
    #	src/vs/workbench/parts/output/browser/media/output_unlock_inverse.svg
    #	src/vs/workbench/parts/preferences/browser/media/collapsed-dark.svg
    #	src/vs/workbench/parts/preferences/browser/media/collapsed.svg
    #	src/vs/workbench/parts/preferences/browser/media/edit.svg
    #	src/vs/workbench/parts/preferences/browser/media/edit_inverse.svg
    #	src/vs/workbench/parts/preferences/browser/media/expanded-dark.svg
    #	src/vs/workbench/parts/preferences/browser/media/expanded.svg
    #	src/vs/workbench/parts/search/browser/media/excludeSettings-dark.svg
    #	src/vs/workbench/parts/search/browser/media/excludeSettings.svg

commit dea8705087adb1b5e5ae1d9123278e178656186a
Merge: 58177b4a32 51063efcf5
Author: Rob Lourens <roblourens@gmail.com>
Date:   Tue Dec 18 09:50:21 2018 -0800

    Merge pull request #65315 from Microsoft/versionBump

    Bump version

commit 51063efcf53af0ec563087c4b86a6fd71f1159a3
Author: Rob Lourens <roblourens@gmail.com>
Date:   Tue Dec 18 09:45:00 2018 -0800

    Bump version

commit 58177b4a32ab4a552efc1dcad71f09716e40ad4b
Merge: 8b7c775eb9 ae30d207aa
Author: Rob Lourens <roblourens@gmail.com>
Date:   Mon Dec 17 11:57:22 2018 -0800

    Merge pull request #65143 from Microsoft/roblou/fixSearchCancel

    Fix #65084

commit 8b7c775eb945034f8bca7ab4ee272de612e8e723
Merge: febae8bb46 c53e1553af
Author: Rob Lourens <roblourens@gmail.com>
Date:   Mon Dec 17 11:48:42 2018 -0800

    Merge pull request #65141 from Microsoft/roblou/fixCRLFmultiline

    Fix search CRLF files with non-regex multiline search

commit ae30d207aac195219c65b1f113329bf6ab27ea3f
Author: Rob Lourens <roblourens@gmail.com>
Date:   Sat Dec 15 14:42:15 2018 -0800

    Fix #65084 - queue searches so they can finish asynchronously, just one at a time

commit c53e1553af582fc51b59bfb786f8daddbeafd7c7
Author: Rob Lourens <roblourens@gmail.com>
Date:   Sat Dec 15 13:18:34 2018 -0800

    Fix #65120

commit febae8bb46c13a279589811c95677d853f381e11
Merge: ef28947adc 8953bb08af
Author: Pine <octref@users.noreply.github.com>
Date:   Fri Dec 14 14:35:43 2018 -0800

    Merge pull request #65114 from Microsoft/octref/64993

    Fix #64993

commit 8953bb08af679dca14936bf25c2b9b3040dcbb76
Author: Pine Wu <octref@gmail.com>
Date:   Fri Dec 14 14:17:02 2018 -0800

    Fix #64993

commit ef28947adc78cf338c54c7518c78fecf2471bc4f
Merge: b8b7550ccf f9377b2e4f
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Thu Dec 13 14:16:11 2018 +0100

    Merge pull request #64880 from Microsoft/joh/fix/64829

    generate list styles for references tree, #64829

commit b8b7550ccf52d0e2a7e045120fbd70c8cea65297
Merge: 1cf315d4b4 539d2153d4
Author: Isidor Nikolic <inikolic@microsoft.com>
Date:   Thu Dec 13 10:50:35 2018 +0100

    Merge pull request #64870 from Microsoft/isidorn/treeNavigationKeyboard

    treeResourceNavigator: fire onSelection also for keyboard events

commit 1cf315d4b4a8bb176618bafa3ef92fc1b44e5c15
Author: Isidor Nikolic <inikolic@microsoft.com>
Date:   Thu Dec 13 02:21:08 2018 +0100

    Fix broken Debug > Start Debugging global menu action, fix #64450 (#64860)

commit f9377b2e4f31433528ba314efb8b4f361ce81f21
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Wed Dec 12 14:53:29 2018 +0100

    generate list styles for references tree, #64829

commit 539d2153d4c958ba8501a42f64a3b7444ff04e3e
Author: isidor <inikolic@microsoft.com>
Date:   Wed Dec 12 12:56:26 2018 +0100

    treeResourceNavigator: fire onSelection also for keyboard events

commit c6e592b2b5770e40a98cb9c2715a8ef89aec3d74
Merge: 3dcdcc3fe0 552023ed54
Author: João Moreno <mail@joaomoreno.com>
Date:   Tue Dec 11 15:17:17 2018 +0100

    Merge pull request #64803 from Microsoft/joao/release/1.30/fix-64739

    Fixes #64739

commit 552023ed54b41565fc3c513266a4a776cce0b00f
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Tue Dec 11 11:24:45 2018 +0100

    fixes #64739

commit 3dcdcc3fe0ed44d8c58be03df3c35e1edcb454e9
Merge: 5cbf65b0d3 090d3410fc
Author: Isidor Nikolic <inikolic@microsoft.com>
Date:   Tue Dec 11 11:10:43 2018 +0100

    Merge pull request #64790 from Microsoft/joao/release/1.30/fix-64735

    Revert "list: right click should  not select/focus"

commit 090d3410fce64f70c7df4f8cd0d0aebb2f0c7029
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Tue Dec 11 10:58:36 2018 +0100

    Revert "list: right click should  not select/focus"

    fixes #64735

    This reverts commit 7d76da21499d5ca4e44ca9cf02c9eede019af9b6.

commit 5cbf65b0d358420842bd52dae69459f277834ef0
Merge: 321b5785a7 bc5bb38695
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Tue Dec 11 10:24:49 2018 +0100

    Merge pull request #64783 from Microsoft/joh/fix/64654

    properly cache current revealed reference

commit 321b5785a7c52ab817e5caa67b519004331e2b0c
Merge: 241923763d 7b7c6b3dad
Author: João Moreno <mail@joaomoreno.com>
Date:   Tue Dec 11 10:17:04 2018 +0100

    Merge pull request #64785 from Microsoft/joao/release/1.30/64747

    Fixes #64747

commit 7b7c6b3dad6c08f42bbd8662247f5f95ac1ef976
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Tue Dec 11 09:55:23 2018 +0100

    fixes #64747

commit bc5bb386959f9aad269d858a362b0a45203c8e09
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Tue Dec 11 09:05:21 2018 +0100

    properly cache current revealed reference

commit 29179eaa23c9c93aede2da1c03e69f9ccf59b4e1
Author: Alex Ross <alros@microsoft.com>
Date:   Mon Dec 10 12:26:32 2018 +0100

    Remove TPromise.as from task.contribution.ts

    Part of #64597

commit 1881db074b7a6bacc7c2354db34fbc1de1ad8970
Author: Christof Marti <chrmarti@microsoft.com>
Date:   Mon Dec 10 12:18:59 2018 +0100

    TPromise > Promise (#64598)

commit cc8b25b5ada64b976b0573d959b4c347aef86b1b
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 12:02:11 2018 +0100

    remove TPromise

    related to #64597

commit 2b8d7248b8165f33395e42fe02a186437b9412c2
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 12:01:18 2018 +0100

    remove TPromise.as

    related to #64597

commit 066ee8c2d7587f7f9596f4c06f433c2e1f089a07
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 11:54:51 2018 +0100

    remove TPromise.as

    related to #64597

commit de57829fc38605c4bbe8c9993d242cab7a5922e0
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:59:47 2018 +0100

    debt - more lazy service contributions

commit f80971cb610799954e4a1df488847d11bca8ad3c
Merge: 0baabc8a8b 8f36acde0a
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:52:17 2018 +0100

    Merge pull request #64717 from Microsoft/joh/fixmem

    Better Suggest Memories

commit 8f36acde0ae97f2c52bbc8c05f781a8e6f85eea6
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:50:25 2018 +0100

    don't listen to storage changes for now

commit 0740633118c88555e139624320ffc4825dade527
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:49:56 2018 +0100

    Revert "Revert "remove `shareSuggestSelections`-setting for now #62365""

    This reverts commit d28f895d31bc5e2d445ec643350941257daeb787.

commit 0baabc8a8b506c92958e286272bb3cb0dded4dc5
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 11:43:26 2018 +0100

    remove TPromise

    related to #64596

commit 65a420e359f925f8a5da3deeba4d82a2e7655e88
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 11:40:28 2018 +0100

    remove TPromise

    related to #64596

commit 093bb84d61d9cdf64f27d2ae6ed1dafad085fd33
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 11:38:09 2018 +0100

    remove TPromise

    related to #64596

commit d28f895d31bc5e2d445ec643350941257daeb787
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:36:35 2018 +0100

    Revert "remove `shareSuggestSelections`-setting for now #62365"

    This reverts commit f6cff39cb4c398eba8e041b5a0f50bd3b33ce6a7.

commit de63daf34875d95db83be56348cc999720ae0961
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 11:33:29 2018 +0100

    remove TPromise.wrapError

    related to #63897

commit a901902ce64d5f6a135af942c16a646b25b1ea39
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 11:27:48 2018 +0100

    remove TPromise.wrapError

    related to #63897

commit 2f863c62b3a54d96a180ef76ad391865eb511b92
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 11:16:57 2018 +0100

    remove TPromise.wrapError

    related to #63897

commit 346b230f1677e3ff5cdb06cf119d6fc6ab500c26
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Mon Dec 10 11:11:23 2018 +0100

    remove TPromise.wrapError

    related to #63897

commit 355b9809debb24ad1f0414fad20e75529db4297d
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:33:18 2018 +0100

    fix compile issue

commit 4a7e742fb86e077be3637066c8b73eb0de9834ec
Merge: 899ce6670c a1d8f25b08
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:29:56 2018 +0100

    Merge branch 'master' into joh/fixmem

commit 899ce6670cf93dc88dc0ca22e1353b162739f0f4
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:29:47 2018 +0100

    :lipstick:

commit a1d8f25b084d5400f1d60baa11d18bca7ca235b1
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:28:09 2018 +0100

    insta - actually enable delayed instantiation

commit 80db56803277b84a5b168f8915b30571415cc2a7
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:22:52 2018 +0100

    use bracket/block selection ranges provider, fixes #64272

commit 369612899dfa80c4e533757e85fd205089d77003
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 11:13:09 2018 +0100

    add leading/trailing line part to bracket selection #64004

commit 47661d4ec3653b4b6147bef2ff6a7f7e468ea598
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 10:37:19 2018 +0100

    update references view extension

commit cd18eb9be8f4a765d4121e3ef7ed2faf8f50a157
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Mon Dec 10 11:20:26 2018 +0100

    storage - beforeClose() is actually not needed

commit d63ebe3644eb005855a8f3031be7c3d05d71f268
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Mon Dec 10 11:14:51 2018 +0100

    No horizontal scrollbars after toggling side by side diff view (fix #64090)

commit dad8b644821739d2a596887b42b4ee9a9298d849
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Mon Dec 10 10:58:38 2018 +0100

    debt - dispose action items that are pulled from actionbar

commit 5c298d1f4aada252f9972d7495af2802daa370e8
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Mon Dec 10 10:49:40 2018 +0100

    no tabs - prevent title from exceeding 35px height

commit 649c0aba5b3ddeec1171d9013b28e94d1c8f3146
Author: Christof Marti <chrmarti@microsoft.com>
Date:   Mon Dec 10 10:40:35 2018 +0100

    Update calendar

commit 16114454d5718ee152b7ca81ca2b33088eed8c25
Merge: 0cdd4b1241 3f960a91c8
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 10:33:17 2018 +0100

    Merge pull request #64715 from Microsoft/joh/brackets

    Better Bracket selection

commit 0cdd4b12417ee72dc7aa4f1492e499fe07ccc81a
Merge: 0194c94656 e27511826f
Author: João Moreno <mail@joaomoreno.com>
Date:   Mon Dec 10 10:32:59 2018 +0100

    Merge pull request #64619 from Microsoft/rmacfarlane/git-apply

    Add GitErrorCode to apply command

commit 3f960a91c8ceb80d764728efb1d6c4cb54220d15
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Mon Dec 10 10:32:08 2018 +0100

    take max 4 * 30ms

commit 0194c9465634a54b9614c7396ac53b6a0fbef70c
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Mon Dec 10 10:31:18 2018 +0100

    notifications - push initial notifications out a bit to give editors more time to restore

commit 627e0310c80061030bda482cfaad5dee736b46a5
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Mon Dec 10 10:28:00 2018 +0100

    telemetry - double it up

commit bac0d92a46f8d7ec4a9da4f83747716aac849612
Author: Christof Marti <chrmarti@microsoft.com>
Date:   Mon Dec 10 10:23:07 2018 +0100

    Update commands.yml

commit ae80a5aab4c9c8ada416d10e5b8e0f89355bcd54
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Mon Dec 10 10:06:33 2018 +0100

    reject if gallery is not enabled

commit a7cf7c9f7e5f9ad02228aa888e6a9370b9bf6924
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Fri Dec 7 15:04:48 2018 +0100

    #64597 Move away from TPromise

commit 44c97db13bbe264018dc2c557a97641cb260eaf5
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Fri Dec 7 14:37:07 2018 +0100

    #64597 Move away from TPromise

commit cd0ea96e50c5978f299a0c5099e015bf725d2a1a
Author: isidor <inikolic@microsoft.com>
Date:   Mon Dec 10 09:53:39 2018 +0100

    debug issues to isidor

commit 19e36adcb448fa7af1d5c8dd7f50d08c87ed5c0c
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Fri Dec 7 15:18:32 2018 +0100

    outline - remove unused css

commit e444eaa768a1e8bd8315f2cee265d725e96a8162
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 16:41:29 2018 -0800

    Strict null check serviceMock

commit 9b4099e45bc4ce6a9e8bc86846fd2787e9c90161
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 16:36:17 2018 -0800

    Strict null check patternInputWidget

commit ae7d6b7ca7e8340724328313f2e1e5b2c296e906
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 16:33:42 2018 -0800

    Working on strict null checking contentHover

commit 0928a6d348c461dc4b39582e440da67547059078
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 16:32:45 2018 -0800

    Prefer coalesce over filter

    Coalesce has the correct return type of `T[]`. Filter may return `(T | undefined)[]`

commit 91eccfdf851461f18eb5dd1a2cdacc0d7251eb8f
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 16:07:09 2018 -0800

    Strict null check contextScopedHistoryWidget

commit 2a61f8d4f67b7fec381d1cb668f380ff252c8a6c
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 15:51:57 2018 -0800

    Strict null check format action

commit 70a73a95f6b10ecd1f77a73e294fc63dec0bc9f7
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 15:36:24 2018 -0800

    Strict null check findOptionsWidget

commit 90f7c9d45707f10dc31b89b2060ea57e3f159937
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 15:32:19 2018 -0800

    Marking fields readonly

commit f97736ccefeaffba255eebdf2b2070d838bce85a
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 15:27:59 2018 -0800

    Strict null check findInput

commit c25b7499d18977e72e21234b581f09d9b076a6c0
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 15:12:10 2018 -0800

    Strict null checking inputbox

commit a626cc192bc5bed17f3650b24a78e15bcc6a2e06
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 15:01:06 2018 -0800

    Strict null check panel.ts

commit b30ff27f996441be7334f32ab2211125f028b793
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 14:58:06 2018 -0800

    Use more DRY class definition

    Avoid repeating types and mark fields as readonly

commit 14fb1eb303f0f13d2d6b5e396b29224594b1e348
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 14:47:01 2018 -0800

    Strict null check composite

commit 34179166777a8252684d673c438529aa7a3d291c
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 14:37:40 2018 -0800

    Fix formatting for TS 3.2

commit 305e760ec58b7aa783c280f85883a708ec062403
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 14:33:24 2018 -0800

    Strict null check configuration service

commit 322f054c4dafa63d2b99202b76a55fce8b7471f3
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 14:31:21 2018 -0800

    Strict null check auto adds

commit e2cf8ebc5d6e827199124b911ff3e25ff38ae2ec
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 14:24:58 2018 -0800

    Enable strictBindCallApply for VS Code

    Fixes #64633

commit 8b4924d755613f5bba1364f88a57c824e67205e0
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 13:01:02 2018 -0800

    Build VS Code using TS 3.2

    Fixes #64631

commit a4bed89652baf8bf5b24791e8c9b6c8183290026
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 13:00:18 2018 -0800

    :lipstick:

commit 98f236872e90b8fe41ec9c29e7eabf0420ea665c
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 12:32:00 2018 -0800

    Use undefined instead of null

commit 3fc69f20ab4439f439a9761060559307626b1504
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 12:29:38 2018 -0800

    Add toOpenedFilePath method

    Make sure we don't try making requests against TS for files that are not currently open

commit 7140c91245fb5a3818f46ffdb33664396bee84d4
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 11:49:06 2018 -0800

    Never return undefined for cachedResponse.execute

commit 98605b6a4eceda80253d05f52a1033187ffac19a
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 11:46:59 2018 -0800

    Extract cached response to own file

commit 241923763dbeaf3b64443187e935d55b29f6125d
Author: SteVen Batten <6561887+sbatten@users.noreply.github.com>
Date:   Fri Dec 7 14:06:12 2018 -0800

    schedule update overflow action due to reflow (#64634) (#64639)

    * schedule update overflow action due to reflow
    fixes #64514

    * removed disposal

commit fee735ed37f6be94bdd0de5206bb9b22c213bfdd
Author: SteVen Batten <6561887+sbatten@users.noreply.github.com>
Date:   Fri Dec 7 13:56:55 2018 -0800

    schedule update overflow action due to reflow (#64634)

    * schedule update overflow action due to reflow
    fixes #64514

    * removed disposal

commit fa66e42134262c8f6851818dd01749d113b9f509
Author: Rob Lourens <roblourens@gmail.com>
Date:   Fri Dec 7 12:45:08 2018 -0800

    Remove TPromise.join #64598

commit 6b82f6b1dd1053f33e6710370ff2d4872c68040f
Author: Rob Lourens <roblourens@gmail.com>
Date:   Fri Dec 7 12:32:13 2018 -0800

    Remove TPromise.as - #64597

commit 86972072333ae211836b21b2c750e6f9d3a724ff
Author: Rob Lourens <roblourens@gmail.com>
Date:   Fri Dec 7 12:27:46 2018 -0800

    Remove TPromise#wrap calls #64596

commit 9c653adad32d5eb8761562d66dac91cbf3d7de96
Author: Matt Bierner <matb@microsoft.com>
Date:   Fri Dec 7 11:26:23 2018 -0800

    Avoid accessing style in treeview if we don't need to (#64577)

    Fixes #64576

    We compute the style of an element to access its left padding. However this value is only used when `horizontalScrolling` is enabled.

    With this change,  we only compute the style when `horizontalScrolling` is true

commit 35f96ebe3c40480719d2cf6943df279db61e9e6e
Author: Rob Lourens <roblourens@gmail.com>
Date:   Fri Dec 7 10:36:12 2018 -0800

    Bump to 1.31

commit e27511826f363156c616e5facbb60702e40b79f3
Author: Rachel Macfarlane <ramacfar@microsoft.com>
Date:   Fri Dec 7 10:20:54 2018 -0800

    Add GitErrorCode to apply command

commit 1054c555b5889e6479544c68357d38d047605969
Merge: e42a2a21da 2f981e93d2
Author: Daniel Imms <tyriar@tyriar.com>
Date:   Fri Dec 7 10:01:59 2018 -0800

    Merge pull request #64558 from marchenko-am/marchenko-am/fix64379

    Fix #64379 - SimpleFindWidget position was changed (in hidden state)

commit e42a2a21dab434a81a16aefbec2e75b26030941e
Merge: 533f3dd8a6 13d1149f2c
Author: Daniel Imms <tyriar@tyriar.com>
Date:   Fri Dec 7 10:00:41 2018 -0800

    Merge pull request #64243 from Microsoft/tyriar/63688

    Set default terminal buffer impl to TypedArray

commit 533f3dd8a6f7fc7510c374874e84daa9c7413909
Merge: 86adcc7fcf dc86cf5ef9
Author: Daniel Imms <tyriar@tyriar.com>
Date:   Fri Dec 7 10:00:16 2018 -0800

    Merge pull request #64560 from Microsoft/tyriar/null_check_initialCwd

    Add a null check for initialCwd

commit 86adcc7fcfca511b2d5c45a6ca76282e7dad40f8
Merge: cacac16d47 51c8c8c495
Author: Daniel Imms <tyriar@tyriar.com>
Date:   Fri Dec 7 10:00:02 2018 -0800

    Merge pull request #64611 from Microsoft/tyriar/64598

    Convert backup tpromise.join to promise.all

commit cacac16d47b1cb71278cdccf35c208e87450e934
Author: Kai Maetzel <kieferrm@gmail.com>
Date:   Fri Dec 7 09:51:42 2018 -0800

    Allow users to enable/disable automatic tasks (#64615)

    add allow/disallow tasks

commit 51c8c8c4955bf0fa1a979d609c0c442a3bccd0d0
Author: Daniel Imms <daimms@microsoft.com>
Date:   Fri Dec 7 08:17:30 2018 -0800

    Convert backup tpromise.join to promise.all

    Part of #64598

commit 13effd40e0869c2a2aaa16b6741c445abc86e2e4
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Fri Dec 7 15:06:56 2018 +0100

    yield when computing bracket ranges

commit e1f986f1278bcb811422f1e0b278dffdce6a4e4b
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Fri Dec 7 14:34:01 2018 +0100

    fix bracket selection issues

commit 5e3a8ca975ad82817949cbc167a4097a2f9c802f
Author: Christof Marti <chrmarti@microsoft.com>
Date:   Fri Dec 7 14:09:56 2018 +0100

    Update commands.yml

commit a152a5c7818a13666a5879b4450eb26a4d45fbde
Author: Alex Ross <alros@microsoft.com>
Date:   Fri Dec 7 11:11:34 2018 +0100

    Add task names to automatic task notification

    Fixes #64427

commit 86571ec5a50b5bce09db45f458b407b77a33674a
Author: Rob Lourens <roblourens@gmail.com>
Date:   Thu Dec 6 21:44:50 2018 -0800

    Fix results lost from FileSearchProvider when maxResults is returned

commit 5562872fead3a01ddcb7f593e375b94ddbcaaf1b
Author: Matt Bierner <matb@microsoft.com>
Date:   Thu Dec 6 20:09:23 2018 -0800

    Remove workaround for ts infer type suggestions showing up with no quick fix

    This should not be needed now that we are shipping TS 3.2.2

commit d2d7fec5df57509a082f85bcf6be91baabfa91e2
Author: Matt Bierner <matb@microsoft.com>
Date:   Thu Dec 6 18:19:52 2018 -0800

    Pick up ts 3.2.2

commit 07f6967a6846e583c481998b987416841f0df022
Author: Matt Bierner <matb@microsoft.com>
Date:   Thu Dec 6 16:26:39 2018 -0800

    Cache document symbol navtree requests

    Fixes #64570

commit 99929b581d2f67733e4a46d9f67c90032aecd4ef
Author: Christof Marti <chrmarti@microsoft.com>
Date:   Thu Dec 6 21:30:50 2018 +0100

    Prevent default on mouse down (fixes #64350)

commit dc86cf5ef9197153d116ef56d9edbe74953644ee
Author: Daniel Imms <daimms@microsoft.com>
Date:   Thu Dec 6 11:45:10 2018 -0800

    Add a null check for initialCwd

commit 6dcd4366c2dfdf1662ae84a0d0333eb3eae57f6d
Author: SteVen Batten <stbatt@microsoft.com>
Date:   Thu Dec 6 11:31:48 2018 -0800

    initialize focus state
    fixes #64500

commit bc979264d044c152f4258b6d24b9fcb20afa99ca
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Thu Dec 6 20:20:25 2018 +0100

    #64557 Do not hide tree also when tree is being refreshed

commit a988c5e8c56ce9c532b8721c6b46213e841e834a
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Thu Dec 6 20:05:28 2018 +0100

    Fix #64557

commit 9be224980c486648f5f0d7c12f3dcaad19ca65ad
Author: Rob Lourens <roblourens@gmail.com>
Date:   Thu Dec 6 11:02:09 2018 -0800

    Make LogLevel converters safer and consistent with other converters, from @jrieken feedback

commit 2f981e93d2cd17808c7de0b7c00c42aa0d57f39d
Author: Marchenko Anton <fattan@ya.ru>
Date:   Thu Dec 6 21:22:38 2018 +0300

    Fix #64379 - SimpleFindWidget position was changed (in hidden state) for shadow hiding

commit b2e8dcc412a704e410fcd12b794c4c0474deb5ad
Author: isidor <inikolic@microsoft.com>
Date:   Thu Dec 6 18:42:09 2018 +0100

    Revert #54397

    This reverts commit a8e6a91993966f696dae6303ad95014130e7acb6.

commit bdd4c66451ec696b9fa8224023daf1b58d9022b6
Author: isidor <inikolic@microsoft.com>
Date:   Thu Dec 6 18:26:33 2018 +0100

    fixes #64463

commit 32f99fba83587a422f2a32e36e198686b4839cfc
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Thu Dec 6 17:24:39 2018 +0100

    use findNext/PrevBracket for bracket ranges only

commit f0f4950adcddec313b81bdec68ea125af079cc08
Author: Alex Ross <alros@microsoft.com>
Date:   Thu Dec 6 17:11:37 2018 +0100

    Promise.reject in configurationResolverService should return an Error

    Fixes #64550

commit 5b47ccfaa48cab60f5589dcbdb617cf3ed94c4e1
Author: Christof Marti <chrmarti@microsoft.com>
Date:   Thu Dec 6 17:08:46 2018 +0100

    Update commands.yml

commit ee3d459a8a4169e0e954753583fc45e858629481
Author: Alex Ross <alros@microsoft.com>
Date:   Thu Dec 6 16:28:28 2018 +0100

    Regression: cancelling a launch command should silently cancel launch

    Fixes #64547

commit d3cf960290beae17aa274c02b7ff2e8b83e71c05
Author: Christof Marti <chrmarti@microsoft.com>
Date:   Thu Dec 6 15:50:26 2018 +0100

    Update commands.yml

commit 332ab7f6a62d48bdfe997517aecb682d73d5632c
Author: Christof Marti <chrmarti@microsoft.com>
Date:   Thu Dec 6 15:35:28 2018 +0100

    Update commands.yml

commit 44f53f369428352b4a5d0876b142e3e5d142cd46
Author: Christof Marti <chrmarti@microsoft.com>
Date:   Thu Dec 6 15:30:55 2018 +0100

    Add '/needsConfirmation'

commit 0bc965752d99b670ce1ebb9c0d90e5543b588d9b
Author: Alex Ross <alros@microsoft.com>
Date:   Thu Dec 6 15:13:39 2018 +0100

    Don't show tasks output on auto task or config change (#64543)

    Fixes #64040

commit 9576945606d719b0057f5f7d6194196ed56acf0f
Author: Andre Weinand <aweinand@microsoft.com>
Date:   Thu Dec 6 15:09:16 2018 +0100

    protect input variable resolving against undefined mapping; fixes #64542

commit ac92a9a14552ceaf205850f9637169d5a7946847
Author: isidor <inikolic@microsoft.com>
Date:   Thu Dec 6 14:20:19 2018 +0100

    fixes #64398

commit cf0879dd27aa7a52e431c5dafcb55604add6c8d9
Author: isidor <inikolic@microsoft.com>
Date:   Thu Dec 6 14:11:07 2018 +0100

    repl: reveal last element when session change

    fixes #64397

commit 530e1b892bbdebc56939edd63188c52d6273a0cc
Author: isidor <inikolic@microsoft.com>
Date:   Thu Dec 6 12:35:23 2018 +0100

    repl: simplify id computation for simple elements

    fixes #64460

commit fa7e51a33334e31a7913ccc4d81903af87451bdf
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Thu Dec 6 12:29:27 2018 +0100

    disable listener leak monitor for stable, #64493

commit 4978a75210f786ebf0e74b3bc85a7a2d3d0ae243
Author: Alex Ross <alros@microsoft.com>
Date:   Thu Dec 6 12:25:52 2018 +0100

    Add launch section to support input in launch.json

    Fixes #63987 verification-found

commit f6cff39cb4c398eba8e041b5a0f50bd3b33ce6a7
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Thu Dec 6 12:15:37 2018 +0100

    remove `shareSuggestSelections`-setting for now #62365

commit 479d60b6dd334b778408a70dcccb466c02dc6173
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Thu Dec 6 12:12:54 2018 +0100

    make suggest memories a singleton service, listen to storage change events

commit 6cfa67d63370f12f55492805ab1737754280ba2d
Author: isidor <inikolic@microsoft.com>
Date:   Thu Dec 6 12:04:02 2018 +0100

    debug console: polish height computation

    #64336

commit b8088e5c1388f9565feae3f8e795d18a565b8438
Author: Alex Ross <alros@microsoft.com>
Date:   Thu Dec 6 12:03:49 2018 +0100

    Tasks with presentation clear: true and no other presentation options should clear

    Fixes #61592 verification-found

commit 6ea1f72513a50a265a216c3913bdedabefcc0f07
Merge: 351905fd53 d9b2da9fdb
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Thu Dec 6 11:27:24 2018 +0100

    Merge pull request #64496 from Microsoft/ben/62365

    suggest memories: restore saving state periodically (for #62365)

commit d9b2da9fdbd7fbd363c89ec0f1c8572ba4251520
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Thu Dec 6 09:57:50 2018 +0100

    suggest memories: restore saving state periodically (for #62365)

commit 351905fd534abbd66913cb98bb4849f172bf6fbc
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Thu Dec 6 09:43:12 2018 +0100

    fixes #63957

commit d0c114cd68788ea9ca3adc33ee5fd24fa8e41632
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Thu Dec 6 09:36:04 2018 +0100

    fix #64319

commit 464a2e9b7e4319e9e8bd518ae99fa65ea59070c9
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Thu Dec 6 09:35:03 2018 +0100

    #64319 tests

commit 869ed6bd11b38a1e556bd7f9cc99e663f293447c
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Thu Dec 6 07:23:32 2018 +0100

    one more to dispose (for #64470)

commit 2648d760cc607dc4e18e0ccb4078f319dd0a0702
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Thu Dec 6 07:20:16 2018 +0100

    fix telemetry annotations

commit aa2804235ffd8f2fca252d70e007d43c5a4393c5
Author: Matt Bierner <matb@microsoft.com>
Date:   Wed Dec 5 22:18:51 2018 -0800

    Make sure we dispose of created context key (#64471)

    Fixes #64470

commit 048fdbba9505f64f583e9687806582c519fbdb9d
Author: Rob Lourens <roblourens@gmail.com>
Date:   Wed Dec 5 21:03:28 2018 -0800

    Fix #64120 - avoid triggering listener leak warning

commit 1e3dc27c78aa4213315b9772d2207218901bcbb3
Author: Rachel Macfarlane <ramacfar@microsoft.com>
Date:   Wed Dec 5 17:21:13 2018 -0800

    Fix strict null check

commit 268303bd6faec5dd8e540f6a82698f90d690eed0
Author: Rachel Macfarlane <ramacfar@microsoft.com>
Date:   Wed Dec 5 17:06:20 2018 -0800

    Show prompt when closing issue reporter without submitting, fixes #64462

commit 4e0e4b85104a05d001f426e19a287e07bf10b73e
Author: Rob Lourens <roblourens@gmail.com>
Date:   Wed Dec 5 16:12:28 2018 -0800

    Wording tweak

commit 36c4dc33f65e9fe92919567f93ed89d0c058f30a
Author: Matt Bierner <matb@microsoft.com>
Date:   Wed Dec 5 14:33:46 2018 -0800

    Don't capture first line of @example blocks as js/ts

    Fixes #64457

commit 6d0d6713cfbdc9e9265062590f8e8b23959acb5a
Author: Matt Bierner <matb@microsoft.com>
Date:   Wed Dec 5 14:31:53 2018 -0800

    Better end of line match

commit d7af2b0160abac7f90caed8ee87874a19659ccc3
Author: Matt Bierner <matb@microsoft.com>
Date:   Wed Dec 5 14:05:01 2018 -0800

    Use more restrictive regular expression for markdown jsdoc content

    Fixes #64455

commit 514217add57cbe812f6da4b835e1a8da53fe62a7
Author: Rob Lourens <roblourens@gmail.com>
Date:   Wed Dec 5 13:29:15 2018 -0800

    Fix #64273 - EH log levels start at 1

commit 8f7bd57cde638acfa71fbeb0a421629f9fd0e508
Author: Matt Bierner <matb@microsoft.com>
Date:   Wed Dec 5 11:57:35 2018 -0800

    Improve retrigger documentation

    Fixes #64432

commit 0b0b84fda5d002c604a8e7ea7b6c28e385e72645
Author: Rob Lourens <roblourens@gmail.com>
Date:   Wed Dec 5 11:35:32 2018 -0800

    #62365 - use markdownDescription and setting reference

commit ba0fab69e7bc36d5ebde21d9819ce88c23571ed8
Author: kieferrm <kieferrm@gmail.com>
Date:   Wed Dec 5 10:35:35 2018 -0800

    fix GDPR annotations

commit 20edcab22614320ad94dda70f087b69486b6b63f
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Wed Dec 5 18:12:24 2018 +0100

    add link to wiki page, #64340

commit 4eb8eb2f62888fc77126e43dd41c0b70cd833d25
Author: Alex Ross <alros@microsoft.com>
Date:   Wed Dec 5 18:04:55 2018 +0100

    Inputs should not re-prompt on tasks set to not reevaluate variables

commit c70986467ce7cf24efd72de78d27b4c17407f335
Author: Rob Lourens <roblourens@gmail.com>
Date:   Wed Dec 5 08:55:59 2018 -0800

    Revert "#61590 Change the title"

    This reverts commit 22fef36fcfb13643b270119670464efdba80e154.

commit 1b7c673680a1060371579edcbbf1283e3335894b
Author: Rob Lourens <roblourens@gmail.com>
Date:   Tue Dec 4 22:12:08 2018 -0800

    Fix #64331 - relayout on search height change

commit 416e6c5168a95d62a9c48165440d4e73de0e7acf
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Wed Dec 5 17:13:16 2018 +0100

    update ref-view extension

commit bb3b05b5040063edcfbdf9a524e6167fc58c0e93
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Wed Dec 5 16:56:55 2018 +0100

    fixes #64439

commit 8dd8588f8f33f0905d9372cc6d413d21c9fe8989
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Wed Dec 5 16:53:50 2018 +0100

    fix #64437

commit e9253558af92e455958d23e6329320a4c8ea9d99
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Wed Dec 5 16:45:40 2018 +0100

    fix dirtydiff listener leak

    fixes #64238

commit 3f90774b85a7f4ce0185cd6f831c1fd8d67c084a
Author: isidor <inikolic@microsoft.com>
Date:   Wed Dec 5 16:44:53 2018 +0100

    fixes #64320

commit 94bb890e6f4bd1ea8c73a6655e118858eab055f0
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Wed Dec 5 16:36:01 2018 +0100

    fixes #64400

commit 70698ce2ee51374846aaba9f1fc92013a9c6c143
Author: isidor <inikolic@microsoft.com>
Date:   Wed Dec 5 16:31:54 2018 +0100

    fixes #64399

commit 4dae5bb86f9abe8d847aab61c140961834ee1cc8
Author: isidor <inikolic@microsoft.com>
Date:   Wed Dec 5 16:31:44 2018 +0100

    debug: remove baseDebugController, no longer used

commit a4d1f2009b1f191bc9f62223cda63f58ab4c7d23
Author: Andre Weinand <aweinand@microsoft.com>
Date:   Wed Dec 5 15:57:18 2018 +0100

    node-debug@1.30.4

commit 238c48f7b79e9b1b18a711d790ca22d336da9729
Author: Andre Weinand <aweinand@microsoft.com>
Date:   Wed Dec 5 15:55:31 2018 +0100

    use final version 1.33.0 of DAP

commit 1e3e06ae9d6186b10f751d9b6a5bfa2445af7198
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Wed Dec 5 15:48:00 2018 +0100

     async data tree should update twisties accordingly

    fixes #64394
    fixes #64074

commit ec0c9f22e9591f0098e5dca0818428b0f2cebc47
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Wed Dec 5 12:18:52 2018 +0100

    fixes #25281

commit a9802a92475898882fa5a7d0e806439d27296a01
Author: Joao Moreno <joao.moreno@microsoft.com>
Date:   Wed Dec 5 12:05:26 2018 +0100

    fixes #60995

commit 8708222680d13bd3ba7225e94df7d650c589fc9a
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Wed Dec 5 15:45:08 2018 +0100

    Fix #62411 (#64433)

commit 1f172f36a0e8970f8bf13fd7e45a8a3b05fda9b5
Author: Alex Ross <alros@microsoft.com>
Date:   Wed Dec 5 15:01:23 2018 +0100

    Update allow automatic task notification with feedback

    Fixes #64427

commit 22493520d868bf024482ad27e04a0d139d3cce7a
Author: Alex Ross <alros@microsoft.com>
Date:   Wed Dec 5 14:58:40 2018 +0100

    Fix broken config resolver unit tests

commit cb3b378df98998d383e4a2d465a94f4c52574259
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Wed Dec 5 14:47:41 2018 +0100

    Fix #62477

commit 04b7f487935d4db51700712e4371dac26196bcc9
Author: Benjamin Pasero <benjamin.pasero@gmail.com>
Date:   Wed Dec 5 14:44:42 2018 +0100

    put breadcrumbs on their own row (#64364)

    * put breadcrumbs on their own row

    * fix bad wrapping in no-tabs case

commit 5c2aba6258bd7cca3eb70a40a2a97139bf4ea81f
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Wed Dec 5 14:27:34 2018 +0100

    show a warning instead of info, #64353

commit fdafac30e88d33e3dec3315235afca88017d08d9
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Wed Dec 5 14:26:15 2018 +0100

    avoid confusion and use 'operation' instead of 'task', #64353

commit 8565adfe116c76b10c022a14ff639b899d304652
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Wed Dec 5 14:23:54 2018 +0100

    remove keybindings for declaration commands, #64329

commit d8bab72561c5faab283b7be114274317a426882d
Author: Alex Ross <alros@microsoft.com>
Date:   Wed Dec 5 12:57:15 2018 +0100

    Cancelled inputs should cause task to end silently

    Fixes #64342

commit 729a750fd3d194d0fe9f1079bdec98103c37db56
Author: Dirk Baeumer <dirkb@microsoft.com>
Date:   Wed Dec 5 12:38:59 2018 +0100

    Make Alex R. responsible for tasks

commit 8b0480db30493eacb445140af3c6739bad2ddc8b
Author: Alex Ross <alros@microsoft.com>
Date:   Wed Dec 5 12:37:16 2018 +0100

    Should not silently ignore undefined input variables

    Fixes #64354

commit 94f9498cfe42217232e58747787d4747dbad44d1
Author: Alex Ross <alros@microsoft.com>
Date:   Wed Dec 5 12:26:16 2018 +0100

    Improve descriptions in input schema

    Fixes #64361

commit 42bcb665038b3b76345906edadd33614dc1be42f
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Wed Dec 5 12:16:52 2018 +0100

    fix #59439

commit 51ef43a02382fb972b15d5b935515b69bb637a3a
Author: Alex Ross <alros@microsoft.com>
Date:   Wed Dec 5 12:06:48 2018 +0100

    Make task input pick and prompt more specific

    Fixes #64359

commit 69a9abe57af85a693e9963e1a71bba8cbe1abb6e
Author: Johannes Rieken <johannes.rieken@gmail.com>
Date:   Wed Dec 5 12:04:03 2018 +0100

    fix #64339

commit e17f3032f77d7a0f3802cac9bc7f68f3b6f5fe04
Author: Alex Ross <alros@microsoft.com>
Date:   Wed Dec 5 12:01:44 2018 +0100

    Change task input label to id

    Fixes #64356

commit 22fef36fcfb13643b270119670464efdba80e154
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Wed Dec 5 11:33:47 2018 +0100

    #61590 Change the title

commit 85f805acf9436381b878cab5ab6c5146beec7893
Author: Rachel Macfarlane <ramacfar@microsoft.com>
Date:   Tue Dec 4 17:26:45 2018 -0800

    Fix restoring pending comments, fixes https://github.com/Microsoft/vscode-pull-request-github/issues/718

commit ad8d18edf30852403e053d25b51d796b883ea7e4
Author: Matt Bierner <matb@microsoft.com>
Date:   Tue Dec 4 17:06:59 2018 -0800

    Match signature context field name to type name

commit 5010af1171eed02a734ae13f35936fef0fbd7438
Author: Matt Bierner <matb@microsoft.com>
Date:   Tue Dec 4 16:18:30 2018 -0800

    Hide infer type suggestions when using broken versions of ts

    Fixes #64395

commit f52f29d65e38a5108d505cfd5c58bda2a2590818
Author: Matt Bierner <matb@microsoft.com>
Date:   Tue Dec 4 15:54:53 2018 -0800

    Add typings for markdown preview messages

commit a2893ce67830df1f36526ef314087ff09dd02bd5
Author: Matt Bierner <matb@microsoft.com>
Date:   Tue Dec 4 15:42:17 2018 -0800

    Fix markdown fragments when opening file in workspace

    Fixes #64141

commit 89921928d0fc2415cd8a4d282aa9015abbf03952
Author: Matt Bierner <matb@microsoft.com>
Date:   Tue Dec 4 14:05:48 2018 -0800

    Correctly highlight @example code as js/ts

    Fixes #64382

commit a57b55f6105bc666453e14f745dbac69ef29391c
Author: Matt Bierner <matb@microsoft.com>
Date:   Tue Dec 4 11:51:54 2018 -0800

    Revert #62806

commit d9f88f8806c9200971366957f5a6483f3a7e9831
Author: Rachel Macfarlane <ramacfar@microsoft.com>
Date:   Tue Dec 4 10:45:57 2018 -0800

    Ensure expected decimal separator in ps output when listing processes, fixes #63437

commit cd711a51a4159082677cd4e59be22523504034b0
Author: Rob Lourens <roblourens@gmail.com>
Date:   Tue Dec 4 10:34:55 2018 -0800

    Bump distro, update OSS

commit 95b5f886572fbf5b23572840d88c16cc3634389b
Author: SteVen Batten <6561887+sbatten@users.noreply.github.com>
Date:   Tue Dec 4 09:02:18 2018 -0800

    Fix/64292 (#64365)

    * Revert "Revert "Make menubar its own widget and add overflow (#63954)""

    This reverts commit fa87e67ebfd6b8014ba697ddbc6c2d6c0e2cb970.

    * add checks for whencustom menubar is not present

commit 610665d9d5050895a5f92e536ff281b589dd624b
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Tue Dec 4 17:57:47 2018 +0100

    update title

commit f0114b29e60666baae894a109ba6a787cd11b236
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Tue Dec 4 17:56:30 2018 +0100

    #61590 Update title

commit 5083c2b8ca17c000d8d3b5d946ec6488ea9d90dd
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Tue Dec 4 17:37:16 2018 +0100

    :lipstick:

commit 517c4458b1fc0650ba584426857b0c66cd4d87ca
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Tue Dec 4 17:29:01 2018 +0100

    Right fix #63496

commit cefb670307f5149f944bf226073c1e633cc0860e
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Tue Dec 4 17:22:34 2018 +0100

    #63496 rever escaping

commit 9ab1540c57a31167a89ae080d69e1ae031eb6a05
Author: isidor <inikolic@microsoft.com>
Date:   Tue Dec 4 17:15:18 2018 +0100

    debug: support input schema in launch.json

    fixes #63987

commit 9e4b4326d85122db2ba008f5b4f07f107a01da71
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Tue Dec 4 17:15:02 2018 +0100

    editor - cleanup tabs title control (a bit)

commit 9cc278d1c6824dba1be5a2d611f5a8a2a38666e7
Author: Sandeep Somavarapu <sasomava@microsoft.com>
Date:   Tue Dec 4 17:08:54 2018 +0100

    Fix #64341

commit 939d390bc31a074dd793e0b4458496629435083f
Author: Alex Ross <alros@microsoft.com>
Date:   Tue Dec 4 16:53:48 2018 +0100

    Fix undefined error in inputs configuration resolver

    Fixes #4324

commit 66e39a86cd764ccf3adf689aa5a19f2dda22983d
Author: Rob Lourens <roblourens@gmail.com>
Date:   Tue Dec 4 07:37:54 2018 -0800

    Fix PCRE2 description

commit 54c874caf5c77dcfb93ae89eccaebc6b11998323
Author: Alex Ross <alros@microsoft.com>
Date:   Tue Dec 4 12:14:35 2018 +0100

    Intelisense on tasks.json is broken

    Fixes #64207

commit 598f269cc0918b05e12a408b183c8d6a3152eeee
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Tue Dec 4 11:23:08 2018 +0100

    fix #64309

commit fa87e67ebfd6b8014ba697ddbc6c2d6c0e2cb970
Author: Benjamin Pasero <benjpas@microsoft.com>
Date:   Tue Dec 4 10:10:11 2018 +0100

    Revert "Make menubar its own widget and add overflow (#63954)"

    This reverts commit aedd4402fb7eb0022589012f440b059c6b12f12b.

commit 07202fbfb82bdada89472dd4b1c3c699b0eab0b4
Author: Matt Bierner <matb@microsoft.com>
Date:   Mon Dec 3 17:48:21 2018 -0800

    Small fixes to sig help context docs

commit 00828c56c5a19d9f68173fb6fa73486ac2223e70
Merge: f264e8f33b dd6a6aba8e
Author: Rob Lourens <roblourens@gmail.com>
Date:   Mon Dec 3 17:12:40 2018 -0800

    Merge pull request #64271 from cleidigh/selectbox-sticky-off/bug

    SelectBox: Restore _sticky = false. Fixes: #64265

commit dd6a6a…
  • Loading branch information
Anthony Dresser authored and Anthony Dresser committed Mar 2, 2019
1 parent c1e5408 commit d644e50
Show file tree
Hide file tree
Showing 120 changed files with 2,097 additions and 976 deletions.
2 changes: 1 addition & 1 deletion build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"request": "^2.85.0",
"tslint": "^5.9.1",
"service-downloader": "github:anthonydresser/service-downloader#0.1.5",
"typescript": "3.1.4",
"typescript": "3.2.2",
"vsce": "1.48.0",
"xml2js": "^0.4.17"
},
Expand Down
8 changes: 4 additions & 4 deletions build/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2084,10 +2084,10 @@ typed-rest-client@^0.9.0:
tunnel "0.0.4"
underscore "1.8.3"

typescript@3.1.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.4.tgz#c74ef7b3c2da65beff548b903022cb8c3cd997ed"
integrity sha512-JZHJtA6ZL15+Q3Dqkbh8iCUmvxD3iJ7ujXS+fVkKnwIVAdHc5BJTDNM0aTrnr2luKulFjU7W+SRhDZvi66Ru7Q==
typescript@3.2.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==

uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.6"
Expand Down
1 change: 1 addition & 0 deletions extensions/git/src/api/git.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,5 @@ export const enum GitErrorCodes {
WrongCase = 'WrongCase',
CantLockRef = 'CantLockRef',
CantRebaseMultipleBranches = 'CantRebaseMultipleBranches',
PatchDoesNotApply = 'PatchDoesNotApply'
}
10 changes: 9 additions & 1 deletion extensions/git/src/git.ts
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,15 @@ export class Repository {
args.push('-R');
}

await this.run(args);
try {
await this.run(args);
} catch (err) {
if (/patch does not apply/.test(err.stderr)) {
err.gitErrorCode = GitErrorCodes.PatchDoesNotApply;
}

throw err;
}
}

async diff(cached = false): Promise<string> {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"tslint": "^5.11.0",
"tslint-microsoft-contrib": "^6.0.0",
"typemoq": "^0.3.2",
"typescript": "3.1.4",
"typescript": "3.2.2",
"typescript-formatter": "7.1.0",
"typescript-tslint-plugin": "^0.0.7",
"uglify-es": "^3.0.18",
Expand Down
12 changes: 12 additions & 0 deletions resources/linux/code-url-handler.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[Desktop Entry]
Name=@@NAME_LONG@@ - URL Handler
Comment=Code Editing. Redefined.
GenericName=Text Editor
Exec=/usr/share/@@NAME@@/@@NAME@@ --open-url %U
Icon=@@ICON@@
Type=Application
NoDisplay=true
StartupNotify=true
Categories=Utility;TextEditor;Development;IDE;
MimeType=x-scheme-handler/@@URLPROTOCOL@@;
Keywords=vscode;
3 changes: 3 additions & 0 deletions resources/linux/snap/snapUpdate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
sleep 2
@@NAME@@
1 change: 1 addition & 0 deletions src/tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"noUnusedLocals": true,
"noImplicitThis": true,
"alwaysStrict": true,
"strictBindCallApply": true,
"baseUrl": ".",
"paths": {
"vs/*": [
Expand Down
18 changes: 14 additions & 4 deletions src/tsconfig.strictNullChecks.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"./typings",
"./vs/base/common/**/*.ts",
"./vs/base/node/**/*.ts",
"./vs/editor/contrib/smartSelect/**/*.ts",
"./vs/editor/contrib/smartSelect/**/*.ts"
],
"files": [
"./vs/base/browser/browser.ts",
Expand All @@ -31,11 +31,13 @@
"./vs/base/browser/ui/checkbox/checkbox.ts",
"./vs/base/browser/ui/contextview/contextview.ts",
"./vs/base/browser/ui/countBadge/countBadge.ts",
"./vs/base/browser/ui/findinput/findInput.ts",
"./vs/base/browser/ui/findinput/findInputCheckboxes.ts",
"./vs/base/browser/ui/grid/grid.ts",
"./vs/base/browser/ui/grid/gridview.ts",
"./vs/base/browser/ui/highlightedlabel/highlightedLabel.ts",
"./vs/base/browser/ui/iconLabel/iconLabel.ts",
"./vs/base/browser/ui/inputbox/inputBox.ts",
"./vs/base/browser/ui/keybindingLabel/keybindingLabel.ts",
"./vs/base/browser/ui/list/list.ts",
"./vs/base/browser/ui/list/listPaging.ts",
Expand Down Expand Up @@ -291,6 +293,7 @@
"./vs/editor/contrib/dnd/dragAndDropCommand.ts",
"./vs/editor/contrib/find/findDecorations.ts",
"./vs/editor/contrib/find/findModel.ts",
"./vs/editor/contrib/find/findOptionsWidget.ts",
"./vs/editor/contrib/find/findState.ts",
"./vs/editor/contrib/find/replaceAllCommand.ts",
"./vs/editor/contrib/find/replacePattern.ts",
Expand All @@ -310,6 +313,7 @@
"./vs/editor/contrib/folding/test/syntaxFold.test.ts",
"./vs/editor/contrib/fontZoom/fontZoom.ts",
"./vs/editor/contrib/format/format.ts",
"./vs/editor/contrib/format/formatActions.ts",
"./vs/editor/contrib/format/formattingEdit.ts",
"./vs/editor/contrib/goToDefinition/clickLinkGesture.ts",
"./vs/editor/contrib/goToDefinition/goToDefinition.ts",
Expand Down Expand Up @@ -402,6 +406,7 @@
"./vs/platform/configuration/common/configurationModels.ts",
"./vs/platform/configuration/common/configurationRegistry.ts",
"./vs/platform/configuration/node/configuration.ts",
"./vs/platform/configuration/node/configurationService.ts",
"./vs/platform/configuration/test/common/testConfigurationService.ts",
"./vs/platform/contextkey/browser/contextKeyService.ts",
"./vs/platform/contextkey/common/contextkey.ts",
Expand Down Expand Up @@ -440,6 +445,7 @@
"./vs/platform/instantiation/common/instantiationService.ts",
"./vs/platform/instantiation/common/serviceCollection.ts",
"./vs/platform/instantiation/node/instantiationService.ts",
"./vs/platform/instantiation/test/common/instantiationServiceMock.ts",
"./vs/platform/integrity/common/integrity.ts",
"./vs/platform/integrity/node/integrityServiceImpl.ts",
"./vs/platform/issue/common/issue.ts",
Expand Down Expand Up @@ -500,7 +506,7 @@
"./vs/platform/statusbar/common/statusbar.ts",
"./vs/platform/storage/common/storage.ts",
"./vs/platform/storage/common/storageLegacyService.ts",
//"./vs/platform/storage/node/storageService.ts", TODO@Ben bring back when storageMigration is removed
"./vs/platform/storage/node/storageMainService.ts",
"./vs/platform/telemetry/browser/errorTelemetry.ts",
"./vs/platform/telemetry/common/telemetry.ts",
"./vs/platform/telemetry/common/telemetryService.ts",
Expand All @@ -524,6 +530,7 @@
"./vs/platform/url/common/urlService.ts",
"./vs/platform/url/electron-main/electronUrlListener.ts",
"./vs/platform/url/node/urlIpc.ts",
"./vs/platform/widget/browser/contextScopedHistoryWidget.ts",
"./vs/platform/widget/common/contextScopedWidget.ts",
"./vs/platform/windows/common/windows.ts",
"./vs/platform/windows/electron-browser/windowService.ts",
Expand All @@ -548,6 +555,8 @@
"./vs/workbench/browser/actions/toggleStatusbarVisibility.ts",
"./vs/workbench/browser/actions/toggleTabsVisibility.ts",
"./vs/workbench/browser/actions/toggleZenMode.ts",
"./vs/workbench/browser/composite.ts",
"./vs/workbench/browser/panel.ts",
"./vs/workbench/browser/part.ts",
"./vs/workbench/browser/parts/editor/editorWidgets.ts",
"./vs/workbench/browser/parts/notifications/notificationsAlerts.ts",
Expand Down Expand Up @@ -595,7 +604,6 @@
"./vs/workbench/parts/extensions/common/extensions.ts",
"./vs/workbench/parts/extensions/common/extensionsFileTemplate.ts",
"./vs/workbench/parts/extensions/electron-browser/extensionsActivationProgress.ts",
// "./vs/workbench/parts/extensions/electron-browser/extensionsAutoProfiler.ts",
"./vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts",
"./vs/workbench/parts/logs/common/logConstants.ts",
"./vs/workbench/parts/logs/electron-browser/logs.contribution.ts",
Expand All @@ -615,6 +623,7 @@
"./vs/workbench/parts/relauncher/electron-browser/relauncher.contribution.ts",
"./vs/workbench/parts/scm/common/scm.ts",
"./vs/workbench/parts/scm/electron-browser/scmUtil.ts",
"./vs/workbench/parts/search/browser/patternInputWidget.ts",
"./vs/workbench/parts/search/common/constants.ts",
"./vs/workbench/parts/search/common/queryBuilder.ts",
"./vs/workbench/parts/snippets/electron-browser/configureSnippets.ts",
Expand Down Expand Up @@ -661,6 +670,7 @@
"./vs/workbench/services/configuration/common/configurationModels.ts",
"./vs/workbench/services/configuration/common/jsonEditing.ts",
"./vs/workbench/services/configurationResolver/common/configurationResolver.ts",
"./vs/workbench/services/configurationResolver/common/configurationResolverSchema.ts",
"./vs/workbench/services/configurationResolver/common/configurationResolverUtils.ts",
"./vs/workbench/services/crashReporter/electron-browser/crashReporterService.ts",
"./vs/workbench/services/decorations/browser/decorations.ts",
Expand Down Expand Up @@ -738,4 +748,4 @@
"exclude": [
"./typings/require-monaco.d.ts"
]
}
}
Loading

0 comments on commit d644e50

Please sign in to comment.