3598 Commits

Author SHA1 Message Date
Brendan Forster
b1407a87b0 disable lookup for GitHub's version of Git
If the classic GitHub for Windows (creatively named github.exe) is installed alongside the new GitHub Desktop (which installs a github.bat file to PATH), we can get into the situation where Code can ask the GUI to authenticate for a private repository, which it doesn't understand.
2017-10-10 18:04:14 +11:00
Martin Aeschlimann
24d7998be7 Merge pull request #35919 from pr-yemibedu/master
expand editor code region styles - fsharp
2017-10-09 21:46:12 +02:00
Martin Aeschlimann
425f51dd75 Merge pull request #35830 from innerlee/patch-2
Region fold in python
2017-10-09 21:44:53 +02:00
prog-rajkamal
214437bd75 Fix #35322: Modenrize javascript snippets (#35444) 2017-10-09 12:32:38 -07:00
Matt Bierner
0bd33bbd96 Use strict versions for @types. Fixes #35561 2017-10-09 11:21:00 -07:00
Yemi Bedu @ P&R
d95f9a43c4 expand editor code region styles
Expand editor code region styles. Allow a space after the leading comment indicator. Allow both single line and block comments.
Examples:
 // #region name
(* region name *)
2017-10-09 12:08:11 -04:00
Matt Bierner
d06bf76099 Update js/ts grammar
Fixes #35768
Fixes #35639
2017-10-09 08:46:43 -07:00
Joao Moreno
58b990f3ef be more careful with git init
fixes #35902
2017-10-09 14:52:10 +02:00
lizz
335bce9302 fix indentation 2017-10-08 22:00:44 +08:00
lizz
f5c051e611 Region fold in python
using `#region` and `#endregion`
2017-10-08 21:08:48 +08:00
Ramya Achutha Rao
f53b3556a8 Get latest emmet helper 2017-10-05 10:20:04 -07:00
Ramya Achutha Rao
aafdfaec2a Use strict version-identifier for @types/node in emmet #35561 2017-10-04 10:37:10 -07:00
Martin Aeschlimann
c9177061d4 update php colorizer tests 2017-10-04 18:17:30 +02:00
Martin Aeschlimann
e671ee9722 Improved fix for #23850 2017-10-04 18:17:30 +02:00
Benjamin Pasero
722ad8026a fix tests 2017-10-04 18:04:15 +02:00
Joao Moreno
6a6b589eb8 fix compile errors 2017-10-04 15:43:48 +02:00
Joao Moreno
9b7a6b6fb9 fixes #35513 2017-10-04 15:01:32 +02:00
Benjamin Pasero
971d7b642f fix tests 2017-10-04 15:01:20 +02:00
Joao Moreno
bb23d1244e lock git @types deps
related to #35561
2017-10-04 13:38:41 +02:00
Benjamin Pasero
3dd4318683 Confusing explanation for activeEditorMedium in window.title setting (fixes #35534) 2017-10-04 12:05:52 +02:00
Martin Aeschlimann
12d4925c72 Use strict version-identifier for @types/xyz-modules . For #35561 2017-10-04 11:25:45 +02:00
Martin Aeschlimann
e0a5d736aa Merge branch 'master' of https://github.com/Microsoft/vscode 2017-10-04 10:40:43 +02:00
Johannes Rieken
bdbc992e29 Using strict version-id for @types-modules, #35561 2017-10-04 10:33:38 +02:00
Martin Aeschlimann
f319787f7d [themes] Selection highlight color is too similar to the selection color on Monokai. Fixes #20577 2017-10-03 17:33:42 +02:00
Joao Moreno
bcb3e0d00e detect conflict markers when staging
fixes #33983
2017-10-03 10:21:20 +02:00
Markus Wolf
24a31523f9 Merge remote-tracking branch 'upstream/master' into git-clone-with-url 2017-10-02 12:24:56 +02:00
Markus Wolf
855a55d755 fix: use single remote automatically
If there is only one remote configured just use it instead of aksing the user which remote to use.

Closes #35373
2017-10-02 11:31:59 +02:00
Rob Lourens
f31c369c3b Update PHP grammar 2017-09-30 18:18:59 -07:00
Matt Bierner
1bfad134b0 Set NODE_PATH when forking TS server
The ensures that we can resolve require('typescript') inside of plugins correctly
2017-09-29 13:49:09 -07:00
Ramya Achutha Rao
caa5656df9 Absorb fix for bem modifier customization in emmet 2017-09-28 21:45:20 -07:00
Johannes Rieken
932764a7e2 mark @types/node as dev-dependency 2017-09-28 15:01:03 +02:00
Joao Moreno
3b76085a6c fixes #35216 2017-09-28 11:51:40 +02:00
Joao Moreno
a13fdcbf50 Repository.close
fixes #35041
2017-09-28 11:09:44 +02:00
Martin Aeschlimann
77e7b0a17e [css/html] update service 2017-09-28 10:54:04 +02:00
Joao Moreno
ae7e9613ce fixes #34358 2017-09-28 10:05:20 +02:00
Ramya Achutha Rao
70fed03068 Revert damage from npm 5 2017-09-27 23:27:04 -07:00
Ramya Achutha Rao
9f042bf99c Activate Emmet on type instead of * #35120 2017-09-27 22:31:17 -07:00
Matt Bierner
70f61972aa Pick up TS 2.5.3 final release 2017-09-27 18:47:08 -07:00
Ramya Achutha Rao
67174e8b95 Fixes #35267 2017-09-27 15:35:42 -07:00
Matt Bierner
34cb8ff33c Disable auto complete on quotes since this now gets in the way for path quick suggestions 2017-09-27 13:50:46 -07:00
Matt Bierner
384360917a Use npm 4 for markdown shrinkwrap
Fixes https://github.com/Microsoft/vscode/issues/35215
2017-09-27 11:07:14 -07:00
Rob Lourens
d69910e8a5
Fix markdownItPlugins string 2017-09-27 10:30:22 -07:00
Joao Moreno
5b3d47b0bb fixes #35044 2017-09-27 17:20:04 +02:00
Joao Moreno
826c2ae009 fix #33692 2017-09-27 16:47:42 +02:00
Alexandru Dima
e06c6a67ec Merge pull request #34303 from rinqu-eu/master
Add indentationRules to lua
2017-09-27 12:25:08 +02:00
Joao Moreno
1ca31aa6db git.ignore should detect workspaces
fixes #35176
2017-09-27 12:23:42 +02:00
Alex Dima
f8dce3151a Merge remote-tracking branch 'origin/master' into rinqu-eu-master 2017-09-27 12:22:33 +02:00
Alexandru Dima
b31a0f008a Merge pull request #31696 from jep-a/patch-1
Add "indentationRules" for Lua
2017-09-27 12:20:19 +02:00
Alex Dima
e95122f45e No need to inline license details, as they can be fetched from the repo 2017-09-27 12:08:55 +02:00
Alex Dima
aa9952edb7 Fix after PR #34486 and run OSS tool 2017-09-27 11:54:14 +02:00