Matt Bierner
cdc521af16
Adopt l10n for merge-conflict ( #165531 )
...
For #164438
2022-11-04 11:26:04 -07:00
Tyler James Leonhardt
29e985eca0
rev vscode-nls to version that doesn't ask for vscode-nls-web-data ( #161819 )
...
ref #161297
2022-09-26 11:10:54 -07:00
Johannes Rieken
c1b80f6402
Disable merge-conflict commands for 3wm-editor ( #161304 )
...
fixes https://github.com/microsoft/vscode/issues/159156
2022-09-20 13:50:21 +02:00
Henning Dieterichs
7dd5f05b6e
Enable conflict marker decorators even if merge editor is enabled. ( #157982 )
2022-08-12 15:21:38 +02:00
Tyler James Leonhardt
d8453c0440
Rev built-in versions of vscode-nls to 5.1.0 ( #157530 )
...
* rev version of vscode-nls to 5.1.0
* and yarn lock
2022-08-08 18:43:45 +02:00
Logan Ramos
a20329d291
Switch extensions to 1DS ( #154299 )
...
* Move extensions to 1DS
* Switch extensions to 1DS
2022-07-06 17:18:41 -07: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
Robo
32d40cf44e
chore: update to electron 17 ( #143223 )
...
* chore: bump electron@17.0.0
* Revert "chore: revert to electron@13 (#143851 )"
This reverts commit df645f1450
.
* chore: bump electron@17.1.0
* Revert "ci: fix build with latest node-gyp"
This reverts commit c3e948aa30
.
* chore: revert ci changes for node v16
* chore: update yarn.lock
* chore: bump electron@17.1.1
2022-03-11 00:51:37 +09:00
Robo
df645f1450
chore: revert to electron@13 ( #143851 )
...
* Revert "chore: update to electron 16 (#137241 )"
This reverts commit 01df559c18
.
This reverts commit 46301339b7
* ci: fix remote compiler for sdl-scan
* chore: fix remote/.yarnrc
* chore: fix build/npm/postinstall.js
* chore: rm crash reporter from shared process
* chore: rm crash reporter from ext host
* chore: fix build/lib/layersChecker.ts
* :chore: preserve some more changes
* fix tests
Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
2022-02-24 17:49:49 +01:00
Robo
01df559c18
chore: update to electron 16 ( #137241 )
...
* chore: bump electron@15.3.0
* chore: bump node@16.x
* chore: enable render process reuse
* Revert "watcher - use `type` property for crash reporter location"
This reverts commit bfa488dd8f
.
* Revert "watcher - enable crash reports on linux (#136264 )"
This reverts commit af261488f8
.
* chore: enable crashpad on linux
* chore: bump electron@15.3.1
* chore: update api changes
* chore: bump @vscode/sqlite3@5.0.3
* spec: skip non-context aware module unittests
* chore: fix perf hook integration with node environment
* fix: adopt fs api changes
* chore: fix integration tests
* chore: bump electron@15.3.2
* chore: bump electron@16.0.0
* temp(macOS): kill test instances in OSS
* Revert "temp(macOS): kill test instances in OSS"
This reverts commit b0d796c8d64227a5ec012c060bbbee7d9da27568.
* chore: update chromium version for clang downloader
* some 💄 changes
* align with changes
* adopt more fs.rm
* 💄
* chore: bump @vscode/sqlite3@5.0.4
* fix layers check to account for duplicated types from node.js
* update todo for type casts
* smoke - fix compile issue
* chore: update module cache
* watcher - fix unhandled rejection (fix #137416 )
* ci: update node version
* enable stack dumping
* update electron types to 16.x
* chore: bump @vscode/sqlite3@5.0.5
Refs https://github.com/microsoft/vscode/issues/137496
* fix layer issue
* add `AbortSignal` to core types
* chore: update linux compile flags
Refs 797723ec83
* ci: fix linux build
* ci: update github ci cache
* ci: fix remote build in github ci
* ci: better fix for remote build
* chore: bump azure cache
* chore: fix merge conflict
* :chore: update to electron@16.0.2
* chore: bump @vscode/sqlite3@5.0.7
* ci: update to gcc-4.9 for remote
Refs https://github.com/microsoft/vscode/issues/137659
* ci: switch to buster for linux arm
Refs https://github.com/microsoft/vscode/issues/137927
* ci: fix build on linux arm64
* ci: fix arm client compiler toolchain
Refs #137927
* chore: bump electron@16.0.3
* ci: fix compile flags for the c toolchain
* chore: bump electron@16.0.4
* Add experimental dark mode flag (#139109 )
* Add experimental dark mode flag
* Apply PR feedback
* chore: bump electron@16.0.6
* chore: bump electron@16.0.7
Fixes https://github.com/microsoft/vscode/issues/138792
Fixes https://github.com/microsoft/vscode/issues/139300
* chore: experimental highlight API
* smoke - fix compile issue
* FIXME: custom ELECTRON_RUN_AS_NODE with node worker
* Revert "chore: bump electron@16.0.7"
This reverts commit 5fd01cf37c
.
* Revert "Revert "chore: bump electron@16.0.7""
This reverts commit a7f1b73951
.
* chore: fix github linux workflow
* chore: address review feedback
* chore: bump electron@16.0.8
* ci: revert to stretch distro for linux arm
Refs https://github.com/microsoft/vscode/issues/137927
* ci: force build
* chore: update yarn.lock
* address feedback
* Revert "FIXME: custom ELECTRON_RUN_AS_NODE with node worker"
This reverts commit 7b48fa3732
.
* ci: fix remote folder build
* chore: fix github linux ci
* 🆙 `versionSpec`
Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
Co-authored-by: Raymond Zhao <raymondzhao@microsoft.com>
2022-02-08 20:09:00 +01:00
Joyce Er
da29a245ff
Enable merge-conflict extension in virtual workspaces ( fixes #142447 )
2022-02-08 09:28:04 +01: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
Martin Aeschlimann
7ebe6a6054
adopt web extensions to webpack 5
2021-07-08 21:41:03 +02:00
Robo
bce4d71f64
chore: bump node@14.x in devDependencies ( #122905 )
2021-05-04 10:04:13 +02:00
Sandeep Somavarapu
68bed01970
adopt virtual workspaces - not supported
2021-04-22 16:54:06 +02:00
Sandeep Somavarapu
90c5c7a0d2
Merge branch 'main' into capabilities
2021-04-22 14:29:13 +02:00
Eric Amodio
79033ef7a1
Adds code lens on vfs files
2021-04-22 03:29:20 -04:00
SteVen Batten
f9fc28d47d
update ext manifest schema validation and built-in exts
2021-04-21 11:54:42 -07:00
Miguel Solorio
ac48f78dd6
Add icons for built-in extensions ( fixes #81760 )
2021-04-20 12:09:24 -07:00
Christof Marti
75f2ce9735
Adopt workspaceTrust
2021-04-13 21:42:54 +02:00
Matt Bierner
119581fc2a
Use more standard name for shared extension tsconfig
...
This enables Intellisense in the `tsconfig.base` file
2021-04-12 15:58:38 -07: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
João Moreno
ec805db5ed
add repository field to extensions package.json
2021-01-29 15:30:45 +01:00
Christof Marti
b33b28dd07
Activate onStartupFinished ( #110031 )
2021-01-12 08:17:35 +01:00
Alexandru Dima
f74ad9692f
Align @types/*
dev dependencies ( #112718 )
2020-12-18 13:28:39 +01:00
Matt Bierner
50cc1d0e97
Update to use TS 4.1 for building VS Code
2020-09-16 11:58:01 -07:00
Alex Dima
91cdca1bdb
Do not ship unnecessary files with extensions
2020-07-24 13:57:51 +02:00
Martin Aeschlimann
058e1095b2
fix merge-conflict browser main
2020-06-26 11:14:23 +02:00
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