Merge branch 'electron-4.0.x' into misolori/icons-e4

microsoft · May 29, 2019 · a2873dc · a2873dc
2 parents fb34c44 + a46d25c
commit a2873dc
Show file tree

Hide file tree

Showing 100 changed files with 4,508 additions and 754 deletions.
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
@@ -5,69 +5,107 @@ Do Not Translate or Localize
 
 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.
 
-1.	atom/language-clojure version 0.22.6 (https://github.com/atom/language-clojure)
-2.	atom/language-coffee-script version 0.49.3 (https://github.com/atom/language-coffee-script)
-3.	atom/language-java version 0.31.1 (https://github.com/atom/language-java)
-4.	atom/language-objective-c version 0.15.0 (https://github.com/atom/language-objective-c)
-5.	atom/language-sass version 0.61.4 (https://github.com/atom/language-sass)
-6.	atom/language-shellscript version 0.26.0 (https://github.com/atom/language-shellscript)
-7.	atom/language-xml version 0.35.2 (https://github.com/atom/language-xml)
-8.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
-9.	daaain/Handlebars version 1.7.1 (https://github.com/daaain/Handlebars)
-10.	davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
-11.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
-12.	demyte/language-cshtml version 0.3.0 (https://github.com/demyte/language-cshtml)
-13.	Document Object Model version 4.0.0 (https://www.w3.org/DOM/)
-14.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
-15.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
-16.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
-17.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
-18.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
-19.	Ikuyadeu/vscode-R version 0.5.5 (https://github.com/Ikuyadeu/vscode-R)
-20.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
-21.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
-22.	jeff-hykin/cpp-textmate-grammar version 1.8.8 (https://github.com/jeff-hykin/cpp-textmate-grammar)
-23.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
-24.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
-25.	language-docker (https://github.com/moby/moby)
-26.	language-go version 0.44.3 (https://github.com/atom/language-go)
-27.	language-less version 0.34.2 (https://github.com/atom/language-less)
-28.	language-php version 0.44.1 (https://github.com/atom/language-php)
-29.	language-rust version 0.4.12 (https://github.com/zargony/atom-language-rust)
-30.	MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython)
-31.	marked version 0.6.2 (https://github.com/markedjs/marked)
-32.	mdn-data version 1.1.12 (https://github.com/mdn/data)
-33.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
-34.	Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
-35.	Microsoft/vscode-mssql version 1.4.0 (https://github.com/Microsoft/vscode-mssql)
-36.	mmims/language-batchfile version 0.7.5 (https://github.com/mmims/language-batchfile)
-37.	octicons version 8.3.0 (https://github.com/primer/octicons)
-38.	octref/language-css version 0.42.11 (https://github.com/octref/language-css)
-39.	PowerShell/EditorSyntax (https://github.com/powershell/editorsyntax)
-40.	promise-polyfill version 8.0.0 (https://github.com/taylorhakes/promise-polyfill)
-41.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
-42.	shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
-43.	textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
-44.	textmate/c.tmbundle (https://github.com/textmate/c.tmbundle)
-45.	textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle)
-46.	textmate/git.tmbundle (https://github.com/textmate/git.tmbundle)
-47.	textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle)
-48.	textmate/html.tmbundle (https://github.com/textmate/html.tmbundle)
-49.	textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle)
-50.	textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle)
-51.	textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle)
-52.	textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
-53.	textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
-54.	textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
-55.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
-56.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
-57.	TypeScript-TmLanguage version 1.0.0 (https://github.com/Microsoft/TypeScript-TmLanguage)
-58.	Unicode version 12.0.0 (http://www.unicode.org/)
-59.	vscode-logfile-highlighter version 2.4.1 (https://github.com/emilast/vscode-logfile-highlighter)
-60.	vscode-octicons-font version 1.1.0 (https://github.com/Microsoft/vscode-octicons-font)
-61.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
-62.	Web Background Synchronization (https://github.com/WICG/BackgroundSync)
+1.	atom/language-c version 0.58.1 (https://github.com/atom/language-c)
+2.	atom/language-clojure version 0.22.7 (https://github.com/atom/language-clojure)
+3.	atom/language-coffee-script version 0.49.3 (https://github.com/atom/language-coffee-script)
+4.	atom/language-java version 0.31.2 (https://github.com/atom/language-java)
+5.	atom/language-objective-c version 0.15.0 (https://github.com/atom/language-objective-c)
+6.	atom/language-sass version 0.61.4 (https://github.com/atom/language-sass)
+7.	atom/language-shellscript version 0.26.0 (https://github.com/atom/language-shellscript)
+8.	atom/language-xml version 0.35.2 (https://github.com/atom/language-xml)
+9.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
+10.	daaain/Handlebars version 1.8.0 (https://github.com/daaain/Handlebars)
+11.	davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
+12.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
+13.	demyte/language-cshtml version 0.3.0 (https://github.com/demyte/language-cshtml)
+14.	Document Object Model version 4.0.0 (https://www.w3.org/DOM/)
+15.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
+16.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
+17.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
+18.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
+19.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
+20.	Ikuyadeu/vscode-R version 0.5.5 (https://github.com/Ikuyadeu/vscode-R)
+21.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
+22.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
+23.	jeff-hykin/cpp-textmate-grammar version 1.8.15 (https://github.com/jeff-hykin/cpp-textmate-grammar)
+24.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
+25.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
+26.	language-docker (https://github.com/moby/moby)
+27.	language-go version 0.44.3 (https://github.com/atom/language-go)
+28.	language-less version 0.34.2 (https://github.com/atom/language-less)
+29.	language-php version 0.44.1 (https://github.com/atom/language-php)
+30.	language-rust version 0.4.12 (https://github.com/zargony/atom-language-rust)
+31.	MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython)
+32.	marked version 0.6.2 (https://github.com/markedjs/marked)
+33.	mdn-data version 1.1.12 (https://github.com/mdn/data)
+34.	Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage)
+35.	Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage)
+36.	Microsoft/vscode-mssql version 1.4.0 (https://github.com/Microsoft/vscode-mssql)
+37.	mmims/language-batchfile version 0.7.5 (https://github.com/mmims/language-batchfile)
+38.	octicons version 8.3.0 (https://github.com/primer/octicons)
+39.	octref/language-css version 0.42.11 (https://github.com/octref/language-css)
+40.	PowerShell/EditorSyntax (https://github.com/powershell/editorsyntax)
+41.	promise-polyfill version 8.0.0 (https://github.com/taylorhakes/promise-polyfill)
+42.	seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui)
+43.	shaders-tmLanguage version 0.1.0 (https://github.com/tgjones/shaders-tmLanguage)
+44.	textmate/asp.vb.net.tmbundle (https://github.com/textmate/asp.vb.net.tmbundle)
+45.	textmate/c.tmbundle (https://github.com/textmate/c.tmbundle)
+46.	textmate/diff.tmbundle (https://github.com/textmate/diff.tmbundle)
+47.	textmate/git.tmbundle (https://github.com/textmate/git.tmbundle)
+48.	textmate/groovy.tmbundle (https://github.com/textmate/groovy.tmbundle)
+49.	textmate/html.tmbundle (https://github.com/textmate/html.tmbundle)
+50.	textmate/ini.tmbundle (https://github.com/textmate/ini.tmbundle)
+51.	textmate/javascript.tmbundle (https://github.com/textmate/javascript.tmbundle)
+52.	textmate/lua.tmbundle (https://github.com/textmate/lua.tmbundle)
+53.	textmate/markdown.tmbundle (https://github.com/textmate/markdown.tmbundle)
+54.	textmate/perl.tmbundle (https://github.com/textmate/perl.tmbundle)
+55.	textmate/ruby.tmbundle (https://github.com/textmate/ruby.tmbundle)
+56.	textmate/yaml.tmbundle (https://github.com/textmate/yaml.tmbundle)
+57.	TypeScript-TmLanguage version 0.1.8 (https://github.com/Microsoft/TypeScript-TmLanguage)
+58.	TypeScript-TmLanguage version 1.0.0 (https://github.com/Microsoft/TypeScript-TmLanguage)
+59.	Unicode version 12.0.0 (http://www.unicode.org/)
+60.	vscode-logfile-highlighter version 2.4.1 (https://github.com/emilast/vscode-logfile-highlighter)
+61.	vscode-octicons-font version 1.2.0 (https://github.com/Microsoft/vscode-octicons-font)
+62.	vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
+63.	Web Background Synchronization (https://github.com/WICG/BackgroundSync)
+
+
+%% atom/language-c NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
+Copyright (c) 2014 GitHub Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
+This package was derived from a TextMate bundle located at
+https://github.com/textmate/c.tmbundle and distributed under the following
+license, located in `README.mdown`:
+
+Permission to copy, use, modify, sell and distribute this
+software is granted. This software is provided "as is" without
+express or implied warranty, and with no claim as to its
+suitability for any purpose.
+=========================================
+END OF atom/language-c NOTICES AND INFORMATION
 
 %% atom/language-clojure NOTICES AND INFORMATION BEGIN HERE
 =========================================

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
@@ -1,7 +1,7 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.33.3",
+		"version": "1.35.2",
 		"repo": "https://github.com/Microsoft/vscode-node-debug",
 		"metadata": {
 			"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",

diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json
@@ -123,6 +123,11 @@
             "Below"
           ],
           "description": "%config.diffViewPosition%",
+          "enumDescriptions": [
+            "%config.diffViewPosition.current%",
+            "%config.diffViewPosition.beside%",
+            "%config.diffViewPosition.below%"
+          ],
           "default": "Current"
         }
       }

diff --git a/extensions/merge-conflict/package.nls.json b/extensions/merge-conflict/package.nls.json
@@ -16,5 +16,8 @@
 	"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
 	"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
 	"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
-	"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts."
+	"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts.",
+	"config.diffViewPosition.current": "Open the diff view in the current editor group.",
+	"config.diffViewPosition.beside": "Open the diff view next to the current editor group.",
+	"config.diffViewPosition.below": "Open the diff view below the current editor group."
 }
diff --git a/extensions/objective-c/cgmanifest.json b/extensions/objective-c/cgmanifest.json
@@ -12,6 +12,19 @@
 			"license": "MIT",
 			"description": "The files syntaxes/objective-c.tmLanguage.json and syntaxes/objective-c++.tmLanguage.json were derived from the Atom package https://github.com/atom/language-objective-c which was originally converted from the TextMate bundle https://github.com/textmate/objective-c.tmbundle.",
 			"version": "0.15.0"
+		},
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "atom/language-c",
+					"repositoryUrl": "https://github.com/atom/language-c",
+					"commitHash": "9c0c5f202741a5647025db8d5df5fefba47b036c"
+				}
+			},
+			"license": "MIT",
+			"version": "0.58.1",
+			"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from the Atom package https://atom.io/packages/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
 		}
 	],
 	"version": 1