Skip to content

Merging back from release to master. #11488

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

Merged
Karthik Nadig (karthiknadig) merged 29 commits into from
Apr 29, 2020
Merged

Merging back from release to master. #11488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0ef5dba
Fix background (again) for ipywidgets (#11062) (#11064)
rchiodo Apr 10, 2020
4ccac22
Fix arrowing down through cells (#11095)
rchiodo Apr 11, 2020
c8fc5a5
Fix scrolling in the monaco editor (#11089)
rchiodo Apr 11, 2020
438aa3d
Fixes for UI issues (#11130)
rchiodo Apr 13, 2020
e6c627c
Cherry pick commits from master into April release (#11138)
DonJayamanne Apr 14, 2020
02fa068
Port perf fix to release branch (#11144)
rchiodo Apr 14, 2020
15c68db
Port fix for transient data in notebooks. (#11168)
rchiodo Apr 15, 2020
1fa5423
Port undo fix to release branch (#11181)
rchiodo Apr 15, 2020
d006e83
Ensure save works after saving untitled notebooks (#11190)
DonJayamanne Apr 15, 2020
397555a
Port fix for PDF saving to release (#11194)
rchiodo Apr 15, 2020
998a195
Fix scrolling when don't have focus (#11246)
rchiodo Apr 18, 2020
9dd4b7a
Account for scenarios where module name is undefined (#11248)
DonJayamanne Apr 20, 2020
9e29be4
Add message when widget script is not found on CDN (#11249)
DonJayamanne Apr 20, 2020
4c2be73
Fix failing unit tests on windows (#11191) (#11277)
karthiknadig Apr 20, 2020
04ef5b7
Display error message when fetching script source timesout (#11276)
DonJayamanne Apr 20, 2020
69d2691
Update version and change log for release (#11279)
karthiknadig Apr 20, 2020
bf6a523
Port two fixes to the release branch (#11337)
rchiodo Apr 22, 2020
b7fca7e
Wire unhandled widget messages to the jupyter output (#11273)
rchiodo Apr 20, 2020
03bfd82
Update changelog
rchiodo Apr 22, 2020
9d09af1
Cherry-pick fixes from master (#11367)
karthiknadig Apr 23, 2020
7d0ed6c
Port fixes into April point release (#11392)
DonJayamanne Apr 24, 2020
2a09546
Remove isolate script when running unittest (#11378) (#11407)
karthiknadig Apr 25, 2020
99d9681
Move runStartupCommand to global location (#11409)
rchiodo Apr 25, 2020
52b4fbf
Update version and change logs (#11408)
karthiknadig Apr 25, 2020
e9d084a
Fix widget tests (#11406)
DonJayamanne Apr 27, 2020
9fad82f
Disable CDN unit tests. Don't seem to pass on azure (#11441)
rchiodo Apr 27, 2020
f4ae575
only close interactive session on interactive window close (#11405) (…
IanMatthewHuff Apr 27, 2020
b21ff68
Merge into master
karthiknadig Apr 29, 2020
54366d8
Fix merge problems
karthiknadig Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix widget tests (#11406) 
Tests are broken in Release branch
  • Loading branch information
@DonJayamanne
DonJayamanne authored Apr 27, 2020
commit e9d084acbe50717cd82797dc635db82da6474603
16 changes: 12 additions & 4 deletions src/client/datascience/ipywidgets/localWidgetScriptSourceProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,28 @@ export class LocalWidgetScriptSourceProvider implements IWidgetScriptSourceProvi

const validFiles = files.filter((file) => {
// Should be of the form `<widget module>/index.js`
const parts = file.split('/'); // On windows this uses the unix separator too.
let parts = file.split('/'); // On windows this uses the unix separator too.
if (parts.length === 1) {
// Fall back if search API changes and returns results with OS path sep.
parts = file.split('\\');
}
if (parts.length !== 2) {
traceError('Incorrect file found when searching for nnbextension entrypoints');
traceError(`Incorrect file found when searching for nnbextension entrypoints ${file}`);
return false;
}
return true;
});

const mappedFiles = validFiles.map(async (file) => {
// Should be of the form `<widget module>/index.js`
const parts = file.split('/');
let parts = file.split('/'); // On windows this uses the unix separator too.
if (parts.length === 1) {
// Fall back if search API changes and returns results with OS path sep.
parts = file.split('\\');
}
const moduleName = parts[0];

const fileUri = Uri.file(path.join(nbextensionsPath, file));
const fileUri = Uri.file(path.join(nbextensionsPath, moduleName, parts[1]));
const scriptUri = (await this.localResourceUriConverter.asWebviewUri(fileUri)).toString();
// tslint:disable-next-line: no-unnecessary-local-variable
const widgetScriptSource: WidgetScriptSource = { moduleName, scriptUri, source: 'local' };
Expand Down
2 changes: 1 addition & 1 deletion src/test/datascience/ipywidgets/ipyWidgetScriptSourceProvider.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { InterpreterService } from '../../../client/interpreter/interpreterServi

// tslint:disable: no-any no-invalid-this

suite('xxxData Science - ipywidget - Widget Script Source Provider', () => {
suite('Data Science - ipywidget - Widget Script Source Provider', () => {
let scriptSourceProvider: IPyWidgetScriptSourceProvider;
let notebook: INotebook;
let configService: IConfigurationService;
Expand Down