Skip to content

Commit 6d09fb3

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into joao/scm-tree
2 parents eeebde6 + 4f39995 commit 6d09fb3

219 files changed

Lines changed: 5060 additions & 4000 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.

‎build/builtInExtensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "ms-vscode.node-debug",
4-
"version": "1.38.4",
4+
"version": "1.38.5",
55
"repo": "https://github.com/Microsoft/vscode-node-debug",
66
"metadata": {
77
"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",

‎build/gulpfile.hygiene.js‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const vfs = require('vinyl-fs');
1717
const path = require('path');
1818
const fs = require('fs');
1919
const pall = require('p-all');
20+
const task = require('./lib/task');
2021

2122
/**
2223
* Hygiene works by creating cascading subsets of all our files and
@@ -205,6 +206,33 @@ gulp.task('tslint', () => {
205206
]).pipe(es.through());
206207
});
207208

209+
function checkPackageJSON(actualPath) {
210+
const actual = require(path.join(__dirname, '..', actualPath));
211+
const rootPackageJSON = require('../package.json');
212+
213+
for (let depName in actual.dependencies) {
214+
const depVersion = actual.dependencies[depName];
215+
const rootDepVersion = rootPackageJSON.dependencies[depName];
216+
if (!rootDepVersion) {
217+
// missing in root is allowed
218+
continue;
219+
}
220+
if (depVersion !== rootDepVersion) {
221+
this.emit('error', `The dependency ${depName} in '${actualPath}' (${depVersion}) is different than in the root package.json (${rootDepVersion})`);
222+
}
223+
}
224+
}
225+
226+
const checkPackageJSONTask = task.define('check-package-json', () => {
227+
return gulp.src('package.json')
228+
.pipe(es.through(function() {
229+
checkPackageJSON.call(this, 'remote/package.json');
230+
checkPackageJSON.call(this, 'remote/web/package.json');
231+
}));
232+
});
233+
gulp.task(checkPackageJSONTask);
234+
235+
208236
function hygiene(some) {
209237
let errorCount = 0;
210238

@@ -393,7 +421,7 @@ function createGitIndexVinyls(paths) {
393421
.then(r => r.filter(p => !!p));
394422
}
395423

396-
gulp.task('hygiene', () => hygiene());
424+
gulp.task('hygiene', task.series(checkPackageJSONTask, () => hygiene()));
397425

398426
// this allows us to run hygiene as a git pre-commit hook
399427
if (require.main === module) {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
"default": true,
6060
"description": "%css.completion.triggerPropertyValueCompletion.desc%"
6161
},
62+
"css.completion.completePropertyWithSemicolon": {
63+
"type": "boolean",
64+
"scope": "resource",
65+
"default": true,
66+
"description": "%css.completion.completePropertyWithSemicolon.desc%"
67+
},
6268
"css.validate": {
6369
"type": "boolean",
6470
"scope": "resource",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"css.title": "CSS",
55
"css.customData.desc": "A list of relative file paths pointing to JSON files following the [custom data format](https://github.com/Microsoft/vscode-css-languageservice/blob/master/docs/customData.md).\n\nVS Code loads custom data on startup to enhance its CSS support for the custom CSS properties, at directives, pseudo classes and pseudo elements you specify in the JSON files.\n\nThe file paths are relative to workspace and only workspace folder settings are considered.",
66
"css.completion.triggerPropertyValueCompletion.desc": "By default, VS Code triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.",
7+
"css.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end when completing CSS properties",
78
"css.lint.argumentsInColorFunction.desc": "Invalid number of parameters.",
89
"css.lint.boxModel.desc": "Do not use `width` or `height` when using `padding` or `border`.",
910
"css.lint.compatibleVendorPrefixes.desc": "When using a vendor-specific prefix make sure to also include all other vendor-specific properties.",

‎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.6",
12+
"vscode-css-languageservice": "^4.0.3-next.8",
1313
"vscode-languageserver": "^5.3.0-next.8"
1414
},
1515
"devDependencies": {

‎extensions/css-language-features/server/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -781,10 +781,10 @@ supports-color@^5.3.0:
781781
dependencies:
782782
has-flag "^3.0.0"
783783

784-
vscode-css-languageservice@^4.0.3-next.6:
785-
version "4.0.3-next.6"
786-
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.0.3-next.6.tgz#c9b70ae6dc7418d080188ba9772bf47343b929e7"
787-
integrity sha512-Ip9EzhgZmwYEmmTw4oIN8oaZ1gUEJqVDrfcvPJ/bfc9lcYeSxexQ+9O5TiF106nX2g5f93sWYX/rDiAhxSgf4A==
784+
vscode-css-languageservice@^4.0.3-next.8:
785+
version "4.0.3-next.8"
786+
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.0.3-next.8.tgz#0b81693b6ea9d10f78775a1dcad2c0f464fbde16"
787+
integrity sha512-agBPPu86bPKIK5v6CFnWeBXN4jvnCzc67GZa/pvrIWeRdG7nvTu5Y2wYdwdesdpWzno9/5tfFEPp0KJbKQ4l+A==
788788
dependencies:
789789
vscode-languageserver-types "^3.15.0-next.2"
790790
vscode-nls "^4.1.1"

‎extensions/debug-server-ready/src/extension.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ class ServerReadyDetector extends vscode.Disposable {
7878
}
7979
this.shellPid = undefined;
8080

81-
terminals.forEach(terminal => {
82-
this.disposables.push(terminal.onDidWriteData(s => {
83-
this.detectPattern(s);
84-
}));
85-
});
81+
this.disposables.push(vscode.window.onDidWriteTerminalData(e => {
82+
if (terminals.indexOf(e.terminal) !== -1) {
83+
this.detectPattern(e.data);
84+
}
85+
}));
8686
}
8787

8888
detectPattern(s: string): void {

‎extensions/html-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/htmlServerMain",
1111
"dependencies": {
12-
"vscode-css-languageservice": "^4.0.3-next.6",
12+
"vscode-css-languageservice": "^4.0.3-next.8",
1313
"vscode-html-languageservice": "^3.0.4-next.3",
1414
"vscode-languageserver": "^5.3.0-next.8",
1515
"vscode-languageserver-types": "3.15.0-next.2",

‎extensions/html-language-features/server/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ supports-color@5.4.0:
229229
dependencies:
230230
has-flag "^3.0.0"
231231

232-
vscode-css-languageservice@^4.0.3-next.6:
233-
version "4.0.3-next.6"
234-
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.0.3-next.6.tgz#c9b70ae6dc7418d080188ba9772bf47343b929e7"
235-
integrity sha512-Ip9EzhgZmwYEmmTw4oIN8oaZ1gUEJqVDrfcvPJ/bfc9lcYeSxexQ+9O5TiF106nX2g5f93sWYX/rDiAhxSgf4A==
232+
vscode-css-languageservice@^4.0.3-next.8:
233+
version "4.0.3-next.8"
234+
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.0.3-next.8.tgz#0b81693b6ea9d10f78775a1dcad2c0f464fbde16"
235+
integrity sha512-agBPPu86bPKIK5v6CFnWeBXN4jvnCzc67GZa/pvrIWeRdG7nvTu5Y2wYdwdesdpWzno9/5tfFEPp0KJbKQ4l+A==
236236
dependencies:
237237
vscode-languageserver-types "^3.15.0-next.2"
238238
vscode-nls "^4.1.1"

‎extensions/markdown-language-features/package.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,6 @@
231231
"description": "%markdown.preview.scrollPreviewWithEditor.desc%",
232232
"scope": "resource"
233233
},
234-
"markdown.preview.scrollPreviewWithEditorSelection": {
235-
"type": "boolean",
236-
"default": true,
237-
"description": "%markdown.preview.scrollPreviewWithEditorSelection.desc%",
238-
"deprecationMessage": "%markdown.preview.scrollPreviewWithEditorSelection.deprecationMessage%"
239-
},
240234
"markdown.preview.markEditorSelection": {
241235
"type": "boolean",
242236
"default": true,

0 commit comments

Comments
 (0)