development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
19030 commits 1048 branches 294 tags 1.3 GiB
Commit graph

21 commits

Author SHA1 Message Date
Christof Marti d516c32ecb Build requires second argument to localize to be a string literal 2017-05-23 15:57:42 -07:00
Phil Price 7966de7ac9 Track document changes per callee 
It is possible in the open / activate event cycle that we end up doing a double push of decorator changes to the editor, as both events pending on to the same delayed operation.
 2017-05-23 12:54:51 -07:00
Phil Price d94a07d085 Remove performance logging 2017-05-23 11:55:27 -07:00
Phil Price ec7c65cdc4 Localize compare conflict window title 2017-05-23 11:55:03 -07:00
Phil Price 61a8de29c3 Remove proposed api references, update configuration title localization. 2017-05-23 11:54:43 -07:00
Phil Price 537deb5209 Change document tracker to be opted out of per callee origin. 2017-05-23 11:29:53 -07:00
Phil Price aba193c3a4 Ensure that changing codeLens.enabled responds immediately 2017-05-23 09:57:41 -07:00
Phil Price 8f4e1f532d Update extension configuration options 2017-05-23 09:50:23 -07:00
Phil Price e27196db32 Update setting section name 2017-05-23 09:06:26 -07:00
Phil Price b1b9619644 Cleanup and comment conflict parsing code 2017-05-23 09:02:38 -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