Skip to content

Commit 22b8925

Browse files
author
Miguel Solorio
authored
Merge branch 'master' into misolori/activity-bar-active
2 parents d67491f + 23956cc commit 22b8925

115 files changed

Lines changed: 2515 additions & 1014 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.

‎.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 "4.2.10"
2+
target "6.0.12"
33
runtime "electron"

‎build/gulpfile.vscode.linux.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function prepareDebPackage(arch) {
4343
.pipe(replace('@@NAME_SHORT@@', product.nameShort))
4444
.pipe(replace('@@NAME@@', product.applicationName))
4545
.pipe(replace('@@EXEC@@', `/usr/share/${product.applicationName}/${product.applicationName}`))
46-
.pipe(replace('@@ICON@@', product.linuxIconName))
46+
.pipe(replace('@@ICON@@', `/usr/share/pixmaps/${product.linuxIconName}.png`))
4747
.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
4848

4949
const appdata = gulp.src('resources/linux/code.appdata.xml', { base: '.' })

‎cgmanifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "chromium",
88
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
9-
"commitHash": "c6a08e5368de4352903e702cde750b33239a50ab"
9+
"commitHash": "91f08db83c2ce8c722ddf0911ead8f7c473bedfa"
1010
}
1111
},
1212
"licenseDetail": [
@@ -40,32 +40,32 @@
4040
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
4141
],
4242
"isOnlyProductionDependency": true,
43-
"version": "69.0.3497.128"
43+
"version": "76.0.3809.146"
4444
},
4545
{
4646
"component": {
4747
"type": "git",
4848
"git": {
4949
"name": "nodejs",
5050
"repositoryUrl": "https://github.com/nodejs/node",
51-
"commitHash": "8c70b2084ce5f76ea1e3b3c4ccdeee4483fe338b"
51+
"commitHash": "64219741218aa87e259cf8257596073b8e747f0a"
5252
}
5353
},
5454
"isOnlyProductionDependency": true,
55-
"version": "10.11.0"
55+
"version": "12.4.0"
5656
},
5757
{
5858
"component": {
5959
"type": "git",
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "4e4c7527c63fcf27dffaeb58bde996b8d859c0ed"
63+
"commitHash": "1e50380fab37f407c4d357e1e30ecbc3d5a703b8"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "4.2.10"
68+
"version": "6.0.12"
6969
},
7070
{
7171
"component": {

‎extensions/git/src/commands.ts‎

100755100644
File mode changed.

‎extensions/git/src/repository.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,9 @@ export class Repository implements Disposable {
691691
this.disposables.push(new FileEventLogger(onWorkspaceWorkingTreeFileChange, onDotGitFileChange, outputChannel));
692692

693693
const root = Uri.file(repository.root);
694-
this._sourceControl = scm.createSourceControl('git', 'Git', root);
694+
this._sourceControl = scm.createSourceControl('git', 'Git', root, {
695+
treeRendering: true
696+
});
695697

696698
this._sourceControl.acceptInputCommand = { command: 'git.commit', title: localize('commit', "Commit"), arguments: [this._sourceControl] };
697699
this._sourceControl.quickDiffProvider = this;

‎extensions/json-language-features/server/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The JSON language server has the following dependencies on the client's capabili
4444

4545
The client can send the following initialization options to the server:
4646

47-
- `provideFormatter: boolean | undefined`. If defined, the value defines wheter the server provides the `documentRangeFormattingProvider` capability on initialization. If undefined, the setting `json.format.enable` is used to determined wheter formatting is provided. The formatter will then be registered through dynamic registration. If the client does not support dynamic registration, no formatter will be available.
47+
- `provideFormatter: boolean | undefined`. If defined, the value defines whether the server provides the `documentRangeFormattingProvider` capability on initialization. If undefined, the setting `json.format.enable` is used to determine whether formatting is provided. The formatter will then be registered through dynamic registration. If the client does not support dynamic registration, no formatter will be available.
4848
- `handledSchemaProtocols`: The URI schemas handles by the server. See section `Schema configuration` below.
4949

5050
### Settings
@@ -60,7 +60,7 @@ The server supports the following settings:
6060
- `format`
6161
- `enable`: Whether the server should register the formatting support. This option is only applicable if the client supports *dynamicRegistration* for *rangeFormatting* and `initializationOptions.provideFormatter` is not defined.
6262
- `schema`: Configures association of file names to schema URL or schemas and/or associations of schema URL to schema content.
63-
- `fileMatch`: an array or file names or paths (separated by `/`). `*` can be used as a wildcard.
63+
- `fileMatch`: an array of file names or paths (separated by `/`). `*` can be used as a wildcard.
6464
- `url`: The URL of the schema, optional when also a schema is provided.
6565
- `schema`: The schema content.
6666

@@ -99,9 +99,9 @@ To find the schema for a given JSON document, the server uses the following mech
9999
- The settings define a schema association based on the documents URL. Settings can either associate a schema URL to a file or path pattern, and they can directly provide a schema.
100100
- Additionally, schema associations can also be provided by a custom 'schemaAssociations' configuration call.
101101

102-
Schemas are identified by URLs. To load the content of a schema, the JSON language server either tries to load from that URI or path itself, or delegates to the client.
102+
Schemas are identified by URLs. To load the content of a schema, the JSON language server either tries to load from that URI or path itself or delegates to the client.
103103

104-
The `initializationOptions.handledSchemaProtocols` initialization option defines which URLs are handled by the server. Requests for all other URIs are send to the client.
104+
The `initializationOptions.handledSchemaProtocols` initialization option defines which URLs are handled by the server. Requests for all other URIs are sent to the client.
105105

106106
`handledSchemaProtocols` is part of the initialization options and can't be changed while the server is running.
107107

@@ -121,7 +121,7 @@ If `handledSchemaProtocols` is not set, the JSON language server will load the f
121121

122122
#### Schema content request
123123

124-
Requests for schemas with URLs not handled by the server are forwarded to the client through an LSP request. This request is a JSON language server specific, non-standardized, extension to the LSP.
124+
Requests for schemas with URLs not handled by the server are forwarded to the client through an LSP request. This request is a JSON language server-specific, non-standardized, extension to the LSP.
125125

126126
Request:
127127
- method: 'vscode/content'
@@ -130,12 +130,12 @@ Request:
130130

131131
#### Schema content change notification
132132

133-
When the client is aware that a schema content has changed, it will notify the server through a notification. This notification is a JSON language server specific, non-standardized, extension to the LSP.
133+
When the client is aware that a schema content has changed, it will notify the server through a notification. This notification is a JSON language server-specific, non-standardized, extension to the LSP.
134134
The server will, as a response, clear the schema content from the cache and reload the schema content when required again.
135135

136136
#### Schema associations notification
137137

138-
In addition to the settings, schemas associations can also be provided through a notification from the client to the server. This notification is a JSON language server specific, non-standardized, extension to the LSP.
138+
In addition to the settings, schemas associations can also be provided through a notification from the client to the server. This notification is a JSON language server-specific, non-standardized, extension to the LSP.
139139

140140
Notification:
141141
- method: 'json/schemaAssociations'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "vscode-json-languageserver",
33
"description": "JSON language server",
4-
"version": "1.2.1",
4+
"version": "1.2.2",
55
"author": "Microsoft Corporation",
66
"license": "MIT",
77
"engines": {

‎remote/.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "http://nodejs.org/dist"
2-
target "10.11.0"
2+
target "12.4.0"
33
runtime "node"

‎resources/linux/code-url-handler.desktop‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Name=@@NAME_LONG@@ - URL Handler
33
Comment=Code Editing. Redefined.
44
GenericName=Text Editor
5-
Exec=@@EXEC@@ --open-url %U
5+
Exec=@@EXEC@@ --no-sandbox --open-url %U
66
Icon=@@ICON@@
77
Type=Application
88
NoDisplay=true

‎resources/linux/code.desktop‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Name=@@NAME_LONG@@
33
Comment=Code Editing. Redefined.
44
GenericName=Text Editor
5-
Exec=@@EXEC@@ --unity-launch %F
5+
Exec=@@EXEC@@ --no-sandbox --unity-launch %F
66
Icon=@@ICON@@
77
Type=Application
88
StartupNotify=false
@@ -14,5 +14,5 @@ Keywords=vscode;
1414

1515
[Desktop Action new-empty-window]
1616
Name=New Empty Window
17-
Exec=@@EXEC@@ --new-window %F
17+
Exec=@@EXEC@@ --no-sandbox --new-window %F
1818
Icon=@@ICON@@

0 commit comments

Comments
 (0)