development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-20 02:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
24414 commits 1080 branches 296 tags 1.3 GiB
Commit graph

3574 commits

Author SHA1 Message Date
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
Alexandru Dima 8cba35dd0f Merge pull request #34486 from myEditor/master 
Updated the license to MIT
 2017-09-27 11:32:19 +02:00
Johannes Rieken 6d00916e01 improve warning for bad links, #35017 2017-09-27 10:54:25 +02:00
Matt Bierner 60470a533b Relax check on TS path completion trigger 2017-09-26 13:24:37 -07:00
Ramya Achutha Rao a0139b47f4 Allow emmet in script tag if mimetype is html, plain or x-template #34921 2017-09-26 11:40:47 -07:00
Matt Bierner 4dd1244c0a Fix referenceLink detection for unicode 
https://github.com/Microsoft/vscode/issues/33714#issuecomment-332207865https://github.com/Microsoft/vscode/issues/33714#issuecomment-332207865

Fixes #33714
 2017-09-26 10:31:19 -07:00
Martin Aeschlimann a2d1bbbe6f [css/thml] update language services (reduce footprint) 2017-09-26 12:29:09 +02:00
kieferrm 08d8f0f9f6 indentation changes 2017-09-25 18:36:43 -07:00
kieferrm 9d5589dbf4 update GDPR todos 2017-09-25 18:36:43 -07:00
kieferrm fbb3e25987 omit endPoint where it defaults to none 2017-09-25 18:36:43 -07:00
kieferrm 32282d2be9 GDPR classification for git extension 2017-09-25 18:36:43 -07:00
kieferrm 8705413bf9 gdpr classification for markdown extension 2017-09-25 18:36:43 -07:00
kieferrm 4ef3ba3972 classification for TS extension 2017-09-25 18:36:43 -07:00
Ramya Achutha Rao 43c99472b9 Use bem preferences #33631 2017-09-25 17:20:25 -07:00
Matt Bierner 754738ca4b Special case TS dev version detection 
Allow pointing to a TS local build without setting `tsdk_version`

Fixes #33977
 2017-09-25 15:32:24 -07:00
Ramya Achutha Rao 67df88dbce Enable emmet inside script tag if mimetype is html Fixes #34921 2017-09-25 15:09:54 -07:00
Martin Aeschlimann ab4cc0d187 [fsharp] add folding region markers and snippets 2017-09-25 23:25:05 +02:00
Martin Aeschlimann 595010f896 [swift] fix invalid characters in snippets 2017-09-25 23:12:02 +02:00
Martin Aeschlimann 9aa5965a3c [html] fix invalid characters in snippets 2017-09-25 23:11:46 +02:00
Martin Aeschlimann f0281ddc2d [ts] invalid tab characters in snippets 2017-09-25 23:10:30 +02:00
Martin Aeschlimann 4ce7921c7a [folding] c & cpp snippets for folding region markers 2017-09-25 23:08:25 +02:00
Martin Aeschlimann 45251543b9 [folding] snippets for folding markers 2017-09-25 23:00:02 +02:00
Arthur Ozga c8f5358f36 report tsserver response error as telemetry (#34860) 2017-09-25 13:33:35 -07:00
Martin Aeschlimann 777fddd4f7 [folding] add folding marker to API and schema 2017-09-25 22:25:45 +02:00
Ramya Achutha Rao 5ae1dc4496 Pull fixes for #33994 and #34906 2017-09-25 11:54:23 -07:00