Skip to content

Commit 60d9842

Browse files
committed
Merge remote-tracking branch 'origin/main' into tyriar/154016
2 parents 465e8b4 + e194e88 commit 60d9842

File tree

146 files changed

+1927
-2781
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+1927
-2781
lines changed

.eslintrc.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,7 @@
210210
// - electron-browser
211211
"when": "hasBrowser",
212212
"allow": [
213-
"vs/css!./**/*",
214-
"@microsoft/applicationinsights-web"
213+
"vs/css!./**/*"
215214
]
216215
},
217216
{
@@ -226,7 +225,6 @@
226225
"@vscode/vscode-languagedetection",
227226
"@vscode/ripgrep",
228227
"@vscode/iconv-lite-umd",
229-
"applicationinsights",
230228
"assert",
231229
"child_process",
232230
"console",

.vscode/notebooks/api.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"June 2022\""
10+
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"July 2022\""
1111
},
1212
{
1313
"kind": 1,

build/.cachesalt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2022-06-10T10:20:54.664Z
1+
2022-07-07T13:42:16.836Z

build/azure-pipelines/darwin/product-build-darwin-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ steps:
4646
compile-extension:html-language-features-server \
4747
compile-extension:ipynb \
4848
compile-extension:json-language-features-server \
49+
compile-extension:markdown-language-features-server \
4950
compile-extension:markdown-language-features \
5051
compile-extension-media \
5152
compile-extension:microsoft-authentication \

build/azure-pipelines/linux/product-build-linux-client-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ steps:
5858
compile-extension:html-language-features-server \
5959
compile-extension:ipynb \
6060
compile-extension:json-language-features-server \
61+
compile-extension:markdown-language-features-server \
6162
compile-extension:markdown-language-features \
6263
compile-extension-media \
6364
compile-extension:microsoft-authentication \

build/azure-pipelines/win32/product-build-win32-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ steps:
5252
compile-extension:html-language-features-server `
5353
compile-extension:ipynb `
5454
compile-extension:json-language-features-server `
55+
compile-extension:markdown-language-features-server `
5556
compile-extension:markdown-language-features `
5657
compile-extension-media `
5758
compile-extension:microsoft-authentication `

build/gulpfile.extensions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ const compilations = [
5353
'json-language-features/client/tsconfig.json',
5454
'json-language-features/server/tsconfig.json',
5555
'markdown-language-features/preview-src/tsconfig.json',
56+
'markdown-language-features/server/tsconfig.json',
5657
'markdown-language-features/tsconfig.json',
5758
'markdown-math/tsconfig.json',
5859
'merge-conflict/tsconfig.json',

build/npm/dirs.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ exports.dirs = [
2828
'extensions/jake',
2929
'extensions/json-language-features',
3030
'extensions/json-language-features/server',
31+
'extensions/markdown-language-features/server',
3132
'extensions/markdown-language-features',
3233
'extensions/markdown-math',
3334
'extensions/merge-conflict',

build/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"@typescript-eslint/experimental-utils": "^5.10.0",
4444
"@typescript-eslint/parser": "^5.10.0",
4545
"@vscode/iconv-lite-umd": "0.7.0",
46-
"applicationinsights": "1.4.2",
4746
"byline": "^5.0.0",
4847
"colors": "^1.4.0",
4948
"commander": "^7.0.0",

build/yarn.lock

Lines changed: 1 addition & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -847,16 +847,6 @@ anymatch@^3.0.0, anymatch@^3.1.1, anymatch@~3.1.1:
847847
normalize-path "^3.0.0"
848848
picomatch "^2.0.4"
849849

850-
851-
version "1.4.2"
852-
resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.4.2.tgz#2f25f7a3f3e5bf0ab4486b63e42a48a9ec321d52"
853-
integrity sha512-1wE37G9zEMZTsPJVQ8BDrQtsGgG3DGMActLHwPAF8TYHAXkfqqpeZYCH0XV4lUZ7H4MffRMwN2Ln2nEtUmT8HQ==
854-
dependencies:
855-
cls-hooked "^4.2.2"
856-
continuation-local-storage "^3.2.1"
857-
diagnostic-channel "0.2.0"
858-
diagnostic-channel-publishers "^0.3.3"
859-
860850
aproba@^1.0.3:
861851
version "1.2.0"
862852
resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -909,21 +899,6 @@ assign-symbols@^1.0.0:
909899
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
910900
integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
911901

912-
async-hook-jl@^1.7.6:
913-
version "1.7.6"
914-
resolved "https://registry.yarnpkg.com/async-hook-jl/-/async-hook-jl-1.7.6.tgz#4fd25c2f864dbaf279c610d73bf97b1b28595e68"
915-
integrity sha512-gFaHkFfSxTjvoxDMYqDuGHlcRyUuamF8s+ZTtJdDzqjws4mCt7v0vuV79/E2Wr2/riMQgtG4/yUtXWs1gZ7JMg==
916-
dependencies:
917-
stack-chain "^1.3.7"
918-
919-
async-listener@^0.6.0:
920-
version "0.6.10"
921-
resolved "https://registry.yarnpkg.com/async-listener/-/async-listener-0.6.10.tgz#a7c97abe570ba602d782273c0de60a51e3e17cbc"
922-
integrity sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==
923-
dependencies:
924-
semver "^5.3.0"
925-
shimmer "^1.1.0"
926-
927902
asynckit@^0.4.0:
928903
version "0.4.0"
929904
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1185,15 +1160,6 @@ cloneable-readable@^1.0.0:
11851160
process-nextick-args "^2.0.0"
11861161
readable-stream "^2.3.5"
11871162

1188-
cls-hooked@^4.2.2:
1189-
version "4.2.2"
1190-
resolved "https://registry.yarnpkg.com/cls-hooked/-/cls-hooked-4.2.2.tgz#ad2e9a4092680cdaffeb2d3551da0e225eae1908"
1191-
integrity sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==
1192-
dependencies:
1193-
async-hook-jl "^1.7.6"
1194-
emitter-listener "^1.0.1"
1195-
semver "^5.4.1"
1196-
11971163
code-point-at@^1.0.0:
11981164
version "1.1.0"
11991165
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -1290,14 +1256,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
12901256
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
12911257
integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
12921258

1293-
continuation-local-storage@^3.2.1:
1294-
version "3.2.1"
1295-
resolved "https://registry.yarnpkg.com/continuation-local-storage/-/continuation-local-storage-3.2.1.tgz#11f613f74e914fe9b34c92ad2d28fe6ae1db7ffb"
1296-
integrity sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==
1297-
dependencies:
1298-
async-listener "^0.6.0"
1299-
emitter-listener "^1.1.1"
1300-
13011259
core-js@^3.6.5:
13021260
version "3.15.2"
13031261
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
@@ -1427,18 +1385,6 @@ detect-node@^2.0.4:
14271385
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
14281386
integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
14291387

1430-
diagnostic-channel-publishers@^0.3.3:
1431-
version "0.3.5"
1432-
resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.3.5.tgz#a84a05fd6cc1d7619fdd17791c17e540119a7536"
1433-
integrity sha512-AOIjw4T7Nxl0G2BoBPhkQ6i7T4bUd9+xvdYizwvG7vVAM1dvr+SDrcUudlmzwH0kbEwdR2V1EcnKT0wAeYLQNQ==
1434-
1435-
1436-
version "0.2.0"
1437-
resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"
1438-
integrity sha1-zJmvlhLCP7H/8TYSxy8sv6qNWhc=
1439-
dependencies:
1440-
semver "^5.3.0"
1441-
14421388
dir-compare@^2.4.0:
14431389
version "2.4.0"
14441390
resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631"
@@ -1510,13 +1456,6 @@ electron-osx-sign@^0.4.16:
15101456
minimist "^1.2.0"
15111457
plist "^3.0.1"
15121458

1513-
emitter-listener@^1.0.1, emitter-listener@^1.1.1:
1514-
version "1.1.2"
1515-
resolved "https://registry.yarnpkg.com/emitter-listener/-/emitter-listener-1.1.2.tgz#56b140e8f6992375b3d7cb2cab1cc7432d9632e8"
1516-
integrity sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==
1517-
dependencies:
1518-
shimmer "^1.2.0"
1519-
15201459
emoji-regex@^8.0.0:
15211460
version "8.0.0"
15221461
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -3011,7 +2950,7 @@ semver-compare@^1.0.0:
30112950
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
30122951
integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
30132952

3014-
semver@^5.1.0, semver@^5.3.0:
2953+
semver@^5.1.0:
30152954
version "5.6.0"
30162955
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
30172956
integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
@@ -3064,11 +3003,6 @@ shebang-regex@^3.0.0:
30643003
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
30653004
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
30663005

3067-
shimmer@^1.1.0, shimmer@^1.2.0:
3068-
version "1.2.1"
3069-
resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
3070-
integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
3071-
30723006
side-channel@^1.0.4:
30733007
version "1.0.4"
30743008
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -3122,11 +3056,6 @@ sprintf-js@~1.0.2:
31223056
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
31233057
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
31243058

3125-
stack-chain@^1.3.7:
3126-
version "1.3.7"
3127-
resolved "https://registry.yarnpkg.com/stack-chain/-/stack-chain-1.3.7.tgz#d192c9ff4ea6a22c94c4dd459171e3f00cea1285"
3128-
integrity sha1-0ZLJ/06moiyUxN1FkXHj8AzqEoU=
3129-
31303059
stoppable@^1.1.0:
31313060
version "1.1.0"
31323061
resolved "https://registry.yarnpkg.com/stoppable/-/stoppable-1.1.0.tgz#32da568e83ea488b08e4d7ea2c3bcc9d75015d5b"

0 commit comments

Comments
 (0)