Skip to content

Commit d8b6b05

Browse files
jriekenjrieken
committed
Merge branch 'master' into joh/eslint-rules
2 parents e22be57 + 958ff7a commit d8b6b05

27 files changed

Lines changed: 347 additions & 266 deletions

File tree

‎extensions/html-language-features/server/lib/jquery.d.ts‎

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

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.42.0",
4-
"distro": "902f61f7a8b3668981a644df63abeb8994546d43",
4+
"distro": "53e32cc87942bff5525453faaa8a831355c4dabb",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -55,10 +55,10 @@
5555
"vscode-ripgrep": "^1.5.7",
5656
"vscode-sqlite3": "4.0.9",
5757
"vscode-textmate": "4.4.0",
58-
"xterm": "4.3.0-beta.28.vscode.1",
58+
"xterm": "4.4.0-beta.13",
5959
"xterm-addon-search": "0.4.0-beta4",
6060
"xterm-addon-web-links": "0.2.1",
61-
"xterm-addon-webgl": "0.4.0-beta.11",
61+
"xterm-addon-webgl": "0.5.0-beta.7",
6262
"yauzl": "^2.9.2",
6363
"yazl": "^2.4.3"
6464
},

‎remote/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"vscode-proxy-agent": "^0.5.2",
2121
"vscode-ripgrep": "^1.5.7",
2222
"vscode-textmate": "4.4.0",
23-
"xterm": "4.3.0-beta.28.vscode.1",
23+
"xterm": "4.4.0-beta.13",
2424
"xterm-addon-search": "0.4.0-beta4",
2525
"xterm-addon-web-links": "0.2.1",
26-
"xterm-addon-webgl": "0.4.0-beta.11",
26+
"xterm-addon-webgl": "0.5.0-beta.7",
2727
"yauzl": "^2.9.2",
2828
"yazl": "^2.4.3"
2929
},

‎remote/web/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"onigasm-umd": "2.2.5",
66
"semver-umd": "^5.5.5",
77
"vscode-textmate": "4.4.0",
8-
"xterm": "4.3.0-beta.28.vscode.1",
8+
"xterm": "4.4.0-beta.13",
99
"xterm-addon-search": "0.4.0-beta4",
1010
"xterm-addon-web-links": "0.2.1",
11-
"xterm-addon-webgl": "0.4.0-beta.11"
11+
"xterm-addon-webgl": "0.5.0-beta.7"
1212
}
1313
}

‎remote/web/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ xterm-addon-web-links@0.2.1:
4141
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.1.tgz#6d1f2ce613e09870badf17615e7a1170a31542b2"
4242
integrity sha512-2KnHtiq0IG7hfwv3jw2/jQeH1RBk2d5CH4zvgwQe00rLofSJqSfgnJ7gwowxxpGHrpbPr6Lv4AmH/joaNw2+HQ==
4343

44-
xterm-addon-webgl@0.4.0-beta.11:
45-
version "0.4.0-beta.11"
46-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.4.0-beta.11.tgz#0e4a7242e2353cf74aba55e5a5bdc0b4ec87ad10"
47-
integrity sha512-AteDxm1RFy1WnjY9r5iJSETozLebvUkR+jextdZk/ASsK21vsYK0DuVWwRI8afgiN2hUVhxcxuHEJUOV+CJDQA==
48-
49-
xterm@4.3.0-beta.28.vscode.1:
50-
version "4.3.0-beta.28.vscode.1"
51-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.3.0-beta.28.vscode.1.tgz#89b85398b5801708e833d08bf92b2124fa128943"
52-
integrity sha512-JNHNZyDtAWnybJTrenPzD6g/yXpHOvPqmjau91Up4onRbjQYMSNlth17SqaES68DKn/+4kcIl2c/RG5SXJjvGw==
44+
xterm-addon-webgl@0.5.0-beta.7:
45+
version "0.5.0-beta.7"
46+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.5.0-beta.7.tgz#b7b95a362e942ad6f86fa286d7b7bd8ee3e7cf67"
47+
integrity sha512-v6aCvhm1C6mvaurGwUYQfyhb2cAUyuVnzf3Ob/hy5ebtyzUj4wW0N9NbqDEJk67UeMi1lV2xZqrO5gNeTpVqFA==
48+
49+
xterm@4.4.0-beta.13:
50+
version "4.4.0-beta.13"
51+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.4.0-beta.13.tgz#f7c5fa0d2b098ce0dd8b7c96d3d5fcaee22b86ed"
52+
integrity sha512-ZoDOVO3w84CXekBveGw1H2lcvM4HkJG5suXesE/3S+N4DnBhBcK/vw4kdooALGoorJV2GtgA1XEA6+m4N5Sgnw==

‎remote/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -428,15 +428,15 @@ xterm-addon-web-links@0.2.1:
428428
resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.1.tgz#6d1f2ce613e09870badf17615e7a1170a31542b2"
429429
integrity sha512-2KnHtiq0IG7hfwv3jw2/jQeH1RBk2d5CH4zvgwQe00rLofSJqSfgnJ7gwowxxpGHrpbPr6Lv4AmH/joaNw2+HQ==
430430

431-
xterm-addon-webgl@0.4.0-beta.11:
432-
version "0.4.0-beta.11"
433-
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.4.0-beta.11.tgz#0e4a7242e2353cf74aba55e5a5bdc0b4ec87ad10"
434-
integrity sha512-AteDxm1RFy1WnjY9r5iJSETozLebvUkR+jextdZk/ASsK21vsYK0DuVWwRI8afgiN2hUVhxcxuHEJUOV+CJDQA==
435-
436-
xterm@4.3.0-beta.28.vscode.1:
437-
version "4.3.0-beta.28.vscode.1"
438-
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.3.0-beta.28.vscode.1.tgz#89b85398b5801708e833d08bf92b2124fa128943"
439-
integrity sha512-JNHNZyDtAWnybJTrenPzD6g/yXpHOvPqmjau91Up4onRbjQYMSNlth17SqaES68DKn/+4kcIl2c/RG5SXJjvGw==
431+
xterm-addon-webgl@0.5.0-beta.7:
432+
version "0.5.0-beta.7"
433+
resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.5.0-beta.7.tgz#b7b95a362e942ad6f86fa286d7b7bd8ee3e7cf67"
434+
integrity sha512-v6aCvhm1C6mvaurGwUYQfyhb2cAUyuVnzf3Ob/hy5ebtyzUj4wW0N9NbqDEJk67UeMi1lV2xZqrO5gNeTpVqFA==
435+
436+
xterm@4.4.0-beta.13:
437+
version "4.4.0-beta.13"
438+
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.4.0-beta.13.tgz#f7c5fa0d2b098ce0dd8b7c96d3d5fcaee22b86ed"
439+
integrity sha512-ZoDOVO3w84CXekBveGw1H2lcvM4HkJG5suXesE/3S+N4DnBhBcK/vw4kdooALGoorJV2GtgA1XEA6+m4N5Sgnw==
440440

441441
yauzl@^2.9.2:
442442
version "2.10.0"

‎src/typings/require.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ declare class LoaderEvent {
3131
readonly detail: string;
3232
}
3333

34-
declare var define: {
34+
declare const define: {
3535
(moduleName: string, dependencies: string[], callback: (...args: any[]) => any): any;
3636
(moduleName: string, dependencies: string[], definition: any): any;
3737
(moduleName: string, callback: (...args: any[]) => any): any;

‎src/vs/base/browser/ui/codiconLabel/codicon/codicon.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
@font-face {
77
font-family: "codicon";
8-
src: url("./codicon.ttf?17db7f5e5f31fd546e62218bb0823c0c") format("truetype");
8+
src: url("./codicon.ttf?ed926e87ee4e27771159d875e877f74a") format("truetype");
99
}
1010

1111
.codicon[class*='codicon-'] {
@@ -409,4 +409,5 @@
409409
.codicon-call-outgoing:before { content: "\eb93" }
410410
.codicon-menu:before { content: "\eb94" }
411411
.codicon-expand-all:before { content: "\eb95" }
412+
.codicon-feedback:before { content: "\eb96" }
412413
.codicon-debug-alt:before { content: "\f101" }

‎src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf‎

256 Bytes
Binary file not shown.

‎src/vs/workbench/api/common/extHostApiCommands.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ export class ExtHostApiCommands {
417417
};
418418
return this._commands.executeCommand<modes.CompletionList>('_executeCompletionItemProvider', args).then(result => {
419419
if (result) {
420-
const items = result.suggestions.map(suggestion => typeConverters.CompletionItem.to(suggestion));
420+
const items = result.suggestions.map(suggestion => typeConverters.CompletionItem.to(suggestion, this._commands.converter));
421421
return new types.CompletionList(items, result.incomplete);
422422
}
423423
return undefined;

0 commit comments

Comments
 (0)