Skip to content

Commit 1b8a603

Browse files
author
Kartik Raj
authored
Move liveshare into datascience (microsoft#9296)
1 parent ec90eff commit 1b8a603

8 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎src/client/common/serviceRegistry.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the MIT License.
33
import { IExtensionSingleActivationService } from '../activation/types';
44
import { IFileDownloader, IHttpClient } from '../common/types';
5+
import { LiveShareApi } from '../datascience/liveshare/liveshare';
56
import { IServiceManager } from '../ioc/types';
67
import { ImportTracker } from '../telemetry/importTracker';
78
import { IImportTracker } from '../telemetry/types';
@@ -47,7 +48,6 @@ import {
4748
IInsiderExtensionPrompt
4849
} from './insidersBuild/types';
4950
import { ProductInstaller } from './installer/productInstaller';
50-
import { LiveShareApi } from './liveshare/liveshare';
5151
import { Logger } from './logger';
5252
import { BrowserService } from './net/browser';
5353
import { FileDownloader } from './net/fileDownloader';

src/client/common/liveshare/liveshare.ts renamed to src/client/datascience/liveshare/liveshare.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import { inject, injectable } from 'inversify';
55
import * as vsls from 'vsls/vscode';
66

7-
import { IApplicationShell, ILiveShareApi, IWorkspaceService } from '../application/types';
8-
import { IConfigurationService, IDisposableRegistry } from '../types';
7+
import { IApplicationShell, ILiveShareApi, IWorkspaceService } from '../../common/application/types';
8+
import { IConfigurationService, IDisposableRegistry } from '../../common/types';
99
import { LiveShareProxy } from './liveshareProxy';
1010

1111
// tslint:disable:no-any unified-signatures

src/client/common/liveshare/liveshareProxy.ts renamed to src/client/datascience/liveshare/liveshareProxy.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
import { Disposable, Event, TreeDataProvider, Uri } from 'vscode';
55
import * as vsls from 'vsls/vscode';
66

7-
import { LiveShare, LiveShareCommands } from '../../datascience/constants';
8-
import { IApplicationShell } from '../application/types';
9-
import { createDeferred, Deferred } from '../utils/async';
10-
import * as localize from '../utils/localize';
7+
import { IApplicationShell } from '../../common/application/types';
8+
import { createDeferred, Deferred } from '../../common/utils/async';
9+
import * as localize from '../../common/utils/localize';
10+
import { LiveShare, LiveShareCommands } from '../constants';
1111
import { ServiceProxy } from './serviceProxy';
1212

1313
// tslint:disable:no-any unified-signatures
1414
export class LiveShareProxy implements vsls.LiveShare {
1515
private currentRole: vsls.Role = vsls.Role.None;
1616
private guestChecker: vsls.SharedService | vsls.SharedServiceProxy | null = null;
1717
private pendingGuestCheckCount = 0;
18-
private peerCheckPromise : Deferred<boolean> | undefined;
18+
private peerCheckPromise: Deferred<boolean> | undefined;
1919
constructor(
2020
private applicationShell: IApplicationShell,
2121
private peerTimeout: number | undefined,
22-
private realApi : vsls.LiveShare
23-
) {
22+
private realApi: vsls.LiveShare
23+
) {
2424
this.realApi.onDidChangePeers(this.onPeersChanged, this);
2525
this.realApi.onDidChangeSession(this.onSessionChanged, this);
2626
this.onSessionChanged({ session: this.realApi.session }).ignoreErrors();
@@ -86,7 +86,7 @@ export class LiveShareProxy implements vsls.LiveShare {
8686
return this.realApi.getContacts(emails);
8787
}
8888

89-
private async onSessionChanged(ev: vsls.SessionChangeEvent) : Promise<void> {
89+
private async onSessionChanged(ev: vsls.SessionChangeEvent): Promise<void> {
9090
const newRole = ev.session ? ev.session.role : vsls.Role.None;
9191
if (this.currentRole !== newRole) {
9292
// Setup our guest checker service.
@@ -102,7 +102,7 @@ export class LiveShareProxy implements vsls.LiveShare {
102102
this.guestChecker.onNotify(LiveShareCommands.guestCheck, (_args: object) => this.onGuestResponse());
103103
}
104104

105-
// If guest, we need to list for requests.
105+
// If guest, we need to list for requests.
106106
} else if (this.currentRole === vsls.Role.Guest) {
107107
this.guestChecker = await this.realApi.getSharedService(LiveShare.GuestCheckerService);
108108
if (this.guestChecker) {
@@ -120,7 +120,7 @@ export class LiveShareProxy implements vsls.LiveShare {
120120
}
121121
}
122122

123-
private peersAreOkay() : Promise<boolean> {
123+
private peersAreOkay(): Promise<boolean> {
124124
// If already asking, just use that promise
125125
if (this.peerCheckPromise) {
126126
return this.peerCheckPromise.promise;

src/client/common/liveshare/serviceProxy.ts renamed to src/client/datascience/liveshare/serviceProxy.ts

File renamed without changes.

‎src/test/common/serviceRegistry.unit.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import { InsidersExtensionPrompt } from '../../client/common/insidersBuild/insid
3030
import { InsidersExtensionService } from '../../client/common/insidersBuild/insidersExtensionService';
3131
import { ExtensionChannel, IExtensionChannelRule, IExtensionChannelService, IInsiderExtensionPrompt } from '../../client/common/insidersBuild/types';
3232
import { ProductInstaller } from '../../client/common/installer/productInstaller';
33-
import { LiveShareApi } from '../../client/common/liveshare/liveshare';
3433
import { Logger } from '../../client/common/logger';
3534
import { BrowserService } from '../../client/common/net/browser';
3635
import { HttpClient } from '../../client/common/net/httpClient';
@@ -57,6 +56,7 @@ import { IShellDetector, ITerminalActivationCommandProvider, ITerminalActivation
5756
import { IAsyncDisposableRegistry, IBrowserService, IConfigurationService, ICryptoUtils, ICurrentProcess, IEditorUtils, IExperimentsManager, IExtensions, IFeatureDeprecationManager, IHttpClient, IInstaller, ILogger, IPathUtils, IPersistentStateFactory, IRandom } from '../../client/common/types';
5857
import { IMultiStepInputFactory, MultiStepInputFactory } from '../../client/common/utils/multiStepInput';
5958
import { Random } from '../../client/common/utils/random';
59+
import { LiveShareApi } from '../../client/datascience/liveshare/liveshare';
6060
import { IServiceManager } from '../../client/ioc/types';
6161
import { ImportTracker } from '../../client/telemetry/importTracker';
6262
import { IImportTracker } from '../../client/telemetry/types';

‎src/test/datascience/execution.unit.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { WorkspaceService } from '../../client/common/application/workspace';
2020
import { PythonSettings } from '../../client/common/configSettings';
2121
import { ConfigurationService } from '../../client/common/configuration/service';
2222
import { PYTHON_LANGUAGE } from '../../client/common/constants';
23-
import { LiveShareApi } from '../../client/common/liveshare/liveshare';
2423
import { Logger } from '../../client/common/logger';
2524
import { PersistentState, PersistentStateFactory } from '../../client/common/persistentState';
2625
import { FileSystem } from '../../client/common/platform/fileSystem';
@@ -48,6 +47,7 @@ import { JupyterExecutionFactory } from '../../client/datascience/jupyter/jupyte
4847
import { KernelSelector } from '../../client/datascience/jupyter/kernels/kernelSelector';
4948
import { LiveKernelModel } from '../../client/datascience/jupyter/kernels/types';
5049
import { NotebookStarter } from '../../client/datascience/jupyter/notebookStarter';
50+
import { LiveShareApi } from '../../client/datascience/liveshare/liveshare';
5151
import {
5252
ICell,
5353
IConnection,

‎src/test/datascience/interactive-ipynb/nativeEditor.unit.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import { WorkspaceService } from '../../../client/common/application/workspace';
3636
import { PythonSettings } from '../../../client/common/configSettings';
3737
import { ConfigurationService } from '../../../client/common/configuration/service';
3838
import { CryptoUtils } from '../../../client/common/crypto';
39-
import { LiveShareApi } from '../../../client/common/liveshare/liveshare';
4039
import { IFileSystem } from '../../../client/common/platform/types';
4140
import { IConfigurationService, ICryptoUtils, IExtensionContext } from '../../../client/common/types';
4241
import { createDeferred } from '../../../client/common/utils/async';
@@ -53,6 +52,7 @@ import { JupyterExecutionFactory } from '../../../client/datascience/jupyter/jup
5352
import { JupyterExporter } from '../../../client/datascience/jupyter/jupyterExporter';
5453
import { JupyterImporter } from '../../../client/datascience/jupyter/jupyterImporter';
5554
import { JupyterVariables } from '../../../client/datascience/jupyter/jupyterVariables';
55+
import { LiveShareApi } from '../../../client/datascience/liveshare/liveshare';
5656
import { ThemeFinder } from '../../../client/datascience/themeFinder';
5757
import {
5858
ICodeCssGenerator,

‎src/test/datascience/mockLiveShare.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import { CancellationToken, CancellationTokenSource, Disposable, Event, EventEmi
77
import * as vsls from 'vsls/vscode';
88

99
import { IApplicationShell, ILiveShareTestingApi } from '../../client/common/application/types';
10-
import { LiveShareProxy } from '../../client/common/liveshare/liveshareProxy';
1110
import { IConfigurationService, IDisposable, IDisposableRegistry } from '../../client/common/types';
1211
import { noop } from '../../client/common/utils/misc';
1312
import { LiveShare } from '../../client/datascience/constants';
13+
import { LiveShareProxy } from '../../client/datascience/liveshare/liveshareProxy';
1414

1515
// tslint:disable:no-any unified-signatures max-classes-per-file
1616

@@ -355,7 +355,7 @@ class MockLiveShare implements vsls.LiveShare, vsls.Session, vsls.Peer, IDisposa
355355
return Promise.resolve({ dispose: noop });
356356
}
357357

358-
private generateServicePair() : MockLiveService[] {
358+
private generateServicePair(): MockLiveService[] {
359359
const hostService = new MockLiveService();
360360
const guestService = new MockLiveService();
361361
hostService.setSibling(guestService);
@@ -375,9 +375,9 @@ export class MockLiveShareApi implements ILiveShareTestingApi {
375375

376376
constructor(
377377
@inject(IDisposableRegistry) private disposables: IDisposableRegistry,
378-
@inject(IApplicationShell) private appShell : IApplicationShell,
378+
@inject(IApplicationShell) private appShell: IApplicationShell,
379379
@inject(IConfigurationService) private config: IConfigurationService
380-
) {
380+
) {
381381
}
382382

383383
public getApi(): Promise<vsls.LiveShare | null> {

0 commit comments

Comments
 (0)