Rename

Author: DonJayamanne

src/client/datascience/jupyter/jupyterSessionManager.ts

@@ -86,7 +86,7 @@ export class JupyterSessionManager implements IJupyterSessionManager {
         return session;
     }
 
-    public async getActiveKernelSpecs(): Promise<IJupyterKernelSpec[]> {
+    public async getKernelSpecs(): Promise<IJupyterKernelSpec[]> {
         if (!this.connInfo || !this.sessionManager || !this.contentsManager) {
             throw new Error(localize.DataScience.sessionDisposed());
         }

src/client/datascience/jupyter/kernels/kernelService.ts

@@ -118,7 +118,7 @@ export class KernelService {
             }
 
             // Now enumerate them again
-            const enumerator = sessionManager ? () => sessionManager.getActiveKernelSpecs() : () => this.enumerateSpecs(cancelToken);
+            const enumerator = sessionManager ? () => sessionManager.getKernelSpecs() : () => this.enumerateSpecs(cancelToken);
 
             // Then find our match
             return this.findSpecMatch(enumerator);
@@ -237,7 +237,7 @@ export class KernelService {
         return `${interpreter.displayName || ''}_${await this.fileSystem.getFileHash(interpreter.path)}`.replace(/[^A-Za-z0-9]/g, '');
     }
     private async getKernelSpecs(sessionManager?: IJupyterSessionManager, cancelToken?: CancellationToken): Promise<IJupyterKernelSpec[]> {
-        const enumerator = sessionManager ? sessionManager.getActiveKernelSpecs() : this.enumerateSpecs(cancelToken);
+        const enumerator = sessionManager ? sessionManager.getKernelSpecs() : this.enumerateSpecs(cancelToken);
         if (Cancellation.isCanceled(cancelToken)) {
             return [];
         }

src/client/datascience/jupyter/liveshare/guestJupyterSessionManager.ts

@@ -17,7 +17,7 @@ export class GuestJupyterSessionManager implements IJupyterSessionManager {
         return this.realSessionManager.startNew(kernelSpec, cancelToken);
     }
 
-    public async getActiveKernelSpecs(): Promise<IJupyterKernelSpec[]> {
+    public async getKernelSpecs(): Promise<IJupyterKernelSpec[]> {
         // Don't return any kernel specs in guest mode. They're only needed for the host side
         return Promise.resolve([]);
     }

src/client/datascience/types.ts

@@ -182,7 +182,7 @@ export interface IJupyterSessionManagerFactory {
 
 export interface IJupyterSessionManager extends IAsyncDisposable {
     startNew(kernelSpec: IJupyterKernelSpec | undefined, cancelToken?: CancellationToken): Promise<IJupyterSession>;
-    getActiveKernelSpecs(): Promise<IJupyterKernelSpec[]>;
+    getKernelSpecs(): Promise<IJupyterKernelSpec[]>;
     getConnInfo(): IConnection;
     getRunningKernels(): Promise<IJupyterKernel[]>;
 }

src/test/datascience/jupyter/kernels/kernelService.unit.test.ts

@@ -75,19 +75,19 @@ suite('Data Science - KernelService', () => {
             { dispose: async () => noop(), language: PYTHON_LANGUAGE, name: '1', path: '', display_name: '1', metadata: {} },
             { dispose: async () => noop(), language: PYTHON_LANGUAGE, name: '2', path: '', display_name: '2', metadata: {} }
         ];
-        when(sessionManager.getActiveKernelSpecs()).thenResolve(activeKernelSpecs);
+        when(sessionManager.getKernelSpecs()).thenResolve(activeKernelSpecs);
 
         const matchingKernel = await kernelService.findMatchingKernelSpec({ name: 'A', display_name: 'A' }, instance(sessionManager));
 
         assert.isUndefined(matchingKernel);
-        verify(sessionManager.getActiveKernelSpecs()).once();
+        verify(sessionManager.getKernelSpecs()).once();
     });
     test('Should not return a matching spec from a session for a given interpeter', async () => {
         const activeKernelSpecs: IJupyterKernelSpec[] = [
             { dispose: async () => noop(), language: PYTHON_LANGUAGE, name: '1', path: '', display_name: '1', metadata: {} },
             { dispose: async () => noop(), language: PYTHON_LANGUAGE, name: '2', path: '', display_name: '2', metadata: {} }
         ];
-        when(sessionManager.getActiveKernelSpecs()).thenResolve(activeKernelSpecs);
+        when(sessionManager.getKernelSpecs()).thenResolve(activeKernelSpecs);
         const interpreter: PythonInterpreter = {
             path: 'some Path',
             displayName: 'Hello World',
@@ -99,7 +99,7 @@ suite('Data Science - KernelService', () => {
         const matchingKernel = await kernelService.findMatchingKernelSpec(interpreter, instance(sessionManager));
 
         assert.isUndefined(matchingKernel);
-        verify(sessionManager.getActiveKernelSpecs()).once();
+        verify(sessionManager.getKernelSpecs()).once();
     });
     test('Should not return a matching spec from a jupyter process for a given kernelspec', async () => {
         when(kernelSpecCmd.exec(deepEqual(['list', '--json']), anything())).thenResolve({ stdout: '{}' });
@@ -130,7 +130,7 @@ suite('Data Science - KernelService', () => {
             { dispose: async () => noop(), language: PYTHON_LANGUAGE, name: '1', path: 'Path1', display_name: 'Disp1', metadata: {} },
             { dispose: async () => noop(), language: PYTHON_LANGUAGE, name: '2', path: 'Path2', display_name: 'Disp2', metadata: {} }
         ];
-        when(sessionManager.getActiveKernelSpecs()).thenResolve(activeKernelSpecs);
+        when(sessionManager.getKernelSpecs()).thenResolve(activeKernelSpecs);
 
         const matchingKernel = await kernelService.findMatchingKernelSpec({ name: '2', display_name: 'Disp2' }, instance(sessionManager));
 
@@ -139,15 +139,15 @@ suite('Data Science - KernelService', () => {
         assert.equal(matchingKernel?.name, '2');
         assert.equal(matchingKernel?.path, 'Path2');
         assert.equal(matchingKernel?.language, PYTHON_LANGUAGE);
-        verify(sessionManager.getActiveKernelSpecs()).once();
+        verify(sessionManager.getKernelSpecs()).once();
     });
     test('Should return a matching spec from a session for a given interpreter', async () => {
         const activeKernelSpecs: IJupyterKernelSpec[] = [
             { dispose: async () => noop(), language: PYTHON_LANGUAGE, name: '1', path: 'Path1', display_name: 'Disp1', metadata: {} },
             { dispose: async () => noop(), language: PYTHON_LANGUAGE, name: '2', path: 'Path2', display_name: 'Disp2', metadata: { interpreter: { path: 'myPath2' } } },
             { dispose: async () => noop(), language: PYTHON_LANGUAGE, name: '3', path: 'Path3', display_name: 'Disp3', metadata: { interpreter: { path: 'myPath3' } } }
         ];
-        when(sessionManager.getActiveKernelSpecs()).thenResolve(activeKernelSpecs);
+        when(sessionManager.getKernelSpecs()).thenResolve(activeKernelSpecs);
         when(fs.arePathsSame('myPath2', 'myPath2')).thenReturn(true);
         const interpreter: PythonInterpreter = {
             path: 'myPath2',
@@ -165,7 +165,7 @@ suite('Data Science - KernelService', () => {
         assert.equal(matchingKernel?.path, 'Path2');
         assert.deepEqual(matchingKernel?.metadata, activeKernelSpecs[1].metadata);
         assert.equal(matchingKernel?.language, PYTHON_LANGUAGE);
-        verify(sessionManager.getActiveKernelSpecs()).once();
+        verify(sessionManager.getKernelSpecs()).once();
     });
     test('Should return a matching spec from a jupyter process for a given kernelspec', async () => {
         const kernelSpecs = {

src/test/datascience/mockJupyterManager.ts

@@ -313,7 +313,7 @@ export class MockJupyterManager implements IJupyterSessionManager {
         }
     }
 
-    public getActiveKernelSpecs(): Promise<IJupyterKernelSpec[]> {
+    public getKernelSpecs(): Promise<IJupyterKernelSpec[]> {
         return Promise.resolve([]);
     }