Skip to content

Commit c3c8e8e

Browse files
TyriarTyriar
committed
Merge branch 'master' into tyriar/open_recently_closed_file
2 parents f415979 + e3ac586 commit c3c8e8e

320 files changed

Lines changed: 100817 additions & 4943 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: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,20 @@
4040
"sourceMaps": true,
4141
"outDir": "${workspaceRoot}/out"
4242
},
43+
{
44+
"name": "VSCode Tokenizer Tests",
45+
"type": "extensionHost",
46+
"request": "launch",
47+
"runtimeExecutable": "${execPath}",
48+
"args": [
49+
"${workspaceRoot}/extensions/vscode-colorize-tests/test",
50+
"--extensionDevelopmentPath=${workspaceRoot}/extensions/vscode-colorize-tests",
51+
"--extensionTestsPath=${workspaceRoot}/extensions/vscode-colorize-tests/out"
52+
],
53+
"stopOnEntry": false,
54+
"sourceMaps": true,
55+
"outDir": "${workspaceRoot}/out"
56+
},
4357
{
4458
"name": "Attach to VSCode",
4559
"type": "chrome",

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
### Before Submitting an Issue
44
First, please do a search in open issues to see if the issue or feature request has already been filed. If there is an issue add your comments to this issue.
55

6-
The Code project is distributed across multiple repositories, try to file the issue against the correct repository [Related Projects](https://github.com/Microsoft/vscode/wiki/Related-Projects).
6+
The Code project is distributed across multiple repositories, try to file the issue against the correct repository [Related Projects](https://github.com/Microsoft/vscode/tree/master/wiki/project-management/related-projects.md).
77

8-
If your issue is a question then please ask the question on [Stack Overflow](https://stackoverflow.com/questions/tagged/vscode) using the tag `vscode`.
8+
If your issue is a question then please ask the question on [Stack Overflow](https://stackoverflow.com/questions/tagged/vscode) using the tag `vscode`.
99

1010
## Writing Good Bug Reports and Feature Requests
1111

@@ -19,9 +19,8 @@ The more information you can provide, the more likely someone will be successful
1919
* Code that demonstrates the issue
2020
* Version of VS Code
2121
* Errors in the Dev Tools Console (Help | Toggle Developer Tools)
22-
* When you have extensions installed, can you reproduce the issue when starting vscode without extensions by using the `--disable-extensions` command line argument?
22+
* When you have extensions installed, can you reproduce the issue when starting vscode without extensions by using the `--disable-extensions` command line argument?
2323

2424
## Contributing Fixes
2525
If you are interested in fixing issues and contributing directly to the code base,
26-
please see the document [How to Contribute](https://github.com/Microsoft/vscode/wiki/How-to-Contribute).
27-
26+
please see the document [How to Contribute](https://github.com/Microsoft/vscode/tree/master/wiki/contributing/how-to-contribute.md).

‎OSSREADME.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
},
99
{
1010
"name": "chromium",
11-
"version": "45.0.2454.85",
11+
"version": "49.0.2623.75",
1212
"repositoryURL": "http://www.chromium.org/Home",
1313
"licenseDetail": [
1414
"BSD License",
1515
"",
16-
"Copyright 2014 The Chromium Authors. All rights reserved.",
16+
"Copyright 2015 The Chromium Authors. All rights reserved.",
1717
"",
1818
"Redistribution and use in source and binary forms, with or without modification,",
1919
"are permitted provided that the following conditions are met:",
@@ -44,20 +44,20 @@
4444
},
4545
{
4646
"name": "libchromiumcontent",
47-
"version": "45.0.2454.85 ",
47+
"version": "49.0.2623.75",
4848
"license": "MIT",
4949
"repositoryURL": "https://github.com/atom/libchromiumcontent",
5050
"isProd": true
5151
},
5252
{
5353
"name": "nodejs",
54-
"version": "4.1.1",
54+
"version": "5.10.0",
5555
"repositoryURL": "https://github.com/nodejs/node",
5656
"isProd": true
5757
},
5858
{
5959
"name": "electron",
60-
"version": "0.35.6",
60+
"version": "0.37.5",
6161
"license": "MIT",
6262
"repositoryURL": "https://github.com/atom/electron",
6363
"isProd": true

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ The [`vscode`](https://github.com/microsoft/vscode) repository is where we do de
1818

1919
## Contributing
2020
If you are interested in fixing issues and contributing directly to the code base,
21-
please see the document [How to Contribute](https://github.com/Microsoft/vscode/wiki/How-to-Contribute), which covers the following:
21+
please see the document [How to Contribute](https://github.com/Microsoft/vscode/tree/master/wiki/contributing/how-to-contribute.md), which covers the following:
2222

23-
* [How to build and run from source](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run-from-source)
24-
* [The development workflow, including debugging and running tests](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#development-workflow)
25-
* [Coding Guidelines](https://github.com/Microsoft/vscode/wiki/Coding-Guidelines)
26-
* [Submitting pull requests](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#pull-requests)
23+
* [How to build and run from source](https://github.com/Microsoft/vscode/tree/master/wiki/contributing/how-to-contribute.md#build-and-run-from-source)
24+
* [The development workflow, including debugging and running tests](https://github.com/Microsoft/vscode/tree/master/wiki/contributing/how-to-contribute.md#development-workflow)
25+
* [Coding Guidelines](https://github.com/Microsoft/vscode/tree/master/wiki/contributing/coding-guidelines.md)
26+
* [Submitting pull requests](https://github.com/Microsoft/vscode/tree/master/wiki/contributing/how-to-contribute.md#pull-requests)
2727

2828
## Feedback
2929

@@ -35,7 +35,7 @@ please see the document [How to Contribute](https://github.com/Microsoft/vscode/
3535
## Related Projects
3636
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)
3737

38-
For a complete list, please see the [Related Projects](https://github.com/Microsoft/vscode/wiki/Related-Projects) page on our wiki.
38+
For a complete list, please see the [Related Projects](https://github.com/Microsoft/vscode/tree/master/wiki/project-management/related-projects.md) page on our wiki.
3939

4040
## License
4141
[MIT](LICENSE.txt)

‎build/gulpfile.hygiene.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ var indentationFilter = [
5454
'!**/vs/loader.js',
5555
'!extensions/**/snippets/**',
5656
'!extensions/**/syntaxes/**',
57-
'!extensions/**/themes/**'
57+
'!extensions/**/themes/**',
58+
'!extensions/**/colorize-fixtures/**'
5859
];
5960

6061
var copyrightFilter = [

‎build/gulpfile.vscode.js‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var baseModules = [
3232
'events', 'fs', 'getmac', 'glob', 'graceful-fs', 'http', 'http-proxy-agent',
3333
'https', 'https-proxy-agent', 'iconv-lite', 'electron', 'net',
3434
'os', 'path', 'readline', 'sax', 'semver', 'stream', 'string_decoder', 'url',
35-
'vscode-textmate', 'winreg', 'yauzl', 'native-keymap', 'weak', 'zlib'
35+
'vscode-textmate', 'winreg', 'yauzl', 'native-keymap', 'zlib'
3636
];
3737

3838
// Build
@@ -116,7 +116,7 @@ var config = {
116116
gulp.task('electron', function () {
117117
// Force windows to use ia32
118118
var arch = process.env.VSCODE_ELECTRON_PLATFORM || (process.platform === 'win32' ? 'ia32' : process.arch);
119-
return electron.dest(path.join(build, 'electron'), _.extend({}, config, { arch: arch }));
119+
return electron.dest(path.join(build, 'electron'), _.extend({}, config, { arch: arch, ffmpegChromium: true }));
120120
});
121121

122122
function mixinProduct() {
@@ -162,8 +162,10 @@ function packageTask(platform, arch, opts) {
162162
'extensions/**',
163163
'!extensions/*/src/**',
164164
'!extensions/*/out/**/test/**',
165+
'!extensions/*/test/**',
165166
'!extensions/typescript/bin/**',
166167
'!extensions/vscode-api-tests/**',
168+
'!extensions/vscode-colorize-tests/**',
167169
'!extensions/json/server/.vscode/**',
168170
'!extensions/json/server/src/**',
169171
'!extensions/json/server/out/**/test/**',
@@ -188,7 +190,7 @@ function packageTask(platform, arch, opts) {
188190
version: version
189191
}));
190192

191-
var license = gulp.src(['Credits_*', 'LICENSE.txt', 'ThirdPartyNotices.txt'], { base: '.' });
193+
var license = gulp.src(['Credits_*', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.' });
192194
var api = gulp.src('src/vs/vscode.d.ts').pipe(rename('out/vs/vscode.d.ts'));
193195

194196
var depsSrc = _.flatten(Object.keys(packageJson.dependencies).concat(Object.keys(packageJson.optionalDependencies))
@@ -199,8 +201,7 @@ function packageTask(platform, arch, opts) {
199201
.pipe(util.cleanNodeModule('fsevents', ['binding.gyp', 'fsevents.cc', 'build/**', 'src/**', 'test/**'], true))
200202
.pipe(util.cleanNodeModule('oniguruma', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], true))
201203
.pipe(util.cleanNodeModule('windows-mutex', ['binding.gyp', 'build/**', 'src/**'], true))
202-
.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], true))
203-
.pipe(util.cleanNodeModule('weak', ['binding.gyp', 'build/**', 'src/**'], true));
204+
.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], true));
204205

205206
var all = es.merge(
206207
api,
@@ -225,7 +226,7 @@ function packageTask(platform, arch, opts) {
225226
var result = all
226227
.pipe(util.skipDirectories())
227228
.pipe(util.fixWin32DirectoryPermissions())
228-
.pipe(electron(_.extend({}, config, { platform: platform, arch: arch })))
229+
.pipe(electron(_.extend({}, config, { platform: platform, arch: arch, ffmpegChromium: true })))
229230
.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
230231

231232
if (platform === 'win32') {
@@ -315,23 +316,17 @@ function buildDebPackage(arch) {
315316
], { cwd: '.build/linux/deb/' + debArch});
316317
}
317318

318-
function getHomeDir() {
319-
if (typeof os.homedir === 'function') {
320-
return os.homedir();
321-
}
322-
return process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'];
319+
function getRpmBuildPath(rpmArch) {
320+
return '.build/linux/rpm/' + rpmArch + '/rpmbuild';
323321
}
324322

325-
var rpmBuildPath = path.join(getHomeDir(), 'rpmbuild');
326-
327323
function getRpmPackageArch(arch) {
328324
return { x64: 'x86_64', ia32: 'i386' }[arch];
329325
}
330326

331327
function prepareRpmPackage(arch) {
332328
var binaryDir = '../VSCode-linux-' + arch;
333329
var rpmArch = getRpmPackageArch(arch);
334-
var destination = rpmBuildPath;
335330
var packageRevision = getEpochTime();
336331

337332
return function () {
@@ -361,17 +356,18 @@ function prepareRpmPackage(arch) {
361356

362357
var all = es.merge(code, desktop, icon, spec, specIcon);
363358

364-
return all.pipe(symdest(destination));
359+
return all.pipe(symdest(getRpmBuildPath(rpmArch)));
365360
}
366361
}
367362

368363
function buildRpmPackage(arch) {
369364
var rpmArch = getRpmPackageArch(arch);
365+
var rpmBuildPath = getRpmBuildPath(rpmArch);
370366
var rpmOut = rpmBuildPath + '/RPMS/' + rpmArch;
371367
var destination = '.build/linux/rpm/' + rpmArch;
372368
return shell.task([
373369
'mkdir -p ' + destination,
374-
'fakeroot rpmbuild -bb ' + rpmBuildPath + '/SPECS/' + product.applicationName + '.spec --target=' + rpmArch,
370+
'HOME="$(pwd)/' + destination + '" fakeroot rpmbuild -bb ' + rpmBuildPath + '/SPECS/' + product.applicationName + '.spec --target=' + rpmArch,
375371
'cp "' + rpmOut + '/$(ls ' + rpmOut + ')" ' + destination + '/vscode-' + rpmArch + '.rpm',
376372
'createrepo ' + destination
377373
]);
@@ -386,7 +382,6 @@ gulp.task('clean-vscode-linux-ia32-deb', util.rimraf('.build/linux/deb/i386'));
386382
gulp.task('clean-vscode-linux-x64-deb', util.rimraf('.build/linux/deb/amd64'));
387383
gulp.task('clean-vscode-linux-ia32-rpm', util.rimraf('.build/linux/rpm/i386'));
388384
gulp.task('clean-vscode-linux-x64-rpm', util.rimraf('.build/linux/rpm/x86_64'));
389-
gulp.task('clean-rpmbuild', util.rimraf(rpmBuildPath));
390385

391386
gulp.task('vscode-win32', ['optimize-vscode', 'clean-vscode-win32'], packageTask('win32'));
392387
gulp.task('vscode-darwin', ['optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin'));
@@ -405,8 +400,8 @@ gulp.task('vscode-linux-x64-prepare-deb', ['clean-vscode-linux-x64-deb', 'vscode
405400
gulp.task('vscode-linux-ia32-build-deb', ['vscode-linux-ia32-prepare-deb'], buildDebPackage('ia32'));
406401
gulp.task('vscode-linux-x64-build-deb', ['vscode-linux-x64-prepare-deb'], buildDebPackage('x64'));
407402

408-
gulp.task('vscode-linux-ia32-prepare-rpm', ['clean-rpmbuild', 'clean-vscode-linux-ia32-rpm', 'vscode-linux-ia32-min'], prepareRpmPackage('ia32'));
409-
gulp.task('vscode-linux-x64-prepare-rpm', ['clean-rpmbuild', 'clean-vscode-linux-x64-rpm', 'vscode-linux-x64-min'], prepareRpmPackage('x64'));
403+
gulp.task('vscode-linux-ia32-prepare-rpm', ['clean-vscode-linux-ia32-rpm', 'vscode-linux-ia32-min'], prepareRpmPackage('ia32'));
404+
gulp.task('vscode-linux-x64-prepare-rpm', ['clean-vscode-linux-x64-rpm', 'vscode-linux-x64-min'], prepareRpmPackage('x64'));
410405
gulp.task('vscode-linux-ia32-build-rpm', ['vscode-linux-ia32-prepare-rpm'], buildRpmPackage('ia32'));
411406
gulp.task('vscode-linux-x64-build-rpm', ['vscode-linux-x64-prepare-rpm'], buildRpmPackage('x64'));
412407

‎extensions/bat/test/colorize-fixtures/test.bat‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
@echo off
2+
setlocal
3+
4+
title VSCode Dev
5+
6+
pushd %~dp0\..
7+
8+
:: Node modules
9+
if not exist node_modules call .\scripts\npm.bat install
10+
11+
:: Get electron
12+
node .\node_modules\gulp\bin\gulp.js electron
13+
14+
:: Build
15+
if not exist out node .\node_modules\gulp\bin\gulp.js compile
16+
17+
:: Configuration
18+
set NODE_ENV=development
19+
set VSCODE_DEV=1
20+
set ELECTRON_DEFAULT_ERROR_MODE=1
21+
set ELECTRON_ENABLE_LOGGING=1
22+
set ELECTRON_ENABLE_STACK_DUMPING=1
23+
24+
:: Launch Code
25+
.\.build\electron\electron.exe . %*
26+
popd
27+
28+
endlocal

0 commit comments

Comments
 (0)