Skip to content

Commit 5014bec

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into joao/git-fs-provider
2 parents 31d13c8 + 458177f commit 5014bec

453 files changed

Lines changed: 13562 additions & 5684 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

‎.vscode/tasks.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
},
3434
{
3535
"type": "npm",
36-
"script": "strict-initialization-watch",
37-
"label": "TS - Strict Initialization",
36+
"script": "strict-function-types-watch",
37+
"label": "TS - Strict Function Types",
3838
"isBackground": true,
3939
"presentation": {
4040
"reveal": "never"
4141
},
4242
"problemMatcher": {
4343
"base": "$tsc-watch",
44-
"owner": "typescript-strict-initialization",
44+
"owner": "typescript-function-types",
4545
"applyTo": "allDocuments"
4646
}
4747
},

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ steps:
22
- task: NodeTool@0
33
inputs:
44
versionSpec: "12.13.0"
5+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
6+
inputs:
7+
versionSpec: "1.x"
58
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
69
inputs:
710
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
811
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
9-
vstsFeed: '$(ArtifactFeed)'
10-
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
11-
inputs:
12-
versionSpec: "1.x"
12+
vstsFeed: 'vscode-build-cache'
1313
- script: |
1414
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
1515
displayName: Install Dependencies
@@ -18,7 +18,7 @@ steps:
1818
inputs:
1919
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2020
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
21-
vstsFeed: '$(ArtifactFeed)'
21+
vstsFeed: 'vscode-build-cache'
2222
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2323
- script: |
2424
yarn electron x64

‎build/azure-pipelines/linux/continuous-build-linux.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ steps:
1010
- task: NodeTool@0
1111
inputs:
1212
versionSpec: "12.13.0"
13+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
14+
inputs:
15+
versionSpec: "1.x"
1316
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
1417
inputs:
1518
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1619
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
17-
vstsFeed: '$(ArtifactFeed)'
18-
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
19-
inputs:
20-
versionSpec: "1.x"
20+
vstsFeed: 'vscode-build-cache'
2121
- script: |
2222
CHILD_CONCURRENCY=1 yarn --frozen-lockfile
2323
displayName: Install Dependencies
@@ -26,7 +26,7 @@ steps:
2626
inputs:
2727
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2828
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
29-
vstsFeed: '$(ArtifactFeed)'
29+
vstsFeed: 'vscode-build-cache'
3030
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
3131
- script: |
3232
yarn electron x64

‎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/azure-pipelines/win32/continuous-build-win32.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
inputs:
1414
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1515
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
16-
vstsFeed: '$(ArtifactFeed)'
16+
vstsFeed: 'vscode-build-cache'
1717
- powershell: |
1818
yarn --frozen-lockfile
1919
env:
@@ -24,7 +24,7 @@ steps:
2424
inputs:
2525
keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2626
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
27-
vstsFeed: '$(ArtifactFeed)'
27+
vstsFeed: 'vscode-build-cache'
2828
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2929
- powershell: |
3030
yarn electron

‎build/builtInExtensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
{
3333
"name": "ms-vscode.references-view",
34-
"version": "0.0.36",
34+
"version": "0.0.37",
3535
"repo": "https://github.com/Microsoft/vscode-reference-view",
3636
"metadata": {
3737
"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",

‎extensions/configuration-editing/src/extension.ts‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,11 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { getLocation, parse, visit } from 'jsonc-parser';
7-
import * as path from 'path';
87
import * as vscode from 'vscode';
98
import * as nls from 'vscode-nls';
109
import { SettingsDocument } from './settingsDocumentHelper';
1110
const localize = nls.loadMessageBundle();
1211

13-
const fadedDecoration = vscode.window.createTextEditorDecorationType({
14-
light: {
15-
color: '#757575'
16-
},
17-
dark: {
18-
color: '#878787'
19-
}
20-
});
21-
22-
let pendingLaunchJsonDecoration: NodeJS.Timer;
23-
2412
export function activate(context: vscode.ExtensionContext): void {
2513
//settings.json suggestions
2614
context.subscriptions.push(registerSettingsCompletions());
@@ -33,18 +21,6 @@ export function activate(context: vscode.ExtensionContext): void {
3321

3422
// task.json variable suggestions
3523
context.subscriptions.push(registerVariableCompletions('**/tasks.json'));
36-
37-
// launch.json decorations
38-
context.subscriptions.push(vscode.window.onDidChangeActiveTextEditor(editor => updateLaunchJsonDecorations(editor), null, context.subscriptions));
39-
context.subscriptions.push(vscode.workspace.onDidChangeTextDocument(event => {
40-
if (vscode.window.activeTextEditor && event.document === vscode.window.activeTextEditor.document) {
41-
if (pendingLaunchJsonDecoration) {
42-
clearTimeout(pendingLaunchJsonDecoration);
43-
}
44-
pendingLaunchJsonDecoration = setTimeout(() => updateLaunchJsonDecorations(vscode.window.activeTextEditor), 1000);
45-
}
46-
}, null, context.subscriptions));
47-
updateLaunchJsonDecorations(vscode.window.activeTextEditor);
4824
}
4925

5026
function registerSettingsCompletions(): vscode.Disposable {
@@ -153,39 +129,6 @@ function provideInstalledExtensionProposals(extensionsContent: IExtensionsConten
153129
return undefined;
154130
}
155131

156-
function updateLaunchJsonDecorations(editor: vscode.TextEditor | undefined): void {
157-
if (!editor || path.basename(editor.document.fileName) !== 'launch.json') {
158-
return;
159-
}
160-
161-
const ranges: vscode.Range[] = [];
162-
let addPropertyAndValue = false;
163-
let depthInArray = 0;
164-
visit(editor.document.getText(), {
165-
onObjectProperty: (property, offset, length) => {
166-
// Decorate attributes which are unlikely to be edited by the user.
167-
// Only decorate "configurations" if it is not inside an array (compounds have a configurations property which should not be decorated).
168-
addPropertyAndValue = property === 'version' || property === 'type' || property === 'request' || property === 'compounds' || (property === 'configurations' && depthInArray === 0);
169-
if (addPropertyAndValue) {
170-
ranges.push(new vscode.Range(editor.document.positionAt(offset), editor.document.positionAt(offset + length)));
171-
}
172-
},
173-
onLiteralValue: (_value, offset, length) => {
174-
if (addPropertyAndValue) {
175-
ranges.push(new vscode.Range(editor.document.positionAt(offset), editor.document.positionAt(offset + length)));
176-
}
177-
},
178-
onArrayBegin: (_offset: number, _length: number) => {
179-
depthInArray++;
180-
},
181-
onArrayEnd: (_offset: number, _length: number) => {
182-
depthInArray--;
183-
}
184-
});
185-
186-
editor.setDecorations(fadedDecoration, ranges);
187-
}
188-
189132
vscode.languages.registerDocumentSymbolProvider({ pattern: '**/launch.json', language: 'jsonc' }, {
190133
provideDocumentSymbols(document: vscode.TextDocument, _token: vscode.CancellationToken): vscode.ProviderResult<vscode.SymbolInformation[]> {
191134
const result: vscode.SymbolInformation[] = [];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"main": "./out/cssServerMain",
1111
"dependencies": {
12-
"vscode-css-languageservice": "^4.0.3-next.19",
12+
"vscode-css-languageservice": "^4.0.3-next.20",
1313
"vscode-languageserver": "^6.0.0-next.3"
1414
},
1515
"devDependencies": {

‎extensions/css-language-features/server/test/linksTestFixtures/node_modules/foo/package.json‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)