Skip to content

Commit 26154a5

Browse files
alexdimaalexdima
authored
Merge branch 'master' into feat/diff-diagonal-fill-colour
2 parents 9712603 + 0cb91f6 commit 26154a5

216 files changed

Lines changed: 3670 additions & 1693 deletions

File tree

Some content is hidden

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

‎.eslintrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@
462462
"**/vs/workbench/services/**/common/**",
463463
"**/vs/workbench/api/**/common/**",
464464
"vscode-textmate",
465-
"vscode-oniguruma-wasm"
465+
"vscode-oniguruma"
466466
]
467467
},
468468
{
@@ -491,7 +491,7 @@
491491
"**/vs/workbench/api/{common,browser}/**",
492492
"**/vs/workbench/services/**/{common,browser}/**",
493493
"vscode-textmate",
494-
"vscode-oniguruma-wasm"
494+
"vscode-oniguruma"
495495
]
496496
},
497497
{

‎.vscode/launch.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@
187187
"type": "pwa-chrome",
188188
"request": "launch",
189189
"name": "Launch VS Code",
190-
"browserLaunchLocation": "workspace",
191190
"windows": {
192191
"runtimeExecutable": "${workspaceFolder}/scripts/code.bat"
193192
},

‎build/lib/optimize.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,7 @@ function loader(src, bundledFileHeader, bundleLoader) {
6868
this.emit('data', data);
6969
}
7070
}))
71-
.pipe(util.loadSourcemaps())
72-
.pipe(concat('vs/loader.js'))
73-
.pipe(es.mapSync(function (f) {
74-
f.sourceMap.sourceRoot = util.toFileUri(path.join(REPO_ROOT_PATH, 'src'));
75-
return f;
76-
})));
71+
.pipe(concat('vs/loader.js')));
7772
}
7873
function toConcatStream(src, bundledFileHeader, sources, dest) {
7974
const useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);

‎build/lib/optimize.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,7 @@ function loader(src: string, bundledFileHeader: string, bundleLoader: boolean):
8080
this.emit('data', data);
8181
}
8282
}))
83-
.pipe(util.loadSourcemaps())
8483
.pipe(concat('vs/loader.js'))
85-
.pipe(es.mapSync<FileSourceMap, FileSourceMap>(function (f) {
86-
f.sourceMap.sourceRoot = util.toFileUri(path.join(REPO_ROOT_PATH, 'src'));
87-
return f;
88-
}))
8984
);
9085
}
9186

‎build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"minimist": "^1.2.3",
4444
"request": "^2.85.0",
4545
"terser": "4.3.8",
46-
"typescript": "^3.9.0-dev.20200420",
46+
"typescript": "^3.9.0-dev.20200427",
4747
"vsce": "1.48.0",
4848
"vscode-telemetry-extractor": "^1.5.4",
4949
"xml2js": "^0.4.17"

‎build/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2458,10 +2458,10 @@ typescript@^3.0.1:
24582458
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
24592459
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
24602460

2461-
typescript@^3.9.0-dev.20200420:
2462-
version "3.9.0-dev.20200420"
2463-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.0-dev.20200420.tgz#99c2bc0936dbf4479b0b5260d80475ed494b1532"
2464-
integrity sha512-36MW6V+oXNnsSgliSjUWvtOkO21g9+iFGHPFv+O06HsCl3dcuqzBac17m8xuOuWo1LUlEgS6yAnD9fiVgvmCfg==
2461+
typescript@^3.9.0-dev.20200427:
2462+
version "3.9.0-dev.20200427"
2463+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.0-dev.20200427.tgz#e42d606d938575dfb7b0b66f04a31b5f0eb0be57"
2464+
integrity sha512-ja/GhL7BHT+VQZiLoYMGJt2CP1Pdr0EhYefv4LLw4tVooSuCDB8SDKT/i/HwsoPgQ4ZaYfg1vPl+1RhiO3bwJg==
24652465

24662466
typical@^4.0.0:
24672467
version "4.0.0"

‎extensions/css-language-features/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,8 +806,8 @@
806806
]
807807
},
808808
"dependencies": {
809-
"vscode-languageclient": "^6.1.1",
810-
"vscode-nls": "^4.1.1"
809+
"vscode-languageclient": "^6.1.3",
810+
"vscode-nls": "^4.1.2"
811811
},
812812
"devDependencies": {
813813
"@types/node": "^12.11.7",

‎extensions/css-language-features/server/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
},
1010
"main": "./out/cssServerMain",
1111
"dependencies": {
12-
"vscode-css-languageservice": "^4.1.1",
12+
"vscode-css-languageservice": "^4.1.2",
1313
"vscode-languageserver": "^6.1.1"
1414
},
1515
"devDependencies": {
16-
"@types/mocha": "7.0.1",
16+
"@types/mocha": "7.0.2",
1717
"@types/node": "^12.11.7",
1818
"glob": "^7.1.6",
19-
"mocha": "^7.0.1",
19+
"mocha": "^7.1.2",
2020
"mocha-junit-reporter": "^1.23.3",
2121
"mocha-multi-reporters": "^1.1.7"
2222
},

‎extensions/css-language-features/server/yarn.lock‎

Lines changed: 66 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
"@types/mocha@7.0.1":
6-
version "7.0.1"
7-
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.1.tgz#5d7ec2a789a1f77c59b7ad071b9d50bf1abbfc9e"
8-
integrity sha512-L/Nw/2e5KUaprNJoRA33oly+M8X8n0K+FwLTbYqwTcR14wdPWeRkigBLfSFpN/Asf9ENZTMZwLxjtjeYucAA4Q==
5+
"@types/mocha@7.0.2":
6+
version "7.0.2"
7+
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce"
8+
integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==
99

1010
"@types/node@^12.11.7":
1111
version "12.11.7"
@@ -84,7 +84,7 @@ camelcase@^5.0.0:
8484
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
8585
integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
8686

87-
chalk@^2.0.1:
87+
chalk@^2.4.2:
8888
version "2.4.2"
8989
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
9090
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -424,12 +424,12 @@ lodash@^4.17.15:
424424
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
425425
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
426426

427-
log-symbols@2.2.0:
428-
version "2.2.0"
429-
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
430-
integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
427+
log-symbols@3.0.0:
428+
version "3.0.0"
429+
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
430+
integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
431431
dependencies:
432-
chalk "^2.0.1"
432+
chalk "^2.4.2"
433433

434434
md5@^2.1.0:
435435
version "2.2.1"
@@ -452,7 +452,19 @@ minimist@0.0.8:
452452
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
453453
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
454454

455-
mkdirp@0.5.1, mkdirp@~0.5.1:
455+
minimist@^1.2.5:
456+
version "1.2.5"
457+
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
458+
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
459+
460+
mkdirp@0.5.5:
461+
version "0.5.5"
462+
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
463+
integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
464+
dependencies:
465+
minimist "^1.2.5"
466+
467+
mkdirp@~0.5.1:
456468
version "0.5.1"
457469
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
458470
integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -478,10 +490,10 @@ mocha-multi-reporters@^1.1.7:
478490
debug "^3.1.0"
479491
lodash "^4.16.4"
480492

481-
mocha@^7.0.1:
482-
version "7.0.1"
483-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce"
484-
integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==
493+
mocha@^7.1.2:
494+
version "7.1.2"
495+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.2.tgz#8e40d198acf91a52ace122cd7599c9ab857b29e6"
496+
integrity sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA==
485497
dependencies:
486498
ansi-colors "3.2.3"
487499
browser-stdout "1.3.1"
@@ -494,18 +506,18 @@ mocha@^7.0.1:
494506
growl "1.10.5"
495507
he "1.2.0"
496508
js-yaml "3.13.1"
497-
log-symbols "2.2.0"
509+
log-symbols "3.0.0"
498510
minimatch "3.0.4"
499-
mkdirp "0.5.1"
511+
mkdirp "0.5.5"
500512
ms "2.1.1"
501513
node-environment-flags "1.0.6"
502514
object.assign "4.1.0"
503515
strip-json-comments "2.0.1"
504516
supports-color "6.0.0"
505517
which "1.3.1"
506518
wide-align "1.1.3"
507-
yargs "13.3.0"
508-
yargs-parser "13.1.1"
519+
yargs "13.3.2"
520+
yargs-parser "13.1.2"
509521
yargs-unparser "1.6.0"
510522

511523
ms@2.0.0:
@@ -689,14 +701,14 @@ to-regex-range@^5.0.1:
689701
dependencies:
690702
is-number "^7.0.0"
691703

692-
vscode-css-languageservice@^4.1.1:
693-
version "4.1.1"
694-
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.1.1.tgz#9131dd465e4b20f3ba78ab9734b2c7cdb9237443"
695-
integrity sha512-2r2bYbhscivRu1zqh5kNe8aYpFnfksMYC7wTpKX2HqFsSzSJYXk0sCqPaWsP5ptqz0OFBTXnzx2JlE+Nb5Edgw==
704+
vscode-css-languageservice@^4.1.2:
705+
version "4.1.2"
706+
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.1.2.tgz#533bfeb79b38e8add07230dc67001cceb80253e8"
707+
integrity sha512-clIjSS940NPBvtfubZokKT/YDNfE5ST9VDwsuwdCbQSkJAVZPAbmIgfmgrz/f/o8PawYQU/ooUBEuRIvIYq3ag==
696708
dependencies:
697709
vscode-languageserver-textdocument "^1.0.1"
698710
vscode-languageserver-types "^3.15.1"
699-
vscode-nls "^4.1.1"
711+
vscode-nls "^4.1.2"
700712
vscode-uri "^2.1.1"
701713

702714
vscode-jsonrpc@^5.0.1:
@@ -729,10 +741,10 @@ vscode-languageserver@^6.1.1:
729741
dependencies:
730742
vscode-languageserver-protocol "^3.15.3"
731743

732-
vscode-nls@^4.1.1:
733-
version "4.1.1"
734-
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
735-
integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
744+
vscode-nls@^4.1.2:
745+
version "4.1.2"
746+
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
747+
integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
736748

737749
vscode-uri@^2.1.1:
738750
version "2.1.1"
@@ -782,7 +794,15 @@ y18n@^4.0.0:
782794
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
783795
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
784796

785-
yargs-parser@13.1.1, yargs-parser@^13.1.1:
797+
yargs-parser@13.1.2, yargs-parser@^13.1.2:
798+
version "13.1.2"
799+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
800+
integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
801+
dependencies:
802+
camelcase "^5.0.0"
803+
decamelize "^1.2.0"
804+
805+
yargs-parser@^13.1.1:
786806
version "13.1.1"
787807
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
788808
integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
@@ -799,7 +819,23 @@ yargs-unparser@1.6.0:
799819
lodash "^4.17.15"
800820
yargs "^13.3.0"
801821

802-
yargs@13.3.0, yargs@^13.3.0:
822+
yargs@13.3.2:
823+
version "13.3.2"
824+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
825+
integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
826+
dependencies:
827+
cliui "^5.0.0"
828+
find-up "^3.0.0"
829+
get-caller-file "^2.0.1"
830+
require-directory "^2.1.1"
831+
require-main-filename "^2.0.0"
832+
set-blocking "^2.0.0"
833+
string-width "^3.0.0"
834+
which-module "^2.0.0"
835+
y18n "^4.0.0"
836+
yargs-parser "^13.1.2"
837+
838+
yargs@^13.3.0:
803839
version "13.3.0"
804840
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
805841
integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==

‎extensions/css-language-features/yarn.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -640,10 +640,10 @@ vscode-jsonrpc@^5.0.1:
640640
resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz#9bab9c330d89f43fc8c1e8702b5c36e058a01794"
641641
integrity sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==
642642

643-
vscode-languageclient@^6.1.1:
644-
version "6.1.1"
645-
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-6.1.1.tgz#91b62e416c5abbf2013ae3726f314a19c22a8457"
646-
integrity sha512-mB6d8Tg+82l8EFUfR+SBu0+lCshyKVgC5E5+MQ0/BJa+9AgeBjtG5npoGaCo4/VvWzK0ZRGm85zU5iRp1RYPIA==
643+
vscode-languageclient@^6.1.3:
644+
version "6.1.3"
645+
resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz#c979c5bb5855714a0307e998c18ca827c1b3953a"
646+
integrity sha512-YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA==
647647
dependencies:
648648
semver "^6.3.0"
649649
vscode-languageserver-protocol "^3.15.3"
@@ -661,10 +661,10 @@ vscode-languageserver-types@3.15.1:
661661
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de"
662662
integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==
663663

664-
vscode-nls@^4.1.1:
665-
version "4.1.1"
666-
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.1.tgz#f9916b64e4947b20322defb1e676a495861f133c"
667-
integrity sha512-4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==
664+
vscode-nls@^4.1.2:
665+
version "4.1.2"
666+
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
667+
integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
668668

669669
which-module@^2.0.0:
670670
version "2.0.0"

0 commit comments

Comments
 (0)