Skip to content

Commit f26de90

Browse files
sandy081sandy081
authored
Merge branch 'master' into ben/shared-process-ipc-ready
2 parents edf7a55 + 8d17dc1 commit f26de90

File tree

194 files changed

+5350
-4525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+5350
-4525
lines changed

‎.eslintrc.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,13 @@
614614
"*"
615615
]
616616
},
617+
{
618+
"target": "**/test/integration/**",
619+
"restrictions": [
620+
"**/test/integration/**",
621+
"*"
622+
]
623+
},
617624
{
618625
"target": "{**/api/**.test.ts,}",
619626
"restrictions": "{**/vs/**,assert,sinon,crypto,vscode}"

‎.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
"type": "node",
303303
"request": "launch",
304304
"name": "Run Unit Tests",
305-
"program": "${workspaceFolder}/test/electron/index.js",
305+
"program": "${workspaceFolder}/test/unit/electron/index.js",
306306
"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.app/Contents/MacOS/Electron",
307307
"windows": {
308308
"runtimeExecutable": "${workspaceFolder}/.build/electron/Code - OSS.exe"

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ steps:
4141
- script: |
4242
./scripts/test.sh --tfs "Unit Tests"
4343
displayName: Run Unit Tests
44+
- script: |
45+
yarn test-browser --browser chromium --browser webkit
46+
displayName: Run Unit Tests (Browsers)
4447
- script: |
4548
./scripts/test-integration.sh --tfs "Integration Tests"
4649
displayName: Run Integration Tests

‎build/azure-pipelines/darwin/entitlements.plist

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>com.apple.security.cs.allow-jit</key>
6+
<true/>
7+
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
8+
<true/>
9+
<key>com.apple.security.cs.disable-library-validation</key>
10+
<true/>
11+
</dict>
12+
</plist>

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

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,18 @@ steps:
127127

128128
- script: |
129129
set -e
130-
pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin.zip * && popd
130+
security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
131+
security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
132+
security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
133+
echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
134+
security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
135+
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
136+
codesign -s 99FM488X57 --deep --force --options runtime --entitlements build/azure-pipelines/darwin/entitlements.plist $(agent.builddirectory)/VSCode-darwin/*.app
137+
displayName: Set Hardened Entitlements
138+
139+
- script: |
140+
set -e
141+
pushd $(agent.builddirectory)/VSCode-darwin && zip -r -X -y $(agent.builddirectory)/VSCode-darwin.zip * && popd
131142
displayName: Archive build
132143

133144
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -141,14 +152,54 @@ steps:
141152
{
142153
"keyCode": "CP-401337-Apple",
143154
"operationSetCode": "MacAppDeveloperSign",
144-
"parameters": [ ],
155+
"parameters": [
156+
{
157+
"parameterName": "Hardening",
158+
"parameterValue": "--options=runtime"
159+
}
160+
],
145161
"toolName": "sign",
146162
"toolVersion": "1.0"
147163
}
148164
]
149-
SessionTimeout: 120
165+
SessionTimeout: 60
150166
displayName: Codesign
151167

168+
- script: |
169+
zip -d $(agent.builddirectory)/VSCode-darwin.zip "*.pkg"
170+
displayName: Clean Archive
171+
172+
- script: |
173+
APP_ROOT=$(agent.builddirectory)/VSCode-darwin
174+
APP_NAME="`ls $APP_ROOT | head -n 1`"
175+
BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
176+
echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
177+
displayName: Export bundle identifier
178+
179+
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
180+
inputs:
181+
ConnectedServiceName: 'ESRP CodeSign'
182+
FolderPath: '$(agent.builddirectory)'
183+
Pattern: 'VSCode-darwin.zip'
184+
signConfigType: inlineSignParams
185+
inlineOperation: |
186+
[
187+
{
188+
"keyCode": "CP-401337-Apple",
189+
"operationSetCode": "MacAppNotarize",
190+
"parameters": [
191+
{
192+
"parameterName": "BundleId",
193+
"parameterValue": "$(BundleIdentifier)"
194+
}
195+
],
196+
"toolName": "sign",
197+
"toolVersion": "1.0"
198+
}
199+
]
200+
SessionTimeout: 120
201+
displayName: Notarization
202+
152203
- script: |
153204
set -e
154205
VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \

‎build/azure-pipelines/darwin/publish.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
# remove pkg from archive
5-
zip -d ../VSCode-darwin.zip "*.pkg"
6-
74
# publish the build
85
node build/azure-pipelines/common/createAsset.js \
96
darwin \

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ steps:
4949
- script: |
5050
DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
5151
displayName: Run Unit Tests
52+
- script: |
53+
DISPLAY=:10 yarn test-browser --browser chromium
54+
displayName: Run Unit Tests (Browser)
5255
- script: |
5356
DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
5457
displayName: Run Integration Tests

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ steps:
4646
- powershell: |
4747
.\scripts\test.bat --tfs "Unit Tests"
4848
displayName: Run Unit Tests
49+
- powershell: |
50+
yarn test-browser --browser chromium --browser webkit
51+
displayName: Run Unit Tests (Browser)
4952
- powershell: |
5053
.\scripts\test-integration.bat --tfs "Integration Tests"
5154
displayName: Run Integration Tests

‎build/builtInExtensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
},
4747
{
4848
"name": "ms-vscode.js-debug-nightly",
49-
"version": "2020.2.408",
49+
"version": "2020.2.517",
5050
"forQualities": [
5151
"insider"
5252
],

‎build/gulpfile.hygiene.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ const all = [
3333
'scripts/**/*',
3434
'src/**/*',
3535
'test/**/*',
36+
'!test/**/out/**',
3637
'!**/node_modules/**'
3738
];
3839

@@ -53,7 +54,7 @@ const indentationFilter = [
5354
'!src/vs/base/common/marked/marked.js',
5455
'!src/vs/base/node/terminateProcess.sh',
5556
'!src/vs/base/node/cpuUsage.sh',
56-
'!test/assert.js',
57+
'!test/unit/assert.js',
5758

5859
// except specific folders
5960
'!test/automation/out/**',
@@ -82,7 +83,7 @@ const indentationFilter = [
8283
'!src/vs/*/**/*.d.ts',
8384
'!src/typings/**/*.d.ts',
8485
'!extensions/**/*.d.ts',
85-
'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns}',
86+
'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns,plist}',
8687
'!build/{lib,download}/**/*.js',
8788
'!build/**/*.sh',
8889
'!build/azure-pipelines/**/*.js',

‎build/npm/postinstall.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,5 @@ runtime "${runtime}"`;
7272
yarnInstall(`build`); // node modules required for build
7373
yarnInstall('test/automation'); // node modules required for smoketest
7474
yarnInstall('test/smoke'); // node modules required for smoketest
75+
yarnInstall('test/integration/browser'); // node modules required for integration
7576
yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron

‎build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"minimist": "^1.2.0",
4444
"request": "^2.85.0",
4545
"terser": "4.3.8",
46-
"typescript": "3.8.0-dev.20200128",
46+
"typescript": "^3.8.1-rc",
4747
"vsce": "1.48.0",
4848
"vscode-telemetry-extractor": "^1.5.4",
4949
"xml2js": "^0.4.17"

‎build/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,16 +2453,16 @@ typed-rest-client@^0.9.0:
24532453
tunnel "0.0.4"
24542454
underscore "1.8.3"
24552455

2456-
[email protected]:
2457-
version "3.8.0-dev.20200128"
2458-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-dev.20200128.tgz#4eedbd3547326f2e9cb826c4144800eb93c81866"
2459-
integrity sha512-tXJMyrE3xhLDzCN76wZhoV8S1AU5JH40DzrLBAZWfHOgH8X8mCHFwyJ8U6N929vBL78rHmEcowyioUr09/Xvjg==
2460-
24612456
typescript@^3.0.1:
24622457
version "3.5.3"
24632458
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
24642459
integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
24652460

2461+
typescript@^3.8.1-rc:
2462+
version "3.8.1-rc"
2463+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.1-rc.tgz#f94333c14da70927ccd887be2e91be652a9a09f6"
2464+
integrity sha512-aOIe066DyZn2uYIiND6fXMUUJ70nxwu/lKhA92QuQzXyC86fr0ywo1qvO8l2m0EnDcfjprYPuFRgNgDj7U2GlQ==
2465+
24662466
typical@^4.0.0:
24672467
version "4.0.0"
24682468
resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"

‎extensions/git/src/commands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,7 @@ export class CommandCenter {
16201620

16211621
const rawBranchName = defaultName || await window.showInputBox({
16221622
placeHolder: localize('branch name', "Branch name"),
1623-
prompt: localize('provide branch name', "Please provide a branch name"),
1623+
prompt: localize('provide branch name', "Please provide a new branch name"),
16241624
value: initialValue,
16251625
ignoreFocusOut: true,
16261626
validateInput: (name: string) => {

‎extensions/git/src/fileSystemProvider.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { fromGitUri, toGitUri } from './uri';
99
import { Model, ModelChangeEvent, OriginalResourceChangeEvent } from './model';
1010
import { filterEvent, eventToPromise, isDescendant, pathEquals, EmptyDisposable } from './util';
1111
import { Repository } from './repository';
12-
import { TextEncoder } from 'util';
1312

1413
interface CacheRow {
1514
uri: Uri;

‎extensions/git/src/typings/refs.d.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
/// <reference path='../../../../src/vs/vscode.d.ts'/>
7-
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
7+
/// <reference path='../../../../src/vs/vscode.proposed.d.ts'/>
8+
/// <reference path="../../../types/lib.textEncoder.d.ts" />

‎extensions/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"description": "Dependencies shared by all extensions",
55
"dependencies": {
6-
"typescript": "^3.8.0-dev.20200201"
6+
"typescript": "^3.8.1-rc"
77
},
88
"scripts": {
99
"postinstall": "node ./postinstall"

‎extensions/search-result/syntaxes/generateTMLanguage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ mappings.forEach(([ext, scope, regexp]) =>
115115
{
116116
name: [scopes.resultBlock.result.meta, scopes.resultBlock.result.metaMultiLine].join(' '),
117117
begin: "^ ((\\d+) )",
118-
while: "^ ((\\d+)(:))|((\\d+) )",
118+
while: "^ (?:((\\d+)(:))|((\\d+) ))",
119119
beginCaptures: {
120120
"0": { name: scopes.resultBlock.result.prefix.meta },
121121
"1": { name: scopes.resultBlock.result.prefix.metaContext },
@@ -215,7 +215,7 @@ const plainText = [
215215
}
216216
},
217217
{
218-
match: "^ ((\\d+)(:))|((\\d+)( ))(.*)",
218+
match: "^ (?:((\\d+)(:))|((\\d+)( ))(.*))",
219219
name: [scopes.resultBlock.meta, scopes.resultBlock.result.meta].join(' '),
220220
captures: {
221221
"1": { name: [scopes.resultBlock.result.prefix.meta, scopes.resultBlock.result.prefix.metaMatch].join(' ') },

0 commit comments

Comments
 (0)