Skip to content

Commit 0d2eab1

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into joao/build-perf
2 parents f391286 + a57a43d commit 0d2eab1

39 files changed

Lines changed: 1000 additions & 304 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ steps:
9898
- script: |
9999
set -e
100100
yarn gulp compile-build
101+
yarn gulp compile-extensions-build-legacy
101102
yarn gulp compile-extensions-build
102103
yarn gulp minify-vscode
103104
yarn gulp minify-vscode-reh

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ steps:
4646
exec { git config user.name "VSCode" }
4747
4848
mkdir .build -ea 0
49-
echo $(VSCODE_ARCH) > .build\arch
49+
"$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch
5050
displayName: Prepare tooling
5151

5252
- powershell: |

‎build/gulpfile.extensions.js‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,20 @@ const tasks = compilations.map(function (tsconfigFile) {
123123
.pipe(gulp.dest(out));
124124
}));
125125

126+
const compileBuildTask = task.define(`compile-build-extension-${name}`, task.series(cleanTask, () => {
127+
const pipeline = createPipeline(true, true);
128+
const input = gulp.src(src, srcOpts);
129+
130+
return input
131+
.pipe(pipeline())
132+
.pipe(gulp.dest(out));
133+
}));
134+
126135
// Tasks
127136
gulp.task(compileTask);
128137
gulp.task(watchTask);
129138

130-
return { compileTask, watchTask };
139+
return { compileTask, watchTask, compileBuildTask };
131140
});
132141

133142
const compileExtensionsTask = task.define('compile-extensions', task.parallel(...tasks.map(t => t.compileTask)));
@@ -138,6 +147,9 @@ const watchExtensionsTask = task.define('watch-extensions', task.parallel(...tas
138147
gulp.task(watchExtensionsTask);
139148
exports.watchExtensionsTask = watchExtensionsTask;
140149

150+
const compileExtensionsBuildLegacyTask = task.define('compile-extensions-build-legacy', task.parallel(...tasks.map(t => t.compileBuildTask)));
151+
gulp.task(compileExtensionsBuildLegacyTask);
152+
141153
// Azure Pipelines
142154

143155
const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));

‎build/gulpfile.vscode.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ const nodeModules = ['electron', 'original-fs']
4949
const vscodeEntryPoints = _.flatten([
5050
buildfile.entrypoint('vs/workbench/workbench.main'),
5151
buildfile.base,
52+
buildfile.serviceWorker,
5253
buildfile.workbench,
5354
buildfile.code
5455
]);

‎extensions/cpp/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "jeff-hykin/cpp-textmate-grammar",
88
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
9-
"commitHash": "9c4f4b3291538d9f5144f02d3b6af877b84f2cb2"
9+
"commitHash": "59f0673f04d6e5c8a4d1b3ccc5235ed8a4ccb6c0"
1010
}
1111
},
1212
"license": "MIT",

‎extensions/cpp/syntaxes/cpp.tmLanguage.json‎

Lines changed: 776 additions & 83 deletions
Large diffs are not rendered by default.

‎extensions/cpp/test/colorize-results/test_cpp.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,13 +1442,13 @@
14421442
},
14431443
{
14441444
"c": "ANY_OUTPUT_TYPE",
1445-
"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp storage.type.user-defined.cpp",
1445+
"t": "source.cpp source.cpp meta.function.definition.cpp meta.body.function.definition.cpp meta.template.call.cpp meta.template.call.cpp meta.qualified_type.cpp entity.name.type.cpp",
14461446
"r": {
1447-
"dark_plus": "storage.type: #569CD6",
1448-
"light_plus": "storage.type: #0000FF",
1449-
"dark_vs": "storage.type: #569CD6",
1450-
"light_vs": "storage.type: #0000FF",
1451-
"hc_black": "storage.type: #569CD6"
1447+
"dark_plus": "entity.name.type: #4EC9B0",
1448+
"light_plus": "entity.name.type: #267F99",
1449+
"dark_vs": "default: #D4D4D4",
1450+
"light_vs": "default: #000000",
1451+
"hc_black": "entity.name.type: #4EC9B0"
14521452
}
14531453
},
14541454
{

‎extensions/git/src/commands.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,6 @@ export class CommandCenter {
673673

674674
if (!(resource instanceof Resource)) {
675675
// can happen when called from a keybinding
676-
console.log('WHAT');
677676
resource = this.getSCMResource();
678677
}
679678

‎extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { window, Terminal, TerminalVirtualProcess, EventEmitter, TerminalDimensions } from 'vscode';
6+
import { window, Terminal, TerminalVirtualProcess, EventEmitter, TerminalDimensions, workspace, ConfigurationTarget } from 'vscode';
77
import { doesNotThrow, equal, ok } from 'assert';
88

99
suite('window namespace tests', () => {
10-
(process.platform === 'win32' ? suite.skip /* https://github.com/microsoft/vscode/issues/75689 */ : suite)('Terminal', () => {
10+
suiteSetup(async () => {
11+
// Disable conpty in integration tests because of https://github.com/microsoft/vscode/issues/76548
12+
await workspace.getConfiguration('terminal.integrated').update('windowsEnableConpty', false, ConfigurationTarget.Global);
13+
});
14+
suite('Terminal', () => {
1115
test('sendText immediately after createTerminal should not throw', (done) => {
1216
const reg1 = window.onDidOpenTerminal(term => {
1317
equal(terminal, term);

‎src/buildfile.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ exports.base = [{
1111
dest: 'vs/base/worker/workerMain.js'
1212
}];
1313

14+
exports.serviceWorker = [{
15+
name: 'vs/workbench/contrib/resources/browser/resourceServiceWorker',
16+
// include: ['vs/editor/common/services/editorSimpleWorker'],
17+
prepend: ['vs/loader.js'],
18+
append: ['vs/workbench/contrib/resources/browser/resourceServiceWorkerMain'],
19+
dest: 'vs/workbench/contrib/resources/browser/resourceServiceWorkerMain.js'
20+
}];
21+
1422
exports.workbench = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.main']);
1523
exports.workbenchWeb = require('./vs/workbench/buildfile').collectModules(['vs/workbench/workbench.web.api']);
1624

0 commit comments

Comments
 (0)