Skip to content

Commit bbb102e

Browse files
aeschliaeschli
committed
Merge branch 'master' into aeschli/remote-workspaces
2 parents b39ed1f + a9a726a commit bbb102e

389 files changed

Lines changed: 7232 additions & 6063 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
@@ -63,7 +63,7 @@
6363
assignLabel: false
6464
},
6565
file-explorer: {
66-
assignees: [ isidorn ],
66+
assignees: [ bpasero ],
6767
assignLabel: false
6868
},
6969
file-glob: [],

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.9.2
1+
8

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "3.1.0"
2+
target "3.1.2"
33
runtime "electron"

‎ThirdPartyNotices.txt‎

Lines changed: 88 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@ Do Not Translate or Localize
55

66
This project incorporates components from the projects listed below. The original copyright notices and the licenses under which Microsoft received such components are set forth below. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise.
77

8-
1. atom/language-c (https://github.com/atom/language-c)
9-
2. atom/language-clojure (https://github.com/atom/language-clojure)
10-
3. atom/language-coffee-script (https://github.com/atom/language-coffee-script)
8+
1. atom/language-c version 0.58.1 (https://github.com/atom/language-c)
9+
2. atom/language-clojure version 0.22.6 (https://github.com/atom/language-clojure)
10+
3. atom/language-coffee-script version 0.49.3 (https://github.com/atom/language-coffee-script)
1111
4. atom/language-css (https://github.com/atom/language-css)
12-
5. atom/language-java (https://github.com/atom/language-java)
13-
6. atom/language-objective-c (https://github.com/atom/language-objective-c)
14-
7. atom/language-sass version 0.52.0 (https://github.com/atom/language-sass)
15-
8. atom/language-shellscript (https://github.com/atom/language-shellscript)
16-
9. atom/language-xml (https://github.com/atom/language-xml)
12+
5. atom/language-java version 0.31.1 (https://github.com/atom/language-java)
13+
6. atom/language-objective-c version 0.15.0 (https://github.com/atom/language-objective-c)
14+
7. atom/language-sass version 0.61.4 (https://github.com/atom/language-sass)
15+
8. atom/language-shellscript version 0.26.0 (https://github.com/atom/language-shellscript)
16+
9. atom/language-xml version 0.35.2 (https://github.com/atom/language-xml)
1717
10. chriskempson/tomorrow-theme (https://github.com/chriskempson/tomorrow-theme)
1818
11. Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
19-
12. daaain/Handlebars (https://github.com/daaain/Handlebars)
19+
12. daaain/Handlebars version 1.7.1 (https://github.com/daaain/Handlebars)
2020
13. davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
2121
14. definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
22-
15. demyte/language-cshtml (https://github.com/demyte/language-cshtml)
22+
15. demyte/language-cshtml version 0.3.0 (https://github.com/demyte/language-cshtml)
2323
16. Document Object Model version 4.0.0 (https://www.w3.org/DOM/)
2424
17. dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
2525
18. expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
2626
19. fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
2727
20. freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
2828
21. HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
29-
22. Ikuyadeu/vscode-R (https://github.com/Ikuyadeu/vscode-R)
29+
22. Ikuyadeu/vscode-R version 0.5.5 (https://github.com/Ikuyadeu/vscode-R)
3030
23. Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
3131
24. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
3232
25. js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
3333
26. Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
3434
27. language-docker (https://github.com/moby/moby)
35-
28. language-go version 0.39.0 (https://github.com/atom/language-go)
36-
29. language-less (https://github.com/atom/language-less)
37-
30. language-php (https://github.com/atom/language-php)
38-
31. language-rust version 0.4.9 (https://github.com/zargony/atom-language-rust)
39-
32. MagicStack/MagicPython (https://github.com/MagicStack/MagicPython)
35+
28. language-go version 0.44.3 (https://github.com/atom/language-go)
36+
29. language-less version 0.34.2 (https://github.com/atom/language-less)
37+
30. language-php version 0.43.2 (https://github.com/atom/language-php)
38+
31. language-rust version 0.4.12 (https://github.com/zargony/atom-language-rust)
39+
32. MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython)
4040
33. marked version 0.5.0 (https://github.com/markedjs/marked)
4141
34. mdn-data version 1.1.12 (https://github.com/mdn/data)
4242
35. Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
4343
36. Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
44-
37. Microsoft/vscode-mssql (https://github.com/Microsoft/vscode-mssql)
45-
38. mmims/language-batchfile (https://github.com/mmims/language-batchfile)
46-
39. octicons-code version 3.1.0 (https://registry.npmjs.org/octicons/-/octicons-3.1.0.tgz)
47-
40. octicons-font version 3.1.0 (https://registry.npmjs.org/octicons/-/octicons-3.1.0.tgz)
48-
41. PowerShell/EditorSyntax (https://github.com/powershell/editorsyntax)
44+
37. Microsoft/vscode-mssql version 1.4.0 (https://github.com/Microsoft/vscode-mssql)
45+
38. mmims/language-batchfile version 0.7.4 (https://github.com/mmims/language-batchfile)
46+
39. octicons version 8.3.0 (https://github.com/primer/octicons)
47+
40. PowerShell/EditorSyntax (https://github.com/powershell/editorsyntax)
48+
41. promise-polyfill version 8.0.0 (https://github.com/taylorhakes/promise-polyfill)
4949
42. seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
5050
43. shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
5151
44. textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
@@ -62,10 +62,12 @@ This project incorporates components from the projects listed below. The origina
6262
55. textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
6363
56. textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
6464
57. TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
65-
58. Unicode version 12.0.0 (http://www.unicode.org/)
66-
59. vscode-logfile-highlighter version 1.2.0 (https://github.com/emilast/vscode-logfile-highlighter)
67-
60. vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
68-
61. Web Background Synchronization (https://github.com/WICG/BackgroundSync)
65+
58. TypeScript-TmLanguage version 1.0.0 (https://github.com/Microsoft/TypeScript-TmLanguage)
66+
59. Unicode version 12.0.0 (http://www.unicode.org/)
67+
60. vscode-logfile-highlighter version 2.4.1 (https://github.com/emilast/vscode-logfile-highlighter)
68+
61. vscode-octicons-font version 1.0.0 (https://github.com/Microsoft/vscode-octicons-font)
69+
62. vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
70+
63. Web Background Synchronization (https://github.com/WICG/BackgroundSync)
6971

7072

7173
%% atom/language-c NOTICES AND INFORMATION BEGIN HERE
@@ -1800,11 +1802,11 @@ THE SOFTWARE.
18001802
=========================================
18011803
END OF mmims/language-batchfile NOTICES AND INFORMATION
18021804

1803-
%% octicons-code NOTICES AND INFORMATION BEGIN HERE
1805+
%% octicons NOTICES AND INFORMATION BEGIN HERE
18041806
=========================================
1805-
The MIT License (MIT)
1807+
MIT License
18061808

1807-
(c) 2012-2015 GitHub
1809+
Copyright (c) 2019 GitHub Inc.
18081810

18091811
Permission is hereby granted, free of charge, to any person obtaining a copy
18101812
of this software and associated documentation files (the "Software"), to deal
@@ -1813,109 +1815,18 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
18131815
copies of the Software, and to permit persons to whom the Software is
18141816
furnished to do so, subject to the following conditions:
18151817

1816-
The above copyright notice and this permission notice shall be included in
1817-
all copies or substantial portions of the Software.
1818+
The above copyright notice and this permission notice shall be included in all
1819+
copies or substantial portions of the Software.
18181820

18191821
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18201822
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18211823
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18221824
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18231825
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1824-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1825-
THE SOFTWARE.
1826-
=========================================
1827-
END OF octicons-code NOTICES AND INFORMATION
1828-
1829-
%% octicons-font NOTICES AND INFORMATION BEGIN HERE
1826+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1827+
SOFTWARE.
18301828
=========================================
1831-
(c) 2012-2015 GitHub
1832-
1833-
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
1834-
1835-
PREAMBLE
1836-
The goals of the Open Font License (OFL) are to stimulate worldwide
1837-
development of collaborative font projects, to support the font creation
1838-
efforts of academic and linguistic communities, and to provide a free and
1839-
open framework in which fonts may be shared and improved in partnership
1840-
with others.
1841-
1842-
The OFL allows the licensed fonts to be used, studied, modified and
1843-
redistributed freely as long as they are not sold by themselves. The
1844-
fonts, including any derivative works, can be bundled, embedded,
1845-
redistributed and/or sold with any software provided that any reserved
1846-
names are not used by derivative works. The fonts and derivatives,
1847-
however, cannot be released under any other type of license. The
1848-
requirement for fonts to remain under this license does not apply
1849-
to any document created using the fonts or their derivatives.
1850-
1851-
DEFINITIONS
1852-
"Font Software" refers to the set of files released by the Copyright
1853-
Holder(s) under this license and clearly marked as such. This may
1854-
include source files, build scripts and documentation.
1855-
1856-
"Reserved Font Name" refers to any names specified as such after the
1857-
copyright statement(s).
1858-
1859-
"Original Version" refers to the collection of Font Software components as
1860-
distributed by the Copyright Holder(s).
1861-
1862-
"Modified Version" refers to any derivative made by adding to, deleting,
1863-
or substituting -- in part or in whole -- any of the components of the
1864-
Original Version, by changing formats or by porting the Font Software to a
1865-
new environment.
1866-
1867-
"Author" refers to any designer, engineer, programmer, technical
1868-
writer or other person who contributed to the Font Software.
1869-
1870-
PERMISSION & CONDITIONS
1871-
Permission is hereby granted, free of charge, to any person obtaining
1872-
a copy of the Font Software, to use, study, copy, merge, embed, modify,
1873-
redistribute, and sell modified and unmodified copies of the Font
1874-
Software, subject to the following conditions:
1875-
1876-
1) Neither the Font Software nor any of its individual components,
1877-
in Original or Modified Versions, may be sold by itself.
1878-
1879-
2) Original or Modified Versions of the Font Software may be bundled,
1880-
redistributed and/or sold with any software, provided that each copy
1881-
contains the above copyright notice and this license. These can be
1882-
included either as stand-alone text files, human-readable headers or
1883-
in the appropriate machine-readable metadata fields within text or
1884-
binary files as long as those fields can be easily viewed by the user.
1885-
1886-
3) No Modified Version of the Font Software may use the Reserved Font
1887-
Name(s) unless explicit written permission is granted by the corresponding
1888-
Copyright Holder. This restriction only applies to the primary font name as
1889-
presented to the users.
1890-
1891-
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
1892-
Software shall not be used to promote, endorse or advertise any
1893-
Modified Version, except to acknowledge the contribution(s) of the
1894-
Copyright Holder(s) and the Author(s) or with their explicit written
1895-
permission.
1896-
1897-
5) The Font Software, modified or unmodified, in part or in whole,
1898-
must be distributed entirely under this license, and must not be
1899-
distributed under any other license. The requirement for fonts to
1900-
remain under this license does not apply to any document created
1901-
using the Font Software.
1902-
1903-
TERMINATION
1904-
This license becomes null and void if any of the above conditions are
1905-
not met.
1906-
1907-
DISCLAIMER
1908-
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1909-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
1910-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
1911-
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
1912-
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
1913-
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
1914-
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
1915-
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
1916-
OTHER DEALINGS IN THE FONT SOFTWARE.
1917-
=========================================
1918-
END OF octicons-font NOTICES AND INFORMATION
1829+
END OF octicons NOTICES AND INFORMATION
19191830

19201831
%% PowerShell/EditorSyntax NOTICES AND INFORMATION BEGIN HERE
19211832
=========================================
@@ -1945,6 +1856,33 @@ SOFTWARE.
19451856
=========================================
19461857
END OF PowerShell/EditorSyntax NOTICES AND INFORMATION
19471858

1859+
%% promise-polyfill NOTICES AND INFORMATION BEGIN HERE
1860+
=========================================
1861+
The MIT License (MIT)
1862+
1863+
Copyright (c) 2014 Taylor Hakes
1864+
Copyright (c) 2014 Forbes Lindesay
1865+
1866+
Permission is hereby granted, free of charge, to any person obtaining a copy
1867+
of this software and associated documentation files (the "Software"), to deal
1868+
in the Software without restriction, including without limitation the rights
1869+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1870+
copies of the Software, and to permit persons to whom the Software is
1871+
furnished to do so, subject to the following conditions:
1872+
1873+
The above copyright notice and this permission notice shall be included in
1874+
all copies or substantial portions of the Software.
1875+
1876+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1877+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1878+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1879+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1880+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1881+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1882+
THE SOFTWARE.
1883+
=========================================
1884+
END OF promise-polyfill NOTICES AND INFORMATION
1885+
19481886
%% seti-ui NOTICES AND INFORMATION BEGIN HERE
19491887
=========================================
19501888
Copyright (c) 2014 Jesse Weed
@@ -2357,6 +2295,32 @@ SOFTWARE.
23572295
=========================================
23582296
END OF vscode-logfile-highlighter NOTICES AND INFORMATION
23592297

2298+
%% vscode-octicons-font NOTICES AND INFORMATION BEGIN HERE
2299+
=========================================
2300+
MIT License
2301+
2302+
Copyright (c) Microsoft Corporation. All rights reserved.
2303+
2304+
Permission is hereby granted, free of charge, to any person obtaining a copy
2305+
of this software and associated documentation files (the "Software"), to deal
2306+
in the Software without restriction, including without limitation the rights
2307+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
2308+
copies of the Software, and to permit persons to whom the Software is
2309+
furnished to do so, subject to the following conditions:
2310+
2311+
The above copyright notice and this permission notice shall be included in all
2312+
copies or substantial portions of the Software.
2313+
2314+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2315+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2316+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2317+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2318+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2319+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2320+
SOFTWARE
2321+
=========================================
2322+
END OF vscode-octicons-font NOTICES AND INFORMATION
2323+
23602324
%% vscode-swift NOTICES AND INFORMATION BEGIN HERE
23612325
=========================================
23622326
The MIT License (MIT)

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ steps:
2323
set -e
2424
VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
2525
AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
26-
yarn gulp -- vscode-darwin-min upload-vscode-sourcemaps
26+
yarn gulp -- vscode-darwin-min
27+
VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
28+
AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
29+
yarn gulp -- upload-vscode-sourcemaps
2730
displayName: Build
2831

2932
- script: |

‎build/builtInExtensions.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "ms-vscode.node-debug",
4-
"version": "1.31.1",
4+
"version": "1.31.2",
55
"repo": "https://github.com/Microsoft/vscode-node-debug",
66
"metadata": {
77
"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",
@@ -16,7 +16,7 @@
1616
},
1717
{
1818
"name": "ms-vscode.node-debug2",
19-
"version": "1.31.3",
19+
"version": "1.31.5",
2020
"repo": "https://github.com/Microsoft/vscode-node-debug2",
2121
"metadata": {
2222
"id": "36d19e17-7569-4841-a001-947eb18602b2",
@@ -31,7 +31,7 @@
3131
},
3232
{
3333
"name": "ms-vscode.references-view",
34-
"version": "0.0.23",
34+
"version": "0.0.25",
3535
"repo": "https://github.com/Microsoft/vscode-reference-view",
3636
"metadata": {
3737
"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",

‎build/gulpfile.compile.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
'use strict';
7+
8+
const util = require('./lib/util');
9+
const compilation = require('./lib/compilation');
10+
const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
11+
12+
// Full compile, including nls and inline sources in sourcemaps, for build
13+
const compileClientBuildTask = util.task.series(util.rimraf('out-build'), compilation.compileTask('src', 'out-build', true));
14+
compileClientBuildTask.displayName = 'compile-client-build';
15+
16+
// All Build
17+
const compileBuildTask = util.task.parallel(compileClientBuildTask, compileExtensionsBuildTask);
18+
compileBuildTask.displayName = 'compile-build';
19+
20+
exports.compileBuildTask = compileBuildTask;

0 commit comments

Comments
 (0)