Skip to content

Commit 517ff5d

Browse files
jriekenjrieken
committed
Merge branch 'master' into joh/bulkEditPreview
2 parents 8c34dcc + 99f0da6 commit 517ff5d

29 files changed

Lines changed: 471 additions & 311 deletions

File tree

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "6.1.6"
2+
target "7.1.7"
33
runtime "electron"

‎cgmanifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "chromium",
88
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
9-
"commitHash": "91f08db83c2ce8c722ddf0911ead8f7c473bedfa"
9+
"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
1010
}
1111
},
1212
"licenseDetail": [
@@ -40,32 +40,32 @@
4040
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
4141
],
4242
"isOnlyProductionDependency": true,
43-
"version": "76.0.3809.146"
43+
"version": "78.0.3904.130"
4444
},
4545
{
4646
"component": {
4747
"type": "git",
4848
"git": {
4949
"name": "nodejs",
5050
"repositoryUrl": "https://github.com/nodejs/node",
51-
"commitHash": "64219741218aa87e259cf8257596073b8e747f0a"
51+
"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
5252
}
5353
},
5454
"isOnlyProductionDependency": true,
55-
"version": "12.4.0"
55+
"version": "12.8.1"
5656
},
5757
{
5858
"component": {
5959
"type": "git",
6060
"git": {
6161
"name": "electron",
6262
"repositoryUrl": "https://github.com/electron/electron",
63-
"commitHash": "19c705ab80cd6fdccca3d65803ec2c4addb9540a"
63+
"commitHash": "bef0dd868b7d6d32716c319664ed480f2ae17396"
6464
}
6565
},
6666
"isOnlyProductionDependency": true,
6767
"license": "MIT",
68-
"version": "6.1.6"
68+
"version": "7.1.7"
6969
},
7070
{
7171
"component": {

‎extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const webviewId = 'myWebview';
1313

1414
const testDocument = join(vscode.workspace.rootPath || '', './bower.json');
1515

16-
suite('Webview tests', () => {
16+
suite.skip('Webview tests', () => {
1717
const disposables: vscode.Disposable[] = [];
1818

1919
function _register<T extends vscode.Disposable>(disposable: T) {

‎extensions/vscode-api-tests/src/singlefolder-tests/window.test.ts‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,24 @@ suite('window namespace tests', () => {
145145
});
146146
});
147147

148-
test('active editor not always correct... #49125', async function () {
148+
test.skip('active editor not always correct... #49125', async function () {
149+
const randomFile1 = await createRandomFile();
150+
const randomFile2 = await createRandomFile();
151+
152+
console.log('Created random files: ' + randomFile1.toString() + ' and ' + randomFile2.toString());
153+
149154
const [docA, docB] = await Promise.all([
150-
workspace.openTextDocument(await createRandomFile()),
151-
workspace.openTextDocument(await createRandomFile()),
155+
workspace.openTextDocument(randomFile1),
156+
workspace.openTextDocument(randomFile2)
152157
]);
153158
for (let c = 0; c < 4; c++) {
154159
let editorA = await window.showTextDocument(docA, ViewColumn.One);
155-
assert(window.activeTextEditor === editorA);
160+
console.log('Showing: ' + editorA.document.fileName + ' and active editor is: ' + window.activeTextEditor?.document.fileName);
161+
assert.equal(window.activeTextEditor, editorA);
156162

157163
let editorB = await window.showTextDocument(docB, ViewColumn.Two);
158-
assert(window.activeTextEditor === editorB);
164+
console.log('Showing: ' + editorB.document.fileName + ' and active editor is: ' + window.activeTextEditor?.document.fileName);
165+
assert.equal(window.activeTextEditor, editorB);
159166
}
160167
});
161168

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"coveralls": "^2.11.11",
9292
"cson-parser": "^1.3.3",
9393
"debounce": "^1.0.0",
94-
"electron": "6.1.6",
94+
"electron": "7.1.7",
9595
"eslint": "6.8.0",
9696
"eslint-plugin-jsdoc": "^19.1.0",
9797
"event-stream": "3.3.4",

‎src/vs/code/electron-main/app.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export class CodeApplication extends Disposable {
171171
app.on('web-contents-created', (_event: Event, contents) => {
172172
contents.on('will-attach-webview', (event: Event, webPreferences, params) => {
173173

174-
const isValidWebviewSource = (source: string): boolean => {
174+
const isValidWebviewSource = (source: string | undefined): boolean => {
175175
if (!source) {
176176
return false;
177177
}
@@ -191,11 +191,11 @@ export class CodeApplication extends Disposable {
191191
webPreferences.nodeIntegration = false;
192192

193193
// Verify URLs being loaded
194-
if (isValidWebviewSource(params.src) && isValidWebviewSource(webPreferences.preloadURL)) {
194+
if (isValidWebviewSource(params.src) && isValidWebviewSource(webPreferences.preload)) {
195195
return;
196196
}
197197

198-
delete webPreferences.preloadUrl;
198+
delete (webPreferences as { preloadURL: string }).preloadURL; // https://github.com/electron/electron/issues/21553
199199

200200
// Otherwise prevent loading
201201
this.logService.error('webContents#web-contents-created: Prevented webview attach');
@@ -497,27 +497,27 @@ export class CodeApplication extends Disposable {
497497
this.logService.info(`Tracing: waiting for windows to get ready...`);
498498

499499
let recordingStopped = false;
500-
const stopRecording = (timeout: boolean) => {
500+
const stopRecording = async (timeout: boolean) => {
501501
if (recordingStopped) {
502502
return;
503503
}
504504

505505
recordingStopped = true; // only once
506506

507-
contentTracing.stopRecording(join(homedir(), `${product.applicationName}-${Math.random().toString(16).slice(-4)}.trace.txt`), path => {
508-
if (!timeout) {
509-
if (this.dialogMainService) {
510-
this.dialogMainService.showMessageBox({
511-
type: 'info',
512-
message: localize('trace.message', "Successfully created trace."),
513-
detail: localize('trace.detail', "Please create an issue and manually attach the following file:\n{0}", path),
514-
buttons: [localize('trace.ok', "Ok")]
515-
}, withNullAsUndefined(BrowserWindow.getFocusedWindow()));
516-
}
517-
} else {
518-
this.logService.info(`Tracing: data recorded (after 30s timeout) to ${path}`);
507+
const path = await contentTracing.stopRecording(join(homedir(), `${product.applicationName}-${Math.random().toString(16).slice(-4)}.trace.txt`));
508+
509+
if (!timeout) {
510+
if (this.dialogMainService) {
511+
this.dialogMainService.showMessageBox({
512+
type: 'info',
513+
message: localize('trace.message', "Successfully created trace."),
514+
detail: localize('trace.detail', "Please create an issue and manually attach the following file:\n{0}", path),
515+
buttons: [localize('trace.ok', "Ok")]
516+
}, withNullAsUndefined(BrowserWindow.getFocusedWindow()));
519517
}
520-
});
518+
} else {
519+
this.logService.info(`Tracing: data recorded (after 30s timeout) to ${path}`);
520+
}
521521
};
522522

523523
// Wait up to 30s before creating the trace anyways

‎src/vs/code/electron-main/window.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,9 @@ export class CodeWindow extends Disposable implements ICodeWindow {
347347
});
348348

349349
this._win.webContents.session.webRequest.onHeadersReceived(null!, (details, callback) => {
350-
const responseHeaders = details.responseHeaders as { [key: string]: string[] };
350+
const responseHeaders = details.responseHeaders as Record<string, (string) | (string[])>;
351351

352-
const contentType: string[] = (responseHeaders['content-type'] || responseHeaders['Content-Type']);
352+
const contentType = (responseHeaders['content-type'] || responseHeaders['Content-Type']);
353353
if (contentType && Array.isArray(contentType) && contentType.some(x => x.toLowerCase().indexOf('image/svg') >= 0)) {
354354
return callback({ cancel: true });
355355
}
@@ -441,7 +441,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
441441
// Inject headers when requests are incoming
442442
const urls = ['https://marketplace.visualstudio.com/*', 'https://*.vsassets.io/*'];
443443
this._win.webContents.session.webRequest.onBeforeSendHeaders({ urls }, (details, cb) =>
444-
this.marketplaceHeadersPromise.then(headers => cb({ cancel: false, requestHeaders: objects.assign(details.requestHeaders, headers) as { [key: string]: string | undefined } })));
444+
this.marketplaceHeadersPromise.then(headers => cb({ cancel: false, requestHeaders: objects.assign(details.requestHeaders, headers) as Record<string, string> })));
445445
}
446446

447447
private onWindowError(error: WindowError): void {

‎src/vs/editor/common/modes.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ export interface CompletionItem {
481481
export interface CompletionList {
482482
suggestions: CompletionItem[];
483483
incomplete?: boolean;
484+
isDetailsResolved?: boolean;
484485
dispose?(): void;
485486
}
486487

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ export class CompletionItem {
4747
idx?: number;
4848
word?: string;
4949

50+
//
51+
readonly isDetailsResolved: boolean;
52+
5053
constructor(
5154
readonly position: IPosition,
5255
readonly completion: modes.CompletionItem,
@@ -70,6 +73,8 @@ export class CompletionItem {
7073
this.editReplaceEnd = new Position(completion.range.replace.endLineNumber, completion.range.replace.endColumn);
7174
}
7275

76+
this.isDetailsResolved = container.isDetailsResolved || typeof provider.resolveCompletionItem === 'undefined';
77+
7378
// create the suggestion resolver
7479
const { resolveCompletionItem } = provider;
7580
if (typeof resolveCompletionItem !== 'function') {

‎src/vs/monaco.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4854,6 +4854,7 @@ declare namespace monaco.languages {
48544854
export interface CompletionList {
48554855
suggestions: CompletionItem[];
48564856
incomplete?: boolean;
4857+
isDetailsResolved?: boolean;
48574858
dispose?(): void;
48584859
}
48594860

0 commit comments

Comments
 (0)