maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into joh/suggestcycle

Browse source
This commit is contained in:
Johannes Rieken 2018-09-19 11:13:38 +02:00
commit 6e5b43e401
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/html-language-features/server/package.json
View file

@ -10,7 +10,7 @@
"main": "./out/htmlServerMain",
"dependencies": {
"vscode-css-languageservice": "^3.0.11",
"vscode-html-languageservice": "^2.1.8",
"vscode-html-languageservice": "^2.1.9",
"vscode-languageserver": "^5.1.0-next.5",
"vscode-languageserver-types": "^3.13.0",
"vscode-nls": "^4.0.0",

6
extensions/html-language-features/server/yarn.lock
View file

@ -201,9 +201,9 @@ vscode-css-languageservice@^3.0.11:
vscode-languageserver-types "^3.13.0"
vscode-nls "^4.0.0"
vscode-html-languageservice@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.8.tgz#1f3c8826b68f41f4f8ef3b683607f66499347fd1"
vscode-html-languageservice@^2.1.9:
version "2.1.9"
resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.9.tgz#906f2f894b023d3a464739ebc5b4eb695ef1cf58"
dependencies:
vscode-languageserver-types "^3.13.0"
vscode-nls "^4.0.0"

2
src/typings/mocha.d.ts vendored
View file

@ -176,7 +176,7 @@ declare namespace Mocha {
interface ITestDefinition {
(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): ITest;
only(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): ITest;
// only(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): ITest;
skip(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): void;
timeout(ms: number): void;
state: "failed" | "passed";

2
src/vs/workbench/parts/extensions/test/electron-browser/extensionsViews.test.ts
View file

@ -215,7 +215,7 @@ suite('ExtensionsListView Tests', () => {
builtinCheck]);
});
test.only('Test installed query with category', () => {
test('Test installed query with category', () => {
const installedCategoryWithoutQuotesCheck = testableView.show('@installed category:themes').then(result => {
assert.equal(result.length, 2, 'Unexpected number of results for @installed query with category');
assert.equal(result.get(0).name, localDisabledTheme.manifest.name, 'Unexpected extension for @installed query with category.');