Skip to content

Commit 2a591b1

Browse files
committed
fix: Update configuration references from 'jupyter' to 'deepnote'
Signed-off-by: Tomas Kislan <tomas@kislan.sk>
1 parent cefe13a commit 2a591b1

26 files changed

+48
-46
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,13 +1363,13 @@
13631363
"command": "deepnote.exportfileasnotebook",
13641364
"title": "%deepnote.command.deepnote.exportfileasnotebook.title%",
13651365
"category": "Jupyter",
1366-
"when": "deepnote.ispythonorinteractiveeactive && !notebookEditorFocused && isWorkspaceTrusted"
1366+
"when": "deepnote.ispythonorinteractiveactive && !notebookEditorFocused && isWorkspaceTrusted"
13671367
},
13681368
{
13691369
"command": "deepnote.restartkernel",
13701370
"title": "%deepnote.command.deepnote.restartkernel.title%",
13711371
"category": "Jupyter",
1372-
"when": "(deepnote.ispythonorinteractiveeactive || deepnote.isnativeactive) && isWorkspaceTrusted"
1372+
"when": "(deepnote.ispythonorinteractiveactive || deepnote.isnativeactive) && isWorkspaceTrusted"
13731373
},
13741374
{
13751375
"command": "deepnote.notebookeditor.removeallcells",

src/extension.node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ async function activateLegacy(
219219
const isDevMode =
220220
!isTestExecution() &&
221221
(context.extensionMode === ExtensionMode.Development ||
222-
workspace.getConfiguration('jupyter').get<boolean>('development', false));
222+
workspace.getConfiguration('deepnote').get<boolean>('development', false));
223223
serviceManager.addSingletonInstance<boolean>(IsDevMode, isDevMode);
224224
if (isDevMode) {
225225
commands.executeCommand('setContext', 'deepnote.development', true).then(noop, noop);

src/extension.web.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ async function activateLegacy(
174174
// register "services"
175175
const isDevMode =
176176
context.extensionMode === ExtensionMode.Development ||
177-
workspace.getConfiguration('jupyter').get<boolean>('development', false);
177+
workspace.getConfiguration('deepnote').get<boolean>('development', false);
178178

179179
serviceManager.addSingletonInstance<boolean>(IsDevMode, isDevMode);
180180
if (isDevMode) {

src/kernels/raw/finder/trustedKernelPaths.node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export class TrustedKernelPaths implements ITrustedKernelPaths {
1616
: undefined;
1717
constructor(@inject(IPlatformService) private readonly platform: IPlatformService) {}
1818
private get trustedKernelSpecs(): string[] {
19-
return workspace.getConfiguration('jupyter', undefined).get<string[]>('kernels.trusted', []);
19+
return workspace.getConfiguration('deepnote', undefined).get<string[]>('kernels.trusted', []);
2020
}
2121
public isTrusted(kernelPath: Uri): boolean {
2222
const trusted = this.isTrustedImpl(kernelPath);

src/kernels/raw/finder/trustedKernelPaths.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ suite('Trusted Kernel paths', () => {
2222
function createTrustedPathService() {
2323
jupyterConfig = mock<WorkspaceConfiguration>();
2424
when(jupyterConfig.get('kernels.trusted', anything())).thenCall((_, defaultValue) => defaultValue);
25-
when(mockedVSCodeNamespaces.workspace.getConfiguration('jupyter', anything())).thenReturn(
25+
when(mockedVSCodeNamespaces.workspace.getConfiguration('deepnote', anything())).thenReturn(
2626
instance(jupyterConfig)
2727
);
2828
platform = mock<IPlatformService>();

src/kernels/raw/finder/trustedKernrelPaths.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ suite('Trusted Kernel paths', () => {
2121
function createTrustedPathService() {
2222
jupyterConfig = mock<WorkspaceConfiguration>();
2323
when(jupyterConfig.get('kernels.trusted', anything())).thenCall((_, defaultValue) => defaultValue);
24-
when(mockedVSCodeNamespaces.workspace.getConfiguration('jupyter', anything())).thenReturn(
24+
when(mockedVSCodeNamespaces.workspace.getConfiguration('deepnote', anything())).thenReturn(
2525
instance(jupyterConfig)
2626
);
2727
platform = mock<IPlatformService>();

src/kernels/raw/session/rawKernelConnection.node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ function newRawKernel(kernelProcess: IKernelProcess, clientId: string, username:
680680
username,
681681
model
682682
});
683-
if (workspace.getConfiguration('jupyter').get('enablePythonKernelLogging', false)) {
683+
if (workspace.getConfiguration('deepnote').get('enablePythonKernelLogging', false)) {
684684
realKernel.anyMessage.connect((_, msg) => {
685685
logger.trace(`[AnyMessage Event] [${msg.direction}] [${kernelProcess.pid}] ${JSON.stringify(msg.msg)}`);
686686
});

src/platform/common/configSettings.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export class JupyterSettings implements IWatchableJupyterSettings {
222222

223223
private initialize(): void {
224224
const onDidChange = () => {
225-
const currentConfig = workspace.getConfiguration('jupyter', this._workspaceRoot);
225+
const currentConfig = workspace.getConfiguration('deepnote', this._workspaceRoot);
226226
const pythonConfig = workspace.getConfiguration('python', this._workspaceRoot);
227227
this.update(currentConfig, pythonConfig);
228228

@@ -242,7 +242,7 @@ export class JupyterSettings implements IWatchableJupyterSettings {
242242
})
243243
);
244244

245-
const initialConfig = workspace.getConfiguration('jupyter', this._workspaceRoot);
245+
const initialConfig = workspace.getConfiguration('deepnote', this._workspaceRoot);
246246
const pythonConfig = workspace.getConfiguration('python', this._workspaceRoot);
247247
if (initialConfig) {
248248
this.update(initialConfig, pythonConfig);

src/platform/common/configuration/service.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ suite('Configuration Service', () => {
2323

2424
function setupConfigProvider(): WorkspaceConfiguration {
2525
const workspaceConfig = mock<WorkspaceConfiguration>();
26-
when(mockedVSCodeNamespaces.workspace.getConfiguration('jupyter', uriEquals(resource))).thenReturn(
26+
when(mockedVSCodeNamespaces.workspace.getConfiguration('deepnote', uriEquals(resource))).thenReturn(
2727
instance(workspaceConfig)
2828
);
2929
return workspaceConfig;

src/platform/common/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ export namespace EditorContexts {
296296
export const IsNativeActive = 'deepnote.isnativeactive';
297297
export const IsInteractiveOrNativeActive = 'deepnote.isinteractiveornativeactive';
298298
export const IsPythonOrNativeActive = 'deepnote.ispythonornativeactive';
299-
export const IsPythonOrInteractiveActive = 'deepnote.ispythonorinteractiveeactive';
299+
export const IsPythonOrInteractiveActive = 'deepnote.ispythonorinteractiveactive';
300300
export const IsPythonOrInteractiveOrNativeActive = 'deepnote.ispythonorinteractiveornativeeactive';
301301
export const CanRestartNotebookKernel = 'deepnote.notebookeditor.canrestartNotebookkernel';
302302
export const CanInterruptNotebookKernel = 'deepnote.notebookeditor.canInterruptNotebookKernel';

0 commit comments

Comments
 (0)