development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
18857 commits 1076 branches 296 tags 1.2 GiB
Commit graph

2534 commits

Author SHA1 Message Date
Phil Price b1b9619644 Cleanup and comment conflict parsing code 2017-05-23 09:02:38 -07:00
Phil Price 191fc7c9d9 Remove git merge conflict decorator 2017-05-22 18:40:14 -07:00
Phil Price 49ee140410 Remove legacy parser 2017-05-22 18:38:42 -07:00
Phil Price 1535f99ffe Update accept actions for new conflict parser 2017-05-22 18:31:04 -07:00
Phil Price 4dcf156655 Update compare command 2017-05-22 17:42:26 -07:00
Phil Price 76b6b177b5 Add line by line parser for merge conflicts. 
Prior implementation in mergeConflictParserLegcacy which does a one shot regular expression.
 2017-05-22 17:07:42 -07:00
Phil Price 59fbe319a1 Formatting change 2017-05-22 17:06:30 -07:00
Phil Price f4c0e976e2 Add temporary timing logging to merge conflict scanning 2017-05-22 17:06:07 -07:00
Phil Price fd94a29f3a Localization for codelens and warning messages. 2017-05-22 14:21:36 -07:00
Phil Price a8fe17a808 Update codelens peer command names 2017-05-22 14:10:46 -07:00
Phil Price e9bb38e81a Rename content provider to match extension name 2017-05-22 14:05:31 -07:00
Phil Price 83fd45c45d Command titles and category localization support 2017-05-22 14:04:51 -07:00
Phil Price 61f16319ab Initial merge of 'better-merge' extension into core extensions. 
- 'better-merge' command and setting namespace replaced with 'merge-conflict'
 - Configuration settings from extension replaced with single 'merge-conflicts.enabled' : boolean setting
 2017-05-22 13:56:18 -07:00
Jan Niklas Hasse 146c76df36 Use pre-#25570 fonts as a fallback for system-ui (#26912) 
Workaround for:
https://bugs.chromium.org/p/chromium/issues/detail?id=724393
 2017-05-22 11:57:54 +02:00
Martin Aeschlimann 764dab3629 Merge pull request #26992 from luxifer/php-language-tests 
Add more tests to PHP grammar
 2017-05-22 11:26:24 +02:00
isidor 16b3399e17 hc theme status bar: back to black like amy winehouse 2017-05-22 11:05:50 +02:00
Florent Viel 310bcbc400
fix tests 2017-05-20 13:19:25 +02:00
Florent Viel b090499274
update tes tests to show off function name with nbsp 2017-05-20 13:08:09 +02:00
Dirk Baeumer 87cfa19524 Fixes #25518: Cannot associate a problem matcher with an auto detected tasks 2017-05-19 17:38:57 +02:00
Benjamin Pasero 52212f2a2e 💄 2017-05-19 12:21:36 +02:00
Kaide Mu 09c97bca0f Markdown: Capture right parenthesis as part of url (#26449) 
* Capture right parenthesis as part of url

* Update markdown link pattern

* Fix link highlighting when there is nested img and link href
 2017-05-18 22:06:27 -07:00
Matt Bierner b73e961439 Split tracer out into own file 2017-05-18 22:04:33 -07:00
Matt Bierner cdaa5f28ef Record when tsserver exits with code or errors 2017-05-18 21:35:15 -07:00
Matt Bierner b8b81b73b4 add tsserver.debug option 2017-05-18 17:34:58 -07:00
Matt Bierner 6d8e64ee3f Add error handler for reader 2017-05-18 17:34:58 -07:00
Matt Bierner 288968f803 Fix duplicate code ids names being uploaded to ts 2017-05-18 17:34:58 -07:00
Matt Bierner 7c2d2c37eb Mark a few members readonly 2017-05-18 17:34:58 -07:00
Matt Bierner 7d2739bfe4 Remove some unused functions in reader 2017-05-18 17:34:58 -07:00
Matt Bierner 89f1f02286 Use correct reporter instance 2017-05-18 15:20:13 -07:00
Matt Bierner 8dd07034c0 Split reporter out into own file 2017-05-18 15:17:42 -07:00
Martin Aeschlimann 3d581324cb [xml] update grammar 2017-05-18 15:41:33 +02:00
Martin Aeschlimann 767b146e26 [swift] update grammar 2017-05-18 15:41:33 +02:00
Martin Aeschlimann 486d6e1f00 [shaderlab] update grammar 2017-05-18 15:41:33 +02:00
Martin Aeschlimann 6b48d58387 [rust] update grammar 2017-05-18 15:41:33 +02:00
Martin Aeschlimann b2c10e50c8 [ruby] update grammar 2017-05-18 15:41:33 +02:00
Martin Aeschlimann 5a700f5a84 [r] add update grammar script 2017-05-18 15:41:33 +02:00
Martin Aeschlimann 72cb93c60e [html] update grammar 2017-05-18 15:41:33 +02:00
Martin Aeschlimann 8ae8cd5b6f [groovy] add grammar update script 2017-05-18 15:41:33 +02:00
Martin Aeschlimann 7728b701bd [go] update grammar 2017-05-18 15:41:32 +02:00
Martin Aeschlimann fb84773f76 [git] add grammar update script 2017-05-18 15:41:32 +02:00
Martin Aeschlimann f1abf5ad11 [f#] update grammar 2017-05-18 15:41:32 +02:00
Martin Aeschlimann 7efdde8060 [diff] update grammar 2017-05-18 15:41:32 +02:00
Martin Aeschlimann c33d2824cc [java] switch to atom/language-java grammar 2017-05-18 12:04:24 +02:00
Martin Aeschlimann 795edc34d2 [coffee] update grammar 2017-05-18 12:04:24 +02:00
isidor 7e03c9d106 hc theme - improve colors (inspired by high contrast ms word) 2017-05-18 11:16:44 +02:00
Martin Aeschlimann 57570d5cb7 [php] update grammar (fixes #26543) 2017-05-18 11:12:13 +02:00
Martin Aeschlimann ae333a8b41 test fixes for #17178 2017-05-18 10:50:30 +02:00
Martin Aeschlimann 8b77c7170f [less] update grammar 2017-05-18 10:35:53 +02:00
Martin Aeschlimann bd77d243b4 [scss] update grammar (fies #26837) 2017-05-18 10:35:53 +02:00
isidor 8a1fab94a2 hc black: use more token colors (same as dark+) 
fixes #17178
 2017-05-18 10:08:02 +02:00