Skip to content

Commit 92ebddb

Browse files
author
Miguel Solorio
authored
Merge branch 'master' into misolori/icon-font-dialog
2 parents bc3bdf9 + 56a544b commit 92ebddb

387 files changed

Lines changed: 9826 additions & 4645 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.

‎.vscode/launch.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
"linux": {
132132
"runtimeExecutable": "${workspaceFolder}/scripts/code.sh"
133133
},
134+
"port": 9222,
134135
"timeout": 20000,
135136
"env": {
136137
"VSCODE_EXTHOST_WILL_SEND_SOCKET": null

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

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ This repository ("`Code - OSS`") is where we (Microsoft) develop the [Visual Stu
2222

2323
Visual Studio Code is updated monthly with new features and bug fixes. You can download it for Windows, macOS, and Linux on [Visual Studio Code's website](https://code.visualstudio.com/Download). To get the latest releases every day, install the [Insiders build](https://code.visualstudio.com/insiders).
2424

25-
26-
2725
## Contributing
2826

2927
There are many ways in which you can participate in the project, for example:
@@ -52,11 +50,11 @@ please see the document [How to Contribute](https://github.com/Microsoft/vscode/
5250

5351
## Related Projects
5452

55-
Many of the core components and extensions to Code live in their own repositories on GitHub. For example, the [node debug adapter](https://github.com/microsoft/vscode-node-debug) and the [mono debug adapter](https://github.com/microsoft/vscode-mono-debug) have their own repositories. For a complete list, please visit the [Related Projects](https://github.com/Microsoft/vscode/wiki/Related-Projects) page on our [wiki](https://github.com/Microsoft/vscode/wiki).
53+
Many of the core components and extensions to VS Code live in their own repositories on GitHub. For example, the [node debug adapter](https://github.com/microsoft/vscode-node-debug) and the [mono debug adapter](https://github.com/microsoft/vscode-mono-debug) have their own repositories. For a complete list, please visit the [Related Projects](https://github.com/Microsoft/vscode/wiki/Related-Projects) page on our [wiki](https://github.com/Microsoft/vscode/wiki).
5654

5755
## Bundled Extensions
5856

59-
Code includes a set of built-in extensions located in the [extensions](extensions) folder, including grammars and snippets for many languages. Extensions that provide rich language support (code completion, Go to Definition) for a language have the suffix `language-features`. For example, the `json` extension provides coloring for `JSON` and the `json-language-features` provides rich language support for `JSON`.
57+
VS Code includes a set of built-in extensions located in the [extensions](extensions) folder, including grammars and snippets for many languages. Extensions that provide rich language support (code completion, Go to Definition) for a language have the suffix `language-features`. For example, the `json` extension provides coloring for `JSON` and the `json-language-features` provides rich language support for `JSON`.
6058

6159
## Code of Conduct
6260

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,24 @@ steps:
1212
vstsFeed: 'npm-vscode'
1313
platformIndependent: true
1414
alias: 'Compilation'
15+
dryRun: true
1516

1617
- task: NodeTool@0
1718
inputs:
1819
versionSpec: "12.13.0"
19-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
20+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
2021

2122
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
2223
inputs:
2324
versionSpec: "1.x"
24-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
25+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
2526

2627
- task: AzureKeyVault@1
2728
displayName: 'Azure Key Vault: Get Secrets'
2829
inputs:
2930
azureSubscription: 'vscode-builds-subscription'
3031
KeyVaultName: vscode
31-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
32+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
3233

3334
- script: |
3435
set -e
@@ -41,70 +42,70 @@ steps:
4142
git config user.email "vscode@microsoft.com"
4243
git config user.name "VSCode"
4344
displayName: Prepare tooling
44-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
45+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
4546

4647
- script: |
4748
set -e
4849
git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
4950
git fetch distro
5051
git merge $(node -p "require('./package.json').distro")
5152
displayName: Merge distro
52-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
53+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
5354

5455
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
5556
inputs:
5657
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
5758
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
5859
vstsFeed: 'npm-vscode'
59-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
60+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
6061

6162
- script: |
6263
set -e
6364
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
6465
displayName: Install dependencies
65-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
66+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
6667

6768
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
6869
inputs:
6970
keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
7071
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
7172
vstsFeed: 'npm-vscode'
72-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
73+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
7374

7475
- script: |
7576
set -e
7677
yarn postinstall
7778
displayName: Run postinstall scripts
78-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
79+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
7980

8081
# Mixin must run before optimize, because the CSS loader will
8182
# inline small SVGs
8283
- script: |
8384
set -e
8485
node build/azure-pipelines/mixin
8586
displayName: Mix in quality
86-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
87+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
8788

8889
- script: |
8990
set -e
9091
yarn gulp hygiene --skip-tslint
9192
yarn gulp tslint
9293
yarn monaco-compile-check
9394
displayName: Run hygiene, tslint and monaco compile checks
94-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
95+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
9596

9697
- script: |
9798
set -
9899
./build/azure-pipelines/common/extract-telemetry.sh
99100
displayName: Extract Telemetry
100-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
101+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
101102

102103
- script: |
103104
set -e
104105
AZURE_WEBVIEW_STORAGE_ACCESS_KEY="$(vscode-webview-storage-key)" \
105106
./build/azure-pipelines/common/publish-webview.sh
106107
displayName: Publish Webview
107-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
108+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
108109

109110
- script: |
110111
set -e
@@ -114,22 +115,22 @@ steps:
114115
yarn gulp minify-vscode-reh
115116
yarn gulp minify-vscode-reh-web
116117
displayName: Compile
117-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
118+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
118119

119120
- script: |
120121
set -e
121122
AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
122123
node build/azure-pipelines/upload-sourcemaps
123124
displayName: Upload sourcemaps
124-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
125+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
125126

126127
- script: |
127128
set -e
128129
VERSION=`node -p "require(\"./package.json\").version"`
129130
AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
130131
node build/azure-pipelines/common/createBuild.js $VERSION
131132
displayName: Create build
132-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
133+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))
133134

134135
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
135136
inputs:
@@ -138,4 +139,4 @@ steps:
138139
vstsFeed: 'npm-vscode'
139140
platformIndependent: true
140141
alias: 'Compilation'
141-
condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
142+
condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'))

‎build/builtInExtensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "ms-vscode.node-debug",
4-
"version": "1.41.0",
4+
"version": "1.41.1",
55
"repo": "https://github.com/Microsoft/vscode-node-debug",
66
"metadata": {
77
"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",

‎build/gulpfile.extensions.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ const tasks = compilations.map(function (tsconfigFile) {
109109

110110
const compileTask = task.define(`compile-extension:${name}`, task.series(cleanTask, () => {
111111
const pipeline = createPipeline(false, true);
112-
const input = pipeline.tsProjectSrc();
112+
const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
113+
const input = es.merge(nonts, pipeline.tsProjectSrc());
113114

114115
return input
115116
.pipe(pipeline())
@@ -118,7 +119,8 @@ const tasks = compilations.map(function (tsconfigFile) {
118119

119120
const watchTask = task.define(`watch-extension:${name}`, task.series(cleanTask, () => {
120121
const pipeline = createPipeline(false);
121-
const input = pipeline.tsProjectSrc();
122+
const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
123+
const input = es.merge(nonts, pipeline.tsProjectSrc());
122124
const watchInput = watcher(src, { ...srcOpts, ...{ readDelay: 200 } });
123125

124126
return watchInput
@@ -128,7 +130,8 @@ const tasks = compilations.map(function (tsconfigFile) {
128130

129131
const compileBuildTask = task.define(`compile-build-extension-${name}`, task.series(cleanTask, () => {
130132
const pipeline = createPipeline(true, true);
131-
const input = pipeline.tsProjectSrc();
133+
const nonts = gulp.src(src, srcOpts).pipe(filter(['**', '!**/*.ts']));
134+
const input = es.merge(nonts, pipeline.tsProjectSrc());
132135

133136
return input
134137
.pipe(pipeline())

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "a5b474e8248803f54efc2c2c724c3322590c4fda"
63+
"commitHash": "6f62f91822a80192cb711c604f1a8f1a176f328d"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "6.1.4"
68+
"version": "6.1.5"
6969
},
7070
{
7171
"component": {

‎extensions/configuration-editing/schemas/attachContainer.schema.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818
"type": "integer"
1919
}
2020
},
21+
"remoteEnv": {
22+
"type": "object",
23+
"additionalProperties": {
24+
"type": [
25+
"string",
26+
"null"
27+
]
28+
},
29+
"description": "Remote environment variables."
30+
},
2131
"extensions": {
2232
"type": "array",
2333
"description": "An array of extensions that should be installed into the container.",

‎extensions/configuration-editing/schemas/devContainer.schema.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@
2222
"$ref": "vscode://schemas/settings/machine",
2323
"description": "Machine specific settings that should be copied into the container."
2424
},
25+
"remoteEnv": {
26+
"type": "object",
27+
"additionalProperties": {
28+
"type": [
29+
"string",
30+
"null"
31+
]
32+
},
33+
"description": "Remote environment variables."
34+
},
2535
"postCreateCommand": {
2636
"type": [
2737
"string",
@@ -55,6 +65,13 @@
5565
]
5666
}
5767
},
68+
"containerEnv": {
69+
"type": "object",
70+
"additionalProperties": {
71+
"type": "string"
72+
},
73+
"description": "Container environment variables."
74+
},
5875
"runArgs": {
5976
"type": "array",
6077
"description": "The arguments required when starting in the container.",

‎extensions/git/extension.webpack.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ module.exports = withDefaults({
1313
context: __dirname,
1414
entry: {
1515
main: './src/main.ts',
16-
['askpass-main']: './src/askpass-main.ts'
16+
['askpass-main']: './src/askpass/askpass-main.ts'
1717
}
1818
});

0 commit comments

Comments
 (0)