Skip to content

Commit 5eb18c6

Browse files
aeschliaeschli
committed
merge with master
2 parents 890d482 + 3479e3b commit 5eb18c6

333 files changed

Lines changed: 8086 additions & 3798 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.

‎.github/classifier.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
css-less-scss: [ aeschli ],
1616
debug-console: [],
1717
debug: {
18-
assignees: [ isidorn ],
18+
assignees: [ weinand ],
1919
assignLabel: false
2020
},
2121
diff-editor: [],

‎OSSREADME.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[
33
{
44
"name": "chromium",
5-
"version": "58.0.3029.110",
5+
"version": "61.0.3163.100",
66
"repositoryURL": "http://www.chromium.org/Home",
77
"licenseDetail": [
88
"BSD License",
@@ -38,20 +38,20 @@
3838
},
3939
{
4040
"name": "libchromiumcontent",
41-
"version": "58.0.3029.110",
41+
"version": "61.0.3163.100",
4242
"license": "MIT",
4343
"repositoryURL": "https://github.com/electron/libchromiumcontent",
4444
"isProd": true
4545
},
4646
{
4747
"name": "nodejs",
48-
"version": "7.9.0",
48+
"version": "8.9.3",
4949
"repositoryURL": "https://github.com/nodejs/node",
5050
"isProd": true
5151
},
5252
{
5353
"name": "electron",
54-
"version": "1.7.3",
54+
"version": "2.0.5",
5555
"license": "MIT",
5656
"repositoryURL": "https://github.com/electron/electron",
5757
"isProd": true

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Visual Studio Code - Open Source
22

33
[![Build Status](https://vscode.visualstudio.com/_apis/public/build/definitions/a4cdce18-a05c-4bb8-9476-5d07e63bfd76/1/badge?branch=master)](https://aka.ms/vscode-builds)
4-
[![Coverage Status](https://img.shields.io/coveralls/Microsoft/vscode/master.svg)](https://coveralls.io/github/Microsoft/vscode?branch=master)
54
[![Gitter](https://img.shields.io/badge/chat-on%20gitter-blue.svg)](https://gitter.im/Microsoft/vscode)
65

76
[VS Code](https://code.visualstudio.com) is a new type of tool that combines the simplicity of

‎ThirdPartyNotices.txt‎

Lines changed: 334 additions & 44 deletions
Large diffs are not rendered by default.

‎build/builtInExtensions.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[
22
{
33
"name": "ms-vscode.node-debug",
4-
"version": "1.26.6",
4+
"version": "1.27.1",
55
"repo": "https://github.com/Microsoft/vscode-node-debug"
66
},
77
{
88
"name": "ms-vscode.node-debug2",
9-
"version": "1.26.7",
9+
"version": "1.26.8",
1010
"repo": "https://github.com/Microsoft/vscode-node-debug2"
1111
}
1212
]

‎build/monaco/monaco.d.ts.recipe‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ declare namespace monaco {
4444
}
4545

4646

47-
#include(vs/base/common/winjs.base.d.ts): TValueCallback, ProgressCallback, Promise
47+
#include(vs/base/common/winjs.base.d.ts): TValueCallback, Promise
4848
#include(vs/base/common/cancellation): CancellationTokenSource, CancellationToken
4949
#include(vs/base/common/uri): URI, UriComponents
5050
#include(vs/editor/common/standalone/standaloneBase): KeyCode, KeyMod

‎build/tfs/linux/product-build-linux.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ steps:
103103
# Write config files needed by API, use eval to force environment variable expansion
104104
pushd build/tfs/linux
105105
# Submit to apt repo
106-
if [ "$DEB_ARCH" = "amd64" ]; then
107-
echo "{ \"server\": \"azure-apt-cat.cloudapp.net\", \"protocol\": \"https\", \"port\": \"443\", \"repositoryId\": \"58a4adf642421134a1a48d1a\", \"username\": \"vscode\", \"password\": \"$(LINUX_REPO_PASSWORD)\" }" > apt-config.json
108-
./repoapi_client.sh -config apt-config.json -addfile $DEB_PATH
109-
fi
106+
# if [ "$DEB_ARCH" = "amd64" ]; then
107+
# echo "{ \"server\": \"azure-apt-cat.cloudapp.net\", \"protocol\": \"https\", \"port\": \"443\", \"repositoryId\": \"58a4adf642421134a1a48d1a\", \"username\": \"vscode\", \"password\": \"$(LINUX_REPO_PASSWORD)\" }" > apt-config.json
108+
# ./repoapi_client.sh -config apt-config.json -addfile $DEB_PATH
109+
# fi
110110
# Submit to yum repo (disabled as it's manual until signing is automated)
111111
# eval echo '{ \"server\": \"azure-apt-cat.cloudapp.net\", \"protocol\": \"https\", \"port\": \"443\", \"repositoryId\": \"58a4ae3542421134a1a48d1b\", \"username\": \"vscode\", \"password\": \"$(LINUX_REPO_PASSWORD)\" }' > yum-config.json
112112

‎build/win32/code.iss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ begin
975975
RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleTargetAppId}', 2, 38) + '_is1';
976976
977977
if RegKeyExists({#IncompatibleArchRootKey}, RegKey) then begin
978-
if MsgBox('{#NameShort} is already installed on this system for all users. Are you sure you want to install it for this user?', mbConfirmation, MB_YESNO) = IDNO then begin
978+
if MsgBox('{#NameShort} is already installed on this system for all users. We recommend first uninstalling that version before installing this one. Are you sure you want to continue the installation?', mbConfirmation, MB_YESNO) = IDNO then begin
979979
Result := false;
980980
end;
981981
end;
@@ -1139,4 +1139,4 @@ end;
11391139
11401140
#ifdef Debug
11411141
#expr SaveToFile(AddBackslash(SourcePath) + "code-processed.iss")
1142-
#endif
1142+
#endif

‎extensions/css-language-features/.vscode/launch.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,26 @@
5454
],
5555
"smartStep": true,
5656
"restart": true
57+
},
58+
{
59+
"name": "Server Unit Tests",
60+
"type": "node",
61+
"request": "launch",
62+
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
63+
"stopOnEntry": false,
64+
"args": [
65+
"--timeout",
66+
"999999",
67+
"--colors"
68+
],
69+
"cwd": "${workspaceRoot}",
70+
"runtimeExecutable": null,
71+
"runtimeArgs": [],
72+
"env": {},
73+
"sourceMaps": true,
74+
"outFiles": [
75+
"${workspaceRoot}/server/out/**"
76+
]
5777
}
5878
]
5979
}

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"scripts": {
2020
"compile": "gulp compile-extension:css-language-features-client compile-extension:css-language-features-server",
2121
"watch": "gulp watch-extension:css-language-features-client watch-extension:css-language-features-server",
22+
"test": "mocha",
2223
"postinstall": "cd server && yarn install",
2324
"install-client-next": "yarn add vscode-languageclient@next"
2425
},
@@ -109,7 +110,7 @@
109110
"error"
110111
],
111112
"default": "ignore",
112-
"description": "%css.lint.boxModel.desc%"
113+
"markdownDescription": "%css.lint.boxModel.desc%"
113114
},
114115
"css.lint.universalSelector": {
115116
"type": "string",
@@ -120,7 +121,7 @@
120121
"error"
121122
],
122123
"default": "ignore",
123-
"description": "%css.lint.universalSelector.desc%"
124+
"markdownDescription": "%css.lint.universalSelector.desc%"
124125
},
125126
"css.lint.zeroUnits": {
126127
"type": "string",
@@ -208,7 +209,7 @@
208209
"error"
209210
],
210211
"default": "warning",
211-
"description": "%css.lint.propertyIgnoredDueToDisplay.desc%"
212+
"markdownDescription": "%css.lint.propertyIgnoredDueToDisplay.desc%"
212213
},
213214
"css.lint.important": {
214215
"type": "string",
@@ -230,7 +231,7 @@
230231
"error"
231232
],
232233
"default": "ignore",
233-
"description": "%css.lint.float.desc%"
234+
"markdownDescription": "%css.lint.float.desc%"
234235
},
235236
"css.lint.idSelector": {
236237
"type": "string",
@@ -349,7 +350,7 @@
349350
"error"
350351
],
351352
"default": "ignore",
352-
"description": "%scss.lint.boxModel.desc%"
353+
"markdownDescription": "%scss.lint.boxModel.desc%"
353354
},
354355
"scss.lint.universalSelector": {
355356
"type": "string",
@@ -360,7 +361,7 @@
360361
"error"
361362
],
362363
"default": "ignore",
363-
"description": "%scss.lint.universalSelector.desc%"
364+
"markdownDescription": "%scss.lint.universalSelector.desc%"
364365
},
365366
"scss.lint.zeroUnits": {
366367
"type": "string",
@@ -382,7 +383,7 @@
382383
"error"
383384
],
384385
"default": "warning",
385-
"description": "%scss.lint.fontFaceProperties.desc%"
386+
"markdownDescription": "%scss.lint.fontFaceProperties.desc%"
386387
},
387388
"scss.lint.hexColorLength": {
388389
"type": "string",
@@ -448,7 +449,7 @@
448449
"error"
449450
],
450451
"default": "warning",
451-
"description": "%scss.lint.propertyIgnoredDueToDisplay.desc%"
452+
"markdownDescription": "%scss.lint.propertyIgnoredDueToDisplay.desc%"
452453
},
453454
"scss.lint.important": {
454455
"type": "string",
@@ -459,7 +460,7 @@
459460
"error"
460461
],
461462
"default": "ignore",
462-
"description": "%scss.lint.important.desc%"
463+
"markdownDescription": "%scss.lint.important.desc%"
463464
},
464465
"scss.lint.float": {
465466
"type": "string",
@@ -470,7 +471,7 @@
470471
"error"
471472
],
472473
"default": "ignore",
473-
"description": "%scss.lint.float.desc%"
474+
"markdownDescription": "%scss.lint.float.desc%"
474475
},
475476
"scss.lint.idSelector": {
476477
"type": "string",
@@ -568,7 +569,7 @@
568569
"error"
569570
],
570571
"default": "ignore",
571-
"description": "%less.lint.boxModel.desc%"
572+
"markdownDescription": "%less.lint.boxModel.desc%"
572573
},
573574
"less.lint.universalSelector": {
574575
"type": "string",
@@ -579,7 +580,7 @@
579580
"error"
580581
],
581582
"default": "ignore",
582-
"description": "%less.lint.universalSelector.desc%"
583+
"markdownDescription": "%less.lint.universalSelector.desc%"
583584
},
584585
"less.lint.zeroUnits": {
585586
"type": "string",
@@ -601,7 +602,7 @@
601602
"error"
602603
],
603604
"default": "warning",
604-
"description": "%less.lint.fontFaceProperties.desc%"
605+
"markdownDescription": "%less.lint.fontFaceProperties.desc%"
605606
},
606607
"less.lint.hexColorLength": {
607608
"type": "string",
@@ -667,7 +668,7 @@
667668
"error"
668669
],
669670
"default": "warning",
670-
"description": "%less.lint.propertyIgnoredDueToDisplay.desc%"
671+
"markdownDescription": "%less.lint.propertyIgnoredDueToDisplay.desc%"
671672
},
672673
"less.lint.important": {
673674
"type": "string",
@@ -689,7 +690,7 @@
689690
"error"
690691
],
691692
"default": "ignore",
692-
"description": "%less.lint.float.desc%"
693+
"markdownDescription": "%less.lint.float.desc%"
693694
},
694695
"less.lint.idSelector": {
695696
"type": "string",

0 commit comments

Comments
 (0)