Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
31,922 Commits 3,672 Branches 359 Tags
4da73864453db509ad55f36b5ffc8a2aecc5b08f
Commit Graph

50 Commits

Author SHA1 Message Date
Matt Bierner
308c1887df Update extensions for TS 2.7 
Update src to build with TS 2.7

Explicitly assign this.message in the else body
 2018-02-08 14:28:55 -08:00
Dirk Baeumer
04594c864b Add support for Language Packs 2018-01-25 21:14:34 +01:00
Christof Marti
1f064796b8 Register content provider (again) (fixes #40557) 2018-01-10 14:52:52 +01:00
Sergey Kintsel
31baddd594 Fix typo in MergeDecorator class name 2018-01-08 12:09:08 +01:00
Matt Bierner
7ac8e49eb0 Add additional no unused checks for merge-conflict extension 2017-11-07 11:22:08 -08:00
Erich Gamma
b94569fe0d tslint5 adoption - fix semicolon rule 2017-11-07 12:08:22 +01:00
Matt Bierner
cd00b590a8 Enable strict in a few more extensions 2017-11-06 11:40:05 -08:00
Christof Marti
af9f708041 Only register for file: and untitled: (fixes #33133) 2017-08-30 15:39:13 -07:00
t-amqi
20cf247927 Spelling fixes 2017-08-09 10:41:18 -07:00
Christof Marti
8da3ea97ab Use original scheme (fixes #29872) 2017-06-29 12:26:33 -07:00
Michel Kaporin
ab3c945e0e Import 'nls' in extensions entry point. Fixes #29098. 2017-06-28 16:01:23 +02:00
Christof Marti
d9d481afcd Fix background decorations (fixes #28368) 2017-06-26 11:14:30 -07:00
Christof Marti
f7f7d7400d Support GNU patch --merge results (fixes #28360) 2017-06-26 10:18:41 -07:00
Christof Marti
5b4f203e16 Remove unnecessary dependencies 2017-06-20 14:09:20 -07:00
Christof Marti
e75ff7dc9f Register regular commands and look up active editor (fixes #27584, fixes #27585) 2017-06-19 18:40:11 -07:00
Christof Marti
996af4d965 Workbench colors (#28507) 2017-06-12 17:21:29 -07:00
Kate Miháliková
ab52889793 Handle diff3-style merge correctly (#27405) 2017-06-12 17:18:10 -07:00
Christof Marti
a88d97d63e Title case (#27569) 2017-06-02 14:23:48 -07:00
Christof Marti
c43cc5f0eb Use outlines in high contrast (#27580) 2017-06-01 10:10:59 -07:00
Christof Marti
09ce1ccb2b Make sure we don't apply decorations to disposed editors 2017-05-31 11:50:20 -07:00
Christof Marti
00fe733367 Make sure we decorate all visible editors (fixes #27574) 2017-05-31 11:41:02 -07:00
Christof Marti
fc2d062f99 Comment 2017-05-31 11:16:06 -07:00
Christof Marti
c45f29b2b3 Track pending updates per editor (fixes #27570) 2017-05-31 11:14:45 -07:00
Christof Marti
e0c1e7d242 Title case (fixes #27569) 2017-05-31 11:06:43 -07:00
Christof Marti
005c78dbf0 Title case (fixes #27569) 2017-05-31 10:39:36 -07:00
Christof Marti
6aa3aca8cc Remove extra package.json (fixes #27754) 2017-05-31 10:39:36 -07:00
Martin Aeschlimann
ee52cacaf6 Consistent name for overviewRuler.currentContentForeground. Fixes #27756 2017-05-31 17:49:31 +02:00
Eric Amodio
bf1521ab82 Fixes #27364 - title showing \u2194 instead of ⟷ 2017-05-29 22:15:31 -07:00
Christof Marti
c81df3a4f4 Use 'descriptionForeground' (#27289) 2017-05-26 09:28:03 +02:00
Christof Marti
2b7cf86439 Extract merge-conflict colors as workbench colors (#27299) 2017-05-26 09:27:59 +02:00
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
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