Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 17:19:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
149,542 Commits 3,632 Branches 357 Tags
f867ff35d3a0f7affc430e4e6375fb6c13438a4e
Commit Graph

92 Commits

Author SHA1 Message Date
Henning Dieterichs
741f5b480a Fixes flashing of inline conflict marker code lenses (#168598) 2022-12-09 15:16:55 +01:00
Henning Dieterichs
5597167c4c Fixes #79125 (#168588) 2022-12-09 14:06:55 +01:00
Henning Dieterichs
1f0fba4a1a Apply suggestions from code review 
Adds suggestions from PR.
 2022-11-28 15:16:22 +01:00
Henning Dieterichs
382498ef4e Fixes GDPR comment 2022-11-28 12:04:59 +01:00
Henning Dieterichs
5ff048a9e4 Add telemetry for conflict markers 2022-11-28 12:00:08 +01:00
Matt Bierner
cdc521af16 Adopt l10n for merge-conflict (#165531) 
For #164438
 2022-11-04 11:26:04 -07:00
Henning Dieterichs
7dd5f05b6e Enable conflict marker decorators even if merge editor is enabled. (#157982) 2022-08-12 15:21:38 +02:00
Johannes
aae22c1605 rename setting to git.mergeEditor, no more experimental 2022-06-27 12:54:55 +02:00
Johannes Rieken
dfeb3e0050 joh/careful silverfish (#153089) 
* don't show `openChange` command for merge editor

https://github.com/microsoft/vscode/issues/151125

* disable and not-place the conflicting merge-conflict navigation commands for the merge editor

https://github.com/microsoft/vscode/issues/153087

* disable (configurable) merge-conflict featues (code lens, decorations) when git is configured to use merge editor

https://github.com/microsoft/vscode/issues/153087
 2022-06-24 09:33:06 +00:00
Matt Bierner
f17b33faf2 Use .?method() in more places (#152112) 
Switches simple patterns like:

```ts
if (some.thing) {
    some.thing.method();
}
```

to:

```ts
some.thing?.method()
```

This is more concise and avoids having to repeat the `some.thing` part
 2022-06-15 16:28:31 +00:00
Johannes
0656d21d11 auto-fixed prefer-const violation 2022-06-08 17:49:21 +02:00
Benjamin Pasero
e8f26b998e git - use same icon for comparing as core diff editor 
//cc @lszomoru
 2022-04-01 17:20:31 +02:00
Johannes Rieken
4a130c40ed enable @typescript-eslint/member-delimiter-style, https://github.com/microsoft/vscode/issues/140391 2022-02-02 14:35:33 +01:00
Christof Marti
6309c4010b Fix addOrigin (fixes #140551) 2022-01-19 10:51:55 +01:00
Johannes Rieken
68e819043c use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables to remove most ref.d.ts-files 2021-11-09 15:53:35 +01:00
Johannes Rieken
9254a8cd27 move vscode.d.ts and vscode.proposed.d.ts into src/vscode-dts-folder, https://github.com/microsoft/vscode/issues/131165 2021-11-09 15:00:03 +01:00
Eric Amodio
79033ef7a1 Adds code lens on vfs files 2021-04-22 03:29:20 -04:00
Christof Marti
5c79571610 Add next/prev conflicts (#97613) 2021-03-31 10:46:11 +02:00
Wenlu Wang
96d0dc4154 Add next/prev conflicts (#97613) 2021-03-31 10:45:21 +02:00
Alexandre Schnegg
2678e4b848 Only match exactly 7 equals (fixes #95040) 2021-02-09 10:35:10 +01:00
Matt Bierner
50cc1d0e97 Update to use TS 4.1 for building VS Code 2020-09-16 11:58:01 -07:00
Martin Aeschlimann
d78d88f7a8 make merge-conflic serverless 2020-06-12 11:03:52 +02: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
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
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
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
Christof Marti
977fc70d40 Merge branch 'master' into Issue-#45853-checked 2018-10-02 15:57:39 +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
atomai
7c26e93b21 Automatically navigate to the next merge conflict upon resolving a merge conflict 2018-04-14 20:03:55 -04: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
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