chore: fix lint and typecheck

Author: saltenasl

src/kernels/deepnote/deepnoteServerStarter.node.ts

@@ -19,7 +19,7 @@ import { ISqlIntegrationEnvVarsProvider } from '../../platform/notebooks/deepnot
 import { PythonEnvironment } from '../../platform/pythonEnvironments/info';
 import * as path from '../../platform/vscode-path/path';
 import { DEEPNOTE_DEFAULT_PORT, DeepnoteServerInfo, IDeepnoteServerStarter, IDeepnoteToolkitInstaller } from './types';
-import { getDeepnoteNotebookStorageKey } from '../../platform/deepnote/deepnoteUriUtils';
+import { getDeepnoteNotebookStorageKey } from '../../platform/deepnote/deepnoteUriUtils.node';
 
 /**
  * Lock file data structure for tracking server ownership
@@ -255,7 +255,6 @@ export class DeepnoteServerStarter implements IDeepnoteServerStarter, IExtension
         token?: CancellationToken
     ): Promise<DeepnoteServerInfo> {
         const filePath = deepnoteFileUri.with({ query: '', fragment: '' }).fsPath;
-        const legacyKey = getDeepnoteNotebookStorageKey(deepnoteFileUri.with({ query: '', fragment: '' }));
 
         Cancellation.throwIfCanceled(token);
 
@@ -445,6 +444,7 @@ export class DeepnoteServerStarter implements IDeepnoteServerStarter, IExtension
         token?: CancellationToken
     ): Promise<void> {
         const filePath = deepnoteFileUri.with({ query: '', fragment: '' }).fsPath;
+        const legacyKey = getDeepnoteNotebookStorageKey(deepnoteFileUri.with({ query: '', fragment: '' }));
 
         Cancellation.throwIfCanceled(token);
 

src/kernels/deepnote/environments/deepnoteEnvironmentsView.node.ts

@@ -30,7 +30,7 @@ import {
 import { getDisplayPath } from '../../../platform/common/platform/fs-paths';
 import { IKernelProvider } from '../../types';
 import { createDeepnoteServerConfigHandle } from '../../../platform/deepnote/deepnoteServerUtils.node';
-import { getDeepnoteProjectStorageKey } from '../../../platform/deepnote/deepnoteUriUtils';
+import { getDeepnoteProjectStorageKey } from '../../../platform/deepnote/deepnoteUriUtils.node';
 
 /**
  * View controller for the Deepnote kernel environments tree view.

src/kernels/deepnote/environments/deepnoteEnvironmentsView.unit.test.ts

@@ -13,7 +13,7 @@ import { mockedVSCodeNamespaces, resetVSCodeMocks } from '../../../test/vscode-m
 import { DeepnoteEnvironmentTreeDataProvider } from './deepnoteEnvironmentTreeDataProvider.node';
 import * as interpreterHelpers from '../../../platform/interpreter/helpers';
 import { createDeepnoteServerConfigHandle } from '../../../platform/deepnote/deepnoteServerUtils.node';
-import { getDeepnoteProjectStorageKey } from '../../../platform/deepnote/deepnoteUriUtils';
+import { getDeepnoteProjectStorageKey } from '../../../platform/deepnote/deepnoteUriUtils.node';
 
 suite('DeepnoteEnvironmentsView', () => {
     let view: DeepnoteEnvironmentsView;
@@ -621,9 +621,7 @@ suite('DeepnoteEnvironmentsView', () => {
             when(mockedVSCodeNamespaces.window.activeNotebookEditor).thenReturn(mockNotebookEditor as any);
 
             // Mock current environment mapping
-            when(mockNotebookEnvironmentMapper.getEnvironmentForNotebook(anything())).thenReturn(
-                currentEnvironment.id
-            );
+            when(mockNotebookEnvironmentMapper.getEnvironmentForNotebook(anything())).thenReturn(currentEnvironment.id);
             when(mockConfigManager.getEnvironment(currentEnvironment.id)).thenReturn(currentEnvironment);
 
             // Mock available environments

src/kernels/deepnote/environments/deepnoteNotebookEnvironmentMapper.node.ts

@@ -8,7 +8,7 @@ import { logger } from '../../../platform/logging';
 import {
     getDeepnoteNotebookStorageKey,
     getLegacyDeepnoteNotebookStorageKey
-} from '../../../platform/deepnote/deepnoteUriUtils';
+} from '../../../platform/deepnote/deepnoteUriUtils.node';
 
 /**
  * Manages the mapping between notebooks and their selected environments

src/kernels/deepnote/environments/deepnoteNotebookEnvironmentMapper.unit.test.ts

@@ -3,6 +3,7 @@ import * as sinon from 'sinon';
 import { Uri, Memento } from 'vscode';
 
 import { DeepnoteNotebookEnvironmentMapper } from './deepnoteNotebookEnvironmentMapper.node';
+import { IExtensionContext } from '../../../platform/common/types';
 
 class InMemoryMemento implements Memento {
     private storage = new Map<string, unknown>();
@@ -28,14 +29,17 @@ class InMemoryMemento implements Memento {
     }
 }
 
+function createExtensionContextStub(workspaceState: Memento): IExtensionContext {
+    return { workspaceState } as unknown as IExtensionContext;
+}
+
 suite('DeepnoteNotebookEnvironmentMapper', () => {
     let workspaceState: InMemoryMemento;
     let mapper: DeepnoteNotebookEnvironmentMapper;
 
     setup(() => {
         workspaceState = new InMemoryMemento();
-        const context = { workspaceState } as unknown as { workspaceState: Memento };
-        mapper = new DeepnoteNotebookEnvironmentMapper(context);
+        mapper = new DeepnoteNotebookEnvironmentMapper(createExtensionContextStub(workspaceState));
     });
 
     teardown(() => {
@@ -59,11 +63,8 @@ suite('DeepnoteNotebookEnvironmentMapper', () => {
 
         await workspaceState.update('deepnote.notebookEnvironmentMappings', { [legacyKey]: 'env-legacy' });
 
-        const freshMapper = new DeepnoteNotebookEnvironmentMapper({ workspaceState } as unknown as {
-            workspaceState: Memento;
-        });
+        const freshMapper = new DeepnoteNotebookEnvironmentMapper(createExtensionContextStub(workspaceState));
 
         assert.strictEqual(freshMapper.getEnvironmentForNotebook(legacyUri), 'env-legacy');
     });
 });
-

src/notebooks/deepnote/deepnoteKernelAutoSelector.node.ts

@@ -54,7 +54,7 @@ import {
     getDeepnoteNotebookKeyHash,
     getDeepnoteNotebookStorageKey,
     getDeepnoteProjectStorageKey
-} from '../../platform/deepnote/deepnoteUriUtils';
+} from '../../platform/deepnote/deepnoteUriUtils.node';
 
 /**
  * Automatically selects and starts Deepnote kernel for .deepnote notebooks
@@ -455,13 +455,7 @@ export class DeepnoteKernelAutoSelector implements IDeepnoteKernelAutoSelector,
             return false;
         }
 
-        await this.ensureKernelSelectedWithConfiguration(
-            notebook,
-            environment,
-            notebookKey,
-            progress,
-            token
-        );
+        await this.ensureKernelSelectedWithConfiguration(notebook, environment, notebookKey, progress, token);
 
         return true;
     }
@@ -676,13 +670,17 @@ export class DeepnoteKernelAutoSelector implements IDeepnoteKernelAutoSelector,
         };
 
         const waitForSelection = async () =>
-            waitForCondition(async () => {
-                if (token.isCancellationRequested) {
-                    return true;
-                }
-                const selected = this.controllerRegistration.getSelected(notebook);
-                return selected?.id === controller.id;
-            }, 2000, 100);
+            waitForCondition(
+                async () => {
+                    if (token.isCancellationRequested) {
+                        return true;
+                    }
+                    const selected = this.controllerRegistration.getSelected(notebook);
+                    return selected?.id === controller.id;
+                },
+                2000,
+                100
+            );
 
         let success = (await trySelect(1)) ? await waitForSelection() : true;
 
@@ -699,9 +697,7 @@ export class DeepnoteKernelAutoSelector implements IDeepnoteKernelAutoSelector,
         }
 
         if (success) {
-            logger.info(
-                `Confirmed Deepnote controller ${controller.id} selected for ${getDisplayPath(notebook.uri)}`
-            );
+            logger.info(`Confirmed Deepnote controller ${controller.id} selected for ${getDisplayPath(notebook.uri)}`);
         } else if (!token.isCancellationRequested) {
             logger.error(
                 `Failed to confirm Deepnote controller selection for ${getDisplayPath(notebook.uri)} after retry`

src/notebooks/deepnote/deepnoteKernelAutoSelector.node.unit.test.ts

@@ -780,7 +780,6 @@ suite('DeepnoteKernelAutoSelector - rebuildController', () => {
             // REAL TEST: This will FAIL if disposal happens too early
             //
             // Setup: Create a scenario where we have an old controller and create a new one
-            const baseFileUri = mockNotebook.uri.with({ query: '', fragment: '' });
             // const notebookKey = baseFileUri.fsPath;
             const newEnv = createMockEnvironment('env-new', 'New Environment', true);
 

src/platform/deepnote/deepnoteUriUtils.node.ts

@@ -0,0 +1,31 @@
+import { createHash } from 'crypto';
+import { Uri } from 'vscode';
+
+import { getDeepnoteNotebookStorageKey, getDeepnoteProjectStorageKey } from './deepnoteUriUtils';
+
+/**
+ * Legacy key that only relied on the file system path (used prior to multi-notebook support).
+ * Retained for backwards compatibility with persisted workspace state.
+ */
+export function getLegacyDeepnoteNotebookStorageKey(uri: Uri): string {
+    const normalized = uri.with({ query: '', fragment: '' });
+    return normalized.fsPath;
+}
+
+/**
+ * Generates a short hash for a Deepnote notebook URI that can be safely embedded in identifiers.
+ */
+export function getDeepnoteNotebookKeyHash(uri: Uri, length = 16): string {
+    const key = getDeepnoteNotebookStorageKey(uri);
+    return createHash('sha256').update(key).digest('hex').slice(0, length);
+}
+
+/**
+ * Generates a hash for a Deepnote project key that can be embedded safely in identifiers.
+ */
+export function getDeepnoteProjectKeyHash(uri: Uri, projectId?: string | null, length = 24): string {
+    const key = getDeepnoteProjectStorageKey(uri, projectId);
+    return createHash('sha256').update(key).digest('hex').slice(0, length);
+}
+
+export { getDeepnoteNotebookStorageKey, getDeepnoteProjectStorageKey } from './deepnoteUriUtils';

src/platform/deepnote/deepnoteUriUtils.ts

@@ -1,4 +1,3 @@
-import { createHash } from 'crypto';
 import { Uri } from 'vscode';
 
 /**
@@ -11,23 +10,6 @@ export function getDeepnoteNotebookStorageKey(uri: Uri): string {
     return normalized.toString();
 }
 
-/**
- * Legacy key that only relied on the file system path (used prior to multi-notebook support).
- * Retained for backwards compatibility with persisted workspace state.
- */
-export function getLegacyDeepnoteNotebookStorageKey(uri: Uri): string {
-    const normalized = uri.with({ query: '', fragment: '' });
-    return normalized.fsPath;
-}
-
-/**
- * Generates a short hash for a Deepnote notebook URI that can be safely embedded in identifiers.
- */
-export function getDeepnoteNotebookKeyHash(uri: Uri, length = 16): string {
-    const key = getDeepnoteNotebookStorageKey(uri);
-    return createHash('sha256').update(key).digest('hex').slice(0, length);
-}
-
 /**
  * Returns a stable key for all notebooks within a Deepnote project.
  * Falls back to a hashed notebook path if a project identifier is unavailable.
@@ -39,12 +21,3 @@ export function getDeepnoteProjectStorageKey(uri: Uri, projectId?: string | null
 
     return `notebook:${getDeepnoteNotebookStorageKey(uri)}`;
 }
-
-/**
- * Generates a hash for a Deepnote project key that can be embedded safely in identifiers.
- */
-export function getDeepnoteProjectKeyHash(uri: Uri, projectId?: string | null, length = 24): string {
-    const key = getDeepnoteProjectStorageKey(uri, projectId);
-    return createHash('sha256').update(key).digest('hex').slice(0, length);
-}
-