Skip to content

Commit 15031f6

Browse files
committed
optional settingregistry
1 parent 189af03 commit 15031f6

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

packages/tree-extension/src/index.ts

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,13 @@ const fileActions: JupyterFrontEndPlugin<void> = {
192192
const fileBrowserSettings: JupyterFrontEndPlugin<void> = {
193193
id: '@jupyter-notebook/tree-extension:settings',
194194
description: 'Set up the default file browser settings',
195-
requires: [IDefaultFileBrowser, ISettingRegistry],
195+
requires: [IDefaultFileBrowser],
196+
optional: [ISettingRegistry],
196197
autoStart: true,
197198
activate: (
198199
app: JupyterFrontEnd,
199200
browser: IDefaultFileBrowser,
200-
settingRegistry: ISettingRegistry
201+
settingRegistry: ISettingRegistry | null
201202
) => {
202203
/**
203204
* File browser default configuration.
@@ -219,20 +220,22 @@ const fileBrowserSettings: JupyterFrontEndPlugin<void> = {
219220
browser[key] = defaultFileBrowserConfig[key];
220221
}
221222

222-
void settingRegistry.load(FILE_BROWSER_PLUGIN_ID).then((settings) => {
223-
function onSettingsChanged(settings: ISettingRegistry.ISettings): void {
224-
let key: keyof typeof defaultFileBrowserConfig;
225-
for (key in defaultFileBrowserConfig) {
226-
const value = settings.get(key).user as boolean;
227-
// only set the setting if it is defined by the user
228-
if (value !== undefined) {
229-
browser[key] = value;
223+
if (settingRegistry) {
224+
void settingRegistry.load(FILE_BROWSER_PLUGIN_ID).then((settings) => {
225+
function onSettingsChanged(settings: ISettingRegistry.ISettings): void {
226+
let key: keyof typeof defaultFileBrowserConfig;
227+
for (key in defaultFileBrowserConfig) {
228+
const value = settings.get(key).user as boolean;
229+
// only set the setting if it is defined by the user
230+
if (value !== undefined) {
231+
browser[key] = value;
232+
}
230233
}
231234
}
232-
}
233-
settings.changed.connect(onSettingsChanged);
234-
onSettingsChanged(settings);
235-
});
235+
settings.changed.connect(onSettingsChanged);
236+
onSettingsChanged(settings);
237+
});
238+
}
236239
},
237240
};
238241

0 commit comments

Comments
 (0)