Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix build #157217

Merged
merged 4 commits into from Aug 5, 2022
Merged

fix build #157217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f40395
fix build
bpasero Aug 5, 2022
87b7b99
fix compile
bpasero Aug 5, 2022
22c61e9
flaky
bpasero Aug 5, 2022
03c33fd
.
bpasero Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions build/lib/policies.js
View file
Open in desktop
Expand Up @@ -438,8 +438,20 @@ async function getNLS(resourceUrlTemplate, languageId, version) {
}
catch (err) {
if (/\[404\]/.test(err.message)) {
console.warn(`Language pack ${languageId}@${version} is missing. Downloading previous version...`);
return await getSpecificNLS(resourceUrlTemplate, languageId, previousVersion(version));
const thePreviousVersion = previousVersion(version);
console.warn(`Language pack ${languageId}@${version} is missing. Downloading previous version ${thePreviousVersion}...`);
try {
return await getSpecificNLS(resourceUrlTemplate, languageId, thePreviousVersion);
}
catch (err) {
if (/\[404\]/.test(err.message)) {
console.warn(`Language pack ${languageId}@${thePreviousVersion} is missing. Downloading previous version...`);
return await getSpecificNLS(resourceUrlTemplate, languageId, previousVersion(thePreviousVersion));
}
else {
throw err;
}
}
}
else {
throw err;
Expand Down
14 changes: 12 additions & 2 deletions build/lib/policies.ts
View file
Open in desktop
Expand Up @@ -622,8 +622,18 @@ async function getNLS(resourceUrlTemplate: string, languageId: string, version:
return await getSpecificNLS(resourceUrlTemplate, languageId, version);
} catch (err) {
if (/\[404\]/.test(err.message)) {
console.warn(`Language pack ${languageId}@${version} is missing. Downloading previous version...`);
return await getSpecificNLS(resourceUrlTemplate, languageId, previousVersion(version));
const thePreviousVersion = previousVersion(version);
console.warn(`Language pack ${languageId}@${version} is missing. Downloading previous version ${thePreviousVersion}...`);
try {
return await getSpecificNLS(resourceUrlTemplate, languageId, thePreviousVersion);
} catch (err) {
if (/\[404\]/.test(err.message)) {
console.warn(`Language pack ${languageId}@${thePreviousVersion} is missing. Downloading previous version...`);
return await getSpecificNLS(resourceUrlTemplate, languageId, previousVersion(thePreviousVersion));
} else {
throw err;
}
}
} else {
throw err;
}
Expand Down
2 changes: 1 addition & 1 deletion extensions/vscode-api-tests/src/singlefolder-tests/notebook.document.test.ts
View file
Open in desktop
Expand Up @@ -423,7 +423,7 @@ suite('Notebook Document', function () {
assert.strictEqual(document.isDirty, false);
});

test('onDidOpenNotebookDocument - emit event only once when opened in two editors', async function () {
test.skip('onDidOpenNotebookDocument - emit event only once when opened in two editors', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/157222
const uri = await utils.createRandomFile(undefined, undefined, '.nbdtest');
let counter = 0;
testDisposables.push(vscode.workspace.onDidOpenNotebookDocument(nb => {
Expand Down