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
114538 commits 1076 branches 296 tags 1.2 GiB
Commit graph

163 commits

Author SHA1 Message Date
Martin Aeschlimann ae1599a0b7 fix merge-conflict for browser 2020-06-26 10:54:29 +02:00
Martin Aeschlimann 16be2c9885 used shared webpack-config for browser 2020-06-25 23:22:02 +02:00
Martin Aeschlimann d78d88f7a8 make merge-conflic serverless 2020-06-12 11:03:52 +02:00
Greg Van Liew 11893d88ef CodeLens should be one word 2020-04-03 13:46:00 -07:00
Christof Marti f12410309c Remove delay (fixes #62652) 2020-03-27 10:55:17 +01:00
ryenus d75f90976b fix typo: consecutive-word duplications 
This fixes unintentional duplications of words, such as `the the`, and
`can can` etc. I also take the chance to make a few wording tweaks to
avoid suspicious duplications.
 2019-11-27 11:07:06 +08:00
Benjamin Pasero ca22de4b17 debt - bump node.d.ts dependency in extensions to 12.x (part of #82514) 2019-10-28 08:11:47 +01:00
Sandeep Somavarapu 81ec777df2 support merge code lens for vscode-userdata 2019-09-20 22:09:21 +02:00
Christof Marti 039a49a5ea Fix: Accept All Current/Incoming for multiple files (fixes #63621) 2019-07-01 16:15:55 +02:00
Aurélien Pupier 7a5bca9faf Add License field to package.jsons #68423 (#68771) 
it should avoid to have "warning XXX: No license field" during yarn
build

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
 2019-06-06 11:44:50 +02:00
Benjamin Pasero d78a75973c
update @types/node (#74881) 2019-06-05 10:20:01 +02:00
Benjamin Pasero d7977c880f debt - use @types/node: 10 for all extensions 2019-06-05 09:32:36 +02:00
Matt Bierner c69c1719bb Add enumDescriptions for merge-conflict.diffViewPosition 
Fixes #74500
 2019-05-28 14:54:29 -07:00
Peng Lyu c3fe962b89 Open the diff view in current editor, to the side or below. 2019-05-24 15:26:50 -07:00
Peng Lyu 93944674c9 Open the new editor group below 2019-05-24 14:55:26 -07:00
Peng Lyu 9cd81dcb5b Always compare change with context. 2019-05-24 14:43:44 -07:00
Peng Lyu b917a0341d Support open diff in new editor group 2019-05-24 11:29:30 -07:00
Peng Lyu fa69b4e7d6 Show context for diff view of merge conflict and introduce compareAll. 2019-05-23 14:19:09 -07:00
alexet 16d3d13c5b Remove pointless conjucntion in documentTracker 2019-01-23 15:46:23 +00:00
Matt Bierner c109d319fe Second pass converting for index based looping to for-of loops 
More manual conversion of index based for loops to for-of loops
 2019-01-04 12:03:23 -08:00
Matt Bierner b4964bcf35 Replace some common index based for loops with for-of loops 
Replaces many loops of the form:

```js
for (let i = 0; i < elements.length; ++i) {
    const i = elements[i];
   ...
}
```

with:

```js
for (const element of elements) {
    ...
}
```

Mix of a horrible regex based find/replace and manual touch ups
 2019-01-03 19:11:18 -08:00
Matt Bierner 5cc00861fc Enable no-var-keyword tslint rule 2019-01-03 18:02:48 -08:00
laphets 2e339afec3 Fix last merge conflict warnings 2018-11-30 09:16:19 +01:00
ImgBotApp d412f89baf
[ImgBot] Optimize images 
*Total -- 201.93kb -> 142.81kb (29.28%)

/extensions/npm/images/npm_icon.png -- 3.21kb -> 0.51kb (84.1%)
/src/vs/workbench/parts/debug/electron-browser/media/stepout-tb.png -- 2.89kb -> 0.47kb (83.83%)
/src/vs/workbench/parts/debug/electron-browser/media/stop-tb.png -- 1.50kb -> 0.35kb (76.43%)
/src/vs/workbench/parts/debug/electron-browser/media/pause-tb.png -- 1.55kb -> 0.37kb (76.34%)
/src/vs/workbench/browser/parts/editor/media/forward-tb.png -- 1.57kb -> 0.37kb (76.25%)
/src/vs/workbench/browser/parts/editor/media/back-tb.png -- 1.52kb -> 0.37kb (75.53%)
/src/vs/workbench/parts/debug/electron-browser/media/continue-tb.png -- 1.60kb -> 0.42kb (73.48%)
/src/vs/workbench/parts/debug/electron-browser/media/stepinto-tb.png -- 1.66kb -> 0.47kb (71.51%)
/src/vs/workbench/parts/debug/electron-browser/media/restart-tb.png -- 1.91kb -> 0.59kb (68.84%)
/src/vs/workbench/parts/debug/electron-browser/media/stepover-tb.png -- 1.93kb -> 0.62kb (67.75%)
/resources/linux/code.png -- 5.76kb -> 2.66kb (53.86%)
/extensions/html-language-features/icons/html.png -- 4.40kb -> 2.28kb (48.15%)
/extensions/theme-seti/icons/seti-circular-128x128.png -- 8.73kb -> 4.70kb (46.12%)
/extensions/typescript-language-features/icon.png -- 1.60kb -> 0.97kb (39.15%)
/src/vs/platform/extensionManagement/node/media/defaultIcon.png -- 1.65kb -> 1.03kb (37.49%)
/src/vs/workbench/parts/extensions/electron-browser/media/defaultIcon.png -- 1.65kb -> 1.03kb (37.49%)
/extensions/vscode-api-tests/testWorkspace/sub/image.png -- 35.87kb -> 24.99kb (30.33%)
/extensions/vscode-api-tests/testWorkspace/image.png -- 35.87kb -> 24.99kb (30.33%)
/resources/win32/code_150x150.png -- 0.55kb -> 0.39kb (29.96%)
/extensions/css-language-features/icons/css.png -- 5.07kb -> 3.63kb (28.37%)
/extensions/json-language-features/icons/json.png -- 5.84kb -> 4.33kb (25.89%)
/extensions/markdown-language-features/icon.png -- 1.19kb -> 0.88kb (25.86%)
/src/vs/workbench/parts/extensions/electron-browser/media/theme-icon.png -- 9.90kb -> 7.42kb (25.1%)
/extensions/php-language-features/icons/logo.png -- 10.85kb -> 8.99kb (17.13%)
/extensions/gulp/images/gulp.png -- 7.36kb -> 6.20kb (15.8%)
/extensions/merge-conflict/resources/icons/merge-conflict.png -- 2.47kb -> 2.10kb (14.96%)
/extensions/jake/images/cowboy_hat.png -- 43.85kb -> 41.67kb (4.98%)
 2018-11-06 20:46:03 +00:00
Matt Bierner 92a9a07213 Remove duplicate blank lines at the start of some extension src files 2018-10-02 16:28:19 -07:00
Matt Bierner ff957050db Remove use strict in extensions (part 2) 
We compile using alwaysStrict so this directive is not needed
 2018-10-02 16:23:27 -07:00
Matt Bierner 52d3961c2b Update more extensions to use shared config 2018-10-02 10:24:19 -07:00
Christof Marti 1d40f3f25c Off by default (#45853) 2018-10-02 16:00:43 +02:00
Christof Marti 977fc70d40
Merge branch 'master' into Issue-#45853-checked 2018-10-02 15:57:39 +02:00
mnikn 0a5343aa97 implement [#53133](https://github.com/Microsoft/vscode/issues/53133) 2018-10-01 16:42:06 +02:00
Joao Moreno 707787c5b8 update yarn.lock files to use integrity 2018-09-30 16:34:43 +02:00
Johannes Rieken b0787a2b87 fix webpack entries for merge-conflict and search-rg 2018-09-20 09:59:24 +02:00
Alex Dima 34e7a220c8 Avoid shipping unnecessary files 2018-09-19 19:53:46 +02:00
Johannes Rieken 3053689bb5 webpack merge-conflict #57680 2018-09-19 15:19:51 +02:00
Alex Dima a46554c8fa Use the fast variant of TextEditor.setDecorations 2018-09-17 17:10:07 +02:00
Alex Dima c36258d23f Use const enums (to inline their values in JS) 2018-09-06 20:39:19 +02:00
Johannes Rieken c2c5819fc8 adopt vscode-nls 4.0.0 2018-09-06 14:44:33 +02:00
Alex Dima 47212be6f3 Settings sweep (#54690) 2018-07-30 12:35:43 +02:00
Greg Van Liew c150d0d42d Edit pass on new built-in extension comments (#54277) 2018-07-13 15:28:27 -07:00
Ramya Achutha Rao f89c16c04c Standardize readme across built-in extensions #54098 2018-07-11 16:38:32 -07:00
Dirk Baeumer 21991b4912 Move to latest vscode-nls for corrupted cache support 2018-07-03 16:12:52 +02:00
atomai 7c26e93b21 Automatically navigate to the next merge conflict upon resolving a merge conflict 2018-04-14 20:03:55 -04:00
Christof Marti ab7f6e871d Add link to documentation (#43978) 2018-03-02 11:18:41 +01:00
Greg Van Liew b3a1b98d54 Edit pass on built-in extension descriptions (#44875) 2018-03-01 16:43:06 -08:00
Christof Marti a83ea2b316 Bump version (#43978) 2018-02-27 15:56:35 +01:00
Christof Marti 264d0c2ec8 Name, description, icon for merge-conflict extension (#43978) 2018-02-26 09:48:34 +01:00
Ramya Achutha Rao c1ee104fd4 Use latest version of telemetry module 2018-02-23 14:57:27 -08:00
Ramya Achutha Rao ad06c9c609 Update telemetry module 2018-02-17 17:27:09 -08:00
Ramya Achutha Rao 994bfe6903 Update telemetry module to fix issue of missing version in events 2018-02-13 17:07:30 -08:00
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 e91b851ca8 Upgrade to latest language pack format 2018-01-30 00:11:57 +01:00
Ramya Achutha Rao 71c3b15465 Update the telemetry module used by extensions 2018-01-29 14:53:24 -08:00
Dirk Baeumer 04594c864b Add support for Language Packs 2018-01-25 21:14:34 +01:00
Christof Marti ec1924769c Add alias for commands (#39778) 2018-01-16 11:05:00 +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
Joe Martella 58c1273a04 Adds "Accept All Current" to command palette 2017-11-27 15:48:02 -08:00
Joao Moreno 0a8b6fb706 yarn: replace most shrinkwrap files 2017-11-13 23:03:52 +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
Matt Bierner 0bd33bbd96 Use strict versions for @types. Fixes #35561 2017-10-09 11:21:00 -07:00
Christof Marti af9f708041 Only register for file: and untitled: (fixes #33133) 2017-08-30 15:39:13 -07:00
Martin Aeschlimann 256b02f921 Merge pull request #31253 from yfdyh000/i18n-fixes 
Fixes some extensions strings missing for i18n
 2017-08-28 22:04:39 +02:00
t-amqi 20cf247927 Spelling fixes 2017-08-09 10:41:18 -07:00
YFdyh000 8fc488e097 Fixes some extensions strings missing for i18n 2017-07-22 21:07:27 +08:00
kieferrm fb52a0e726 remove dev dependencies from shrinkwrap 2017-06-30 11:35:11 -07:00
kieferrm 0edc80db86 add shrinkwrap file for merge-conflict 2017-06-30 10:02:37 -07:00
kieferrm 3f8bd163f4 update dependency on vscode-extension-telemetry 2017-06-30 09:57:37 -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 1de69f4d8d Remove merge keyboard shortcuts (fixes #28376) 2017-06-26 11:25:53 -07: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
Joao Moreno 5667cc0e69 use vsce to determine what to package when bundling extensions 
fixes #29054
 2017-06-21 16:17:21 +02: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