Skip to content

Commit 4aa4758

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into scm-api
2 parents a220ce2 + 5ba8940 commit 4aa4758

140 files changed

Lines changed: 2646 additions & 1391 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.

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ script:
4242
- gulp electron --silent
4343
- gulp compile --silent
4444
- gulp optimize-vscode --silent
45-
- if [[ "$TRAVIS_OS_NAME" == "linux_off" ]]; then ./scripts/test.sh --reporter dot --coverage; else ./scripts/test.sh --reporter dot; fi
45+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --reporter dot --coverage; else ./scripts/test.sh --reporter dot; fi
4646
- ./scripts/test-integration.sh
4747

4848
after_success:
49-
- if [[ "$TRAVIS_OS_NAME" == "linux_off" ]]; then node_modules/.bin/coveralls < .build/coverage/lcov.info; fi
49+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .build/coverage/lcov.info; fi

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"files.exclude": {
66
".git": true,
77
".build": true,
8-
"**/.DS_Store": true
8+
"**/.DS_Store": true,
9+
"build/**/*.js": { "when": "$(basename).ts" }
910
},
1011
"search.exclude": {
1112
"**/node_modules": true,

‎LICENSE.txt‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
1-
Copyright (c) Microsoft Corporation
1+
MIT License
22

3-
All rights reserved.
3+
Copyright (c) 2015 - present Microsoft Corporation
44

5-
MIT License
5+
All rights reserved.
66

7-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
8-
files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
9-
modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
10-
is furnished to do so, subject to the following conditions:
7+
Permission is hereby granted, free of charge, to any person obtaining a copy
8+
of this software and associated documentation files (the "Software"), to deal
9+
in the Software without restriction, including without limitation the rights
10+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
copies of the Software, and to permit persons to whom the Software is
12+
furnished to do so, subject to the following conditions:
1113

12-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
14+
The above copyright notice and this permission notice shall be included in all
15+
copies or substantial portions of the Software.
1316

14-
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
15-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
16-
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
17-
OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
SOFTWARE.

‎build/gulpfile.hygiene.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,11 @@ gulp.task('hygiene', () => hygiene());
229229
if (require.main === module) {
230230
const cp = require('child_process');
231231

232+
process.on('unhandledRejection', (reason, p) => {
233+
console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
234+
process.exit(1);
235+
});
236+
232237
cp.exec('git config core.autocrlf', (err, out) => {
233238
const skipEOL = out.trim() === 'true';
234239

‎build/gulpfile.vscode.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const product = require('../product.json');
3030
const shrinkwrap = require('../npm-shrinkwrap.json');
3131
const crypto = require('crypto');
3232

33-
const dependencies = Object.keys(shrinkwrap.dependencies);
33+
const dependencies = Object.keys(shrinkwrap.dependencies).concat(['vsda' /* vsda can come in from distro build, do not remove */]);
3434
const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
3535
const nodeModules = ['electron', 'original-fs']
3636
.concat(dependencies)
@@ -39,8 +39,8 @@ const nodeModules = ['electron', 'original-fs']
3939
// Build
4040

4141
const builtInExtensions = [
42-
{ name: 'ms-vscode.node-debug', version: '1.9.2' },
43-
{ name: 'ms-vscode.node-debug2', version: '1.9.3' }
42+
{ name: 'ms-vscode.node-debug', version: '1.9.6' },
43+
{ name: 'ms-vscode.node-debug2', version: '1.9.4' }
4444
];
4545

4646
const vscodeEntryPoints = _.flatten([
@@ -93,11 +93,11 @@ gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compil
9393

9494

9595
gulp.task('optimize-index-js', ['optimize-vscode'], () => {
96-
const fullpath = path.join(process.cwd(), 'out-vscode/vs/workbench/electron-browser/bootstrap/index.js')
96+
const fullpath = path.join(process.cwd(), 'out-vscode/vs/workbench/electron-browser/bootstrap/index.js');
9797
const contents = fs.readFileSync(fullpath).toString();
9898
const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
9999
fs.writeFileSync(fullpath, newContents);
100-
})
100+
});
101101

102102
const baseUrl = `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`;
103103
gulp.task('clean-minified-vscode', util.rimraf('out-vscode-min'));
@@ -269,7 +269,13 @@ function packageTask(platform, arch, opts) {
269269
.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
270270
.pipe(util.cleanNodeModule('windows-foreground-love', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
271271
.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
272-
.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/**']));
272+
.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/**']))
273+
// vsda can come in from distro build, do not remove
274+
.pipe(util.cleanNodeModule('vsda', ['**'], [(function () {
275+
if (process.platform === 'win32') { return 'build/Release/vsda_win32.node'; }
276+
if (process.platform === 'darwin') { return 'build/Release/vsda_darwin.node'; }
277+
if (process.platform === 'linux') { return process.arch === 'x64' ? 'build/Release/vsda_linux64.node' : 'build/Release/vsda_linux32.node'; }
278+
})(), 'index.js']));
273279

274280
let all = es.merge(
275281
packageJsonStream,

‎build/lib/compilation.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ options.verbose = false;
2323
options.sourceMap = true;
2424
options.rootDir = rootDir;
2525
options.sourceRoot = util.toFileUri(rootDir);
26-
var smSourceRootPath = path.resolve(path.dirname(rootDir));
27-
var smSourceRoot = util.toFileUri(smSourceRootPath);
2826
function createCompile(build, emitError) {
2927
var opts = _.clone(options);
3028
opts.inlineSources = !!build;
@@ -48,7 +46,7 @@ function createCompile(build, emitError) {
4846
.pipe(sourcemaps.write('.', {
4947
addComment: false,
5048
includeContent: !!build,
51-
sourceRoot: smSourceRoot
49+
sourceRoot: options.sourceRoot
5250
}))
5351
.pipe(tsFilter.restore)
5452
.pipe(reporter.end(emitError));

‎build/lib/compilation.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ options.sourceMap = true;
2828
options.rootDir = rootDir;
2929
options.sourceRoot = util.toFileUri(rootDir);
3030

31-
const smSourceRootPath = path.resolve(path.dirname(rootDir));
32-
const smSourceRoot = util.toFileUri(smSourceRootPath);
33-
3431
function createCompile(build: boolean, emitError?: boolean): (token?: util.ICancellationToken) => NodeJS.ReadWriteStream {
3532
const opts = _.clone(options);
3633
opts.inlineSources = !!build;
@@ -57,7 +54,7 @@ function createCompile(build: boolean, emitError?: boolean): (token?: util.ICanc
5754
.pipe(sourcemaps.write('.', {
5855
addComment: false,
5956
includeContent: !!build,
60-
sourceRoot: smSourceRoot
57+
sourceRoot: options.sourceRoot
6158
}))
6259
.pipe(tsFilter.restore)
6360
.pipe(reporter.end(emitError));

‎build/lib/tslint/noUnexternalizedStringsRule.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ var NoUnexternalizedStringsRuleWalker = (function (_super) {
9090
return;
9191
}
9292
if (doubleQuoted && (!callInfo || callInfo.argIndex === -1 || !this.signatures[functionName])) {
93-
var s = node.getText();
94-
var replacement = new Lint.Replacement(node.getStart(), node.getWidth(), "nls.localize('KEY-" + s.substring(1, s.length - 1) + "', " + s + ")");
93+
var s_1 = node.getText();
94+
var replacement = new Lint.Replacement(node.getStart(), node.getWidth(), "nls.localize('KEY-" + s_1.substring(1, s_1.length - 1) + "', " + s_1 + ")");
9595
var fix = new Lint.Fix("Unexternalitzed string", [replacement]);
9696
this.addFailure(this.createFailure(node.getStart(), node.getWidth(), "Unexternalized string found: " + node.getText(), fix));
9797
return;

‎build/monaco/api.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ function format(text:string): string {
195195
// Apply the edits on the input code
196196
return applyEdits(text, edits);
197197

198-
function getRuleProvider(options: ts.FormatCodeOptions) {
198+
function getRuleProvider(options: ts.FormatCodeSettings) {
199199
// Share this between multiple formatters using the same options.
200200
// This represents the bulk of the space the formatter uses.
201201
let ruleProvider = new (<any>ts).formatting.RulesProvider();
@@ -215,7 +215,7 @@ function format(text:string): string {
215215
return result;
216216
}
217217

218-
function getDefaultOptions(): ts.FormatCodeOptions {
218+
function getDefaultOptions(): ts.FormatCodeSettings {
219219
return {
220220
indentSize: 4,
221221
tabSize: 4,

‎build/monaco/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"sinon": "^1.17.2",
4444
"source-map": "^0.4.4",
4545
"tslint": "^3.3.0",
46-
"typescript": "^2.0.3",
46+
"typescript": "^2.1.4",
4747
"typescript-formatter": "3.1.0",
4848
"underscore": "^1.8.2",
4949
"vinyl": "^0.4.5",

0 commit comments

Comments
 (0)