Skip to content

Commit 71d5db7

Browse files
roblourensroblourens
authored
Merge branch 'master' into kb-filereplace-case
2 parents 81bfc53 + d1220da commit 71d5db7

46 files changed

Lines changed: 478 additions & 318 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,15 @@
4242
"jsdoc/no-types": "warn",
4343
"semi": "off",
4444
"@typescript-eslint/semi": "warn",
45-
"@typescript-eslint/class-name-casing": "warn",
45+
"@typescript-eslint/naming-convention": [
46+
"warn",
47+
{
48+
"selector": "class",
49+
"format": [
50+
"PascalCase"
51+
]
52+
}
53+
],
4654
"code-no-unused-expressions": [
4755
"warn",
4856
{

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.47.0",
4-
"distro": "26783d64d76b2c2772a6fd49b00b230b75ec3385",
4+
"distro": "6903be74a495180afc923e255f0956a7bd4d2f3f",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -56,7 +56,7 @@
5656
"vscode-nsfw": "1.2.8",
5757
"vscode-oniguruma": "1.3.1",
5858
"vscode-proxy-agent": "^0.5.2",
59-
"vscode-ripgrep": "^1.5.8",
59+
"vscode-ripgrep": "^1.5.9",
6060
"vscode-sqlite3": "4.0.10",
6161
"vscode-textmate": "5.1.1",
6262
"xterm": "4.7.0-beta.3",
@@ -88,8 +88,8 @@
8888
"@types/winreg": "^1.2.30",
8989
"@types/yauzl": "^2.9.1",
9090
"@types/yazl": "^2.4.2",
91-
"@typescript-eslint/eslint-plugin": "2.3.2",
92-
"@typescript-eslint/parser": "^2.12.0",
91+
"@typescript-eslint/eslint-plugin": "3.1.0",
92+
"@typescript-eslint/parser": "^3.1.0",
9393
"ansi-colors": "^3.2.3",
9494
"asar": "^0.14.0",
9595
"chromium-pickle-js": "^0.2.0",

‎remote/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"vscode-nsfw": "1.2.8",
1919
"vscode-oniguruma": "1.3.1",
2020
"vscode-proxy-agent": "^0.5.2",
21-
"vscode-ripgrep": "^1.5.8",
21+
"vscode-ripgrep": "^1.5.9",
2222
"vscode-textmate": "5.1.1",
2323
"xterm": "4.7.0-beta.3",
2424
"xterm-addon-search": "0.7.0",

‎remote/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,10 @@ vscode-proxy-agent@^0.5.2:
382382
https-proxy-agent "^2.2.3"
383383
socks-proxy-agent "^4.0.1"
384384

385-
vscode-ripgrep@^1.5.8:
386-
version "1.5.8"
387-
resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.8.tgz#32cb33da6d1a9ca8f5de8c2813ed5114fd55fc11"
388-
integrity sha512-l6Pv/t1Jk63RU+kEkMO04XxnNRYdyzuesizj9AzFpcfrUxxpAjEJBK1qO9Mov30UUGZl7uDUBn+uCv9koaHPPA==
385+
vscode-ripgrep@^1.5.9:
386+
version "1.5.9"
387+
resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.9.tgz#3f28685056c4acb562a9e23236db40840c1db7b4"
388+
integrity sha512-PODJpqwVtvokc1w6Ixo4d4zl+LC4SEXyyYL2k2SGpCPYkrq2Tgm6iF988G0uRDIcQE0ALiCv1Ow86l2LhdzQ1w==
389389

390390
vscode-textmate@5.1.1:
391391
version "5.1.1"

‎src/vs/base/browser/ui/list/listView.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,14 @@ const DefaultOptions = {
8686
export class ElementsDragAndDropData<T, TContext = void> implements IDragAndDropData {
8787

8888
readonly elements: T[];
89-
context: TContext | undefined;
89+
90+
private _context: TContext | undefined;
91+
public get context(): TContext | undefined {
92+
return this._context;
93+
}
94+
public set context(value: TContext | undefined) {
95+
this._context = value;
96+
}
9097

9198
constructor(elements: T[]) {
9299
this.elements = elements;

‎src/vs/base/common/network.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ export namespace Schemas {
5656

5757
export const vscodeCustomEditor = 'vscode-custom-editor';
5858

59+
export const vscodeNotebook = 'vscode-notebook';
60+
5961
export const vscodeSettings = 'vscode-settings';
6062

6163
export const webviewPanel = 'webview-panel';

‎src/vs/base/common/uri.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ interface UriState extends UriComponents {
412412

413413
const _pathSepMarker = isWindows ? 1 : undefined;
414414

415-
// eslint-disable-next-line @typescript-eslint/class-name-casing
415+
// eslint-disable-next-line @typescript-eslint/naming-convention
416416
class _URI extends URI {
417417

418418
_formatted: string | null = null;

‎src/vs/editor/contrib/suggest/test/completionModel.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export function createSuggestItem(label: string, overwriteBefore: number, kind =
2929
}
3030
};
3131

32-
return new CompletionItem(position, suggestion, container, provider, undefined!);
32+
return new CompletionItem(position, suggestion, container, provider);
3333
}
3434
suite('CompletionModel', function () {
3535

‎src/vs/editor/contrib/suggest/test/wordDistance.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ suite('suggest, word distance', function () {
101101
return;
102102
}
103103
};
104-
return new CompletionItem(position, suggestion, container, provider, undefined!);
104+
return new CompletionItem(position, suggestion, container, provider);
105105
}
106106

107107
test('Suggest locality bonus can boost current word #90515', function () {

‎src/vs/platform/sign/node/signService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { ISignService } from 'vs/platform/sign/common/sign';
77

88
declare module vsda {
9-
// eslint-disable-next-line @typescript-eslint/class-name-casing
9+
// eslint-disable-next-line @typescript-eslint/naming-convention
1010
export class signer {
1111
sign(arg: any): any;
1212
}

0 commit comments

Comments
 (0)