Skip to content

Move liveshare into datascience #9296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kartik Raj (karrtikr) merged 1 commit into from
Dec 30, 2019
Merged

Move liveshare into datascience #9296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client/common/serviceRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT License.
import { IExtensionSingleActivationService } from '../activation/types';
import { IFileDownloader, IHttpClient } from '../common/types';
import { LiveShareApi } from '../datascience/liveshare/liveshare';
import { IServiceManager } from '../ioc/types';
import { ImportTracker } from '../telemetry/importTracker';
import { IImportTracker } from '../telemetry/types';
Expand Down Expand Up @@ -47,7 +48,6 @@ import {
IInsiderExtensionPrompt
} from './insidersBuild/types';
import { ProductInstaller } from './installer/productInstaller';
import { LiveShareApi } from './liveshare/liveshare';
import { Logger } from './logger';
import { BrowserService } from './net/browser';
import { FileDownloader } from './net/fileDownloader';
Expand Down
4 changes: 2 additions & 2 deletions src/client/common/liveshare/liveshare.ts → ...client/datascience/liveshare/liveshare.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import { inject, injectable } from 'inversify';
import * as vsls from 'vsls/vscode';

import { IApplicationShell, ILiveShareApi, IWorkspaceService } from '../application/types';
import { IConfigurationService, IDisposableRegistry } from '../types';
import { IApplicationShell, ILiveShareApi, IWorkspaceService } from '../../common/application/types';
import { IConfigurationService, IDisposableRegistry } from '../../common/types';
import { LiveShareProxy } from './liveshareProxy';

// tslint:disable:no-any unified-signatures
Expand Down
20 changes: 10 additions & 10 deletions ...client/common/liveshare/liveshareProxy.ts → ...t/datascience/liveshare/liveshareProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
import { Disposable, Event, TreeDataProvider, Uri } from 'vscode';
import * as vsls from 'vsls/vscode';

import { LiveShare, LiveShareCommands } from '../../datascience/constants';
import { IApplicationShell } from '../application/types';
import { createDeferred, Deferred } from '../utils/async';
import * as localize from '../utils/localize';
import { IApplicationShell } from '../../common/application/types';
import { createDeferred, Deferred } from '../../common/utils/async';
import * as localize from '../../common/utils/localize';
import { LiveShare, LiveShareCommands } from '../constants';
import { ServiceProxy } from './serviceProxy';

// tslint:disable:no-any unified-signatures
export class LiveShareProxy implements vsls.LiveShare {
private currentRole: vsls.Role = vsls.Role.None;
private guestChecker: vsls.SharedService | vsls.SharedServiceProxy | null = null;
private pendingGuestCheckCount = 0;
private peerCheckPromise : Deferred<boolean> | undefined;
private peerCheckPromise: Deferred<boolean> | undefined;
constructor(
private applicationShell: IApplicationShell,
private peerTimeout: number | undefined,
private realApi : vsls.LiveShare
) {
private realApi: vsls.LiveShare
) {
this.realApi.onDidChangePeers(this.onPeersChanged, this);
this.realApi.onDidChangeSession(this.onSessionChanged, this);
this.onSessionChanged({ session: this.realApi.session }).ignoreErrors();
Expand Down Expand Up @@ -86,7 +86,7 @@ export class LiveShareProxy implements vsls.LiveShare {
return this.realApi.getContacts(emails);
}

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

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

private peersAreOkay() : Promise<boolean> {
private peersAreOkay(): Promise<boolean> {
// If already asking, just use that promise
if (this.peerCheckPromise) {
return this.peerCheckPromise.promise;
Expand Down
0 src/client/common/liveshare/serviceProxy.ts → ...ent/datascience/liveshare/serviceProxy.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/test/common/serviceRegistry.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import { InsidersExtensionPrompt } from '../../client/common/insidersBuild/insid
import { InsidersExtensionService } from '../../client/common/insidersBuild/insidersExtensionService';
import { ExtensionChannel, IExtensionChannelRule, IExtensionChannelService, IInsiderExtensionPrompt } from '../../client/common/insidersBuild/types';
import { ProductInstaller } from '../../client/common/installer/productInstaller';
import { LiveShareApi } from '../../client/common/liveshare/liveshare';
import { Logger } from '../../client/common/logger';
import { BrowserService } from '../../client/common/net/browser';
import { HttpClient } from '../../client/common/net/httpClient';
Expand All @@ -57,6 +56,7 @@ import { IShellDetector, ITerminalActivationCommandProvider, ITerminalActivation
import { IAsyncDisposableRegistry, IBrowserService, IConfigurationService, ICryptoUtils, ICurrentProcess, IEditorUtils, IExperimentsManager, IExtensions, IFeatureDeprecationManager, IHttpClient, IInstaller, ILogger, IPathUtils, IPersistentStateFactory, IRandom } from '../../client/common/types';
import { IMultiStepInputFactory, MultiStepInputFactory } from '../../client/common/utils/multiStepInput';
import { Random } from '../../client/common/utils/random';
import { LiveShareApi } from '../../client/datascience/liveshare/liveshare';
import { IServiceManager } from '../../client/ioc/types';
import { ImportTracker } from '../../client/telemetry/importTracker';
import { IImportTracker } from '../../client/telemetry/types';
Expand Down
2 changes: 1 addition & 1 deletion src/test/datascience/execution.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { WorkspaceService } from '../../client/common/application/workspace';
import { PythonSettings } from '../../client/common/configSettings';
import { ConfigurationService } from '../../client/common/configuration/service';
import { PYTHON_LANGUAGE } from '../../client/common/constants';
import { LiveShareApi } from '../../client/common/liveshare/liveshare';
import { Logger } from '../../client/common/logger';
import { PersistentState, PersistentStateFactory } from '../../client/common/persistentState';
import { FileSystem } from '../../client/common/platform/fileSystem';
Expand Down Expand Up @@ -48,6 +47,7 @@ import { JupyterExecutionFactory } from '../../client/datascience/jupyter/jupyte
import { KernelSelector } from '../../client/datascience/jupyter/kernels/kernelSelector';
import { LiveKernelModel } from '../../client/datascience/jupyter/kernels/types';
import { NotebookStarter } from '../../client/datascience/jupyter/notebookStarter';
import { LiveShareApi } from '../../client/datascience/liveshare/liveshare';
import {
ICell,
IConnection,
Expand Down
2 changes: 1 addition & 1 deletion src/test/datascience/interactive-ipynb/nativeEditor.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import { WorkspaceService } from '../../../client/common/application/workspace';
import { PythonSettings } from '../../../client/common/configSettings';
import { ConfigurationService } from '../../../client/common/configuration/service';
import { CryptoUtils } from '../../../client/common/crypto';
import { LiveShareApi } from '../../../client/common/liveshare/liveshare';
import { IFileSystem } from '../../../client/common/platform/types';
import { IConfigurationService, ICryptoUtils, IExtensionContext } from '../../../client/common/types';
import { createDeferred } from '../../../client/common/utils/async';
Expand All @@ -53,6 +52,7 @@ import { JupyterExecutionFactory } from '../../../client/datascience/jupyter/jup
import { JupyterExporter } from '../../../client/datascience/jupyter/jupyterExporter';
import { JupyterImporter } from '../../../client/datascience/jupyter/jupyterImporter';
import { JupyterVariables } from '../../../client/datascience/jupyter/jupyterVariables';
import { LiveShareApi } from '../../../client/datascience/liveshare/liveshare';
import { ThemeFinder } from '../../../client/datascience/themeFinder';
import {
ICodeCssGenerator,
Expand Down
8 changes: 4 additions & 4 deletions src/test/datascience/mockLiveShare.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import { CancellationToken, CancellationTokenSource, Disposable, Event, EventEmi
import * as vsls from 'vsls/vscode';

import { IApplicationShell, ILiveShareTestingApi } from '../../client/common/application/types';
import { LiveShareProxy } from '../../client/common/liveshare/liveshareProxy';
import { IConfigurationService, IDisposable, IDisposableRegistry } from '../../client/common/types';
import { noop } from '../../client/common/utils/misc';
import { LiveShare } from '../../client/datascience/constants';
import { LiveShareProxy } from '../../client/datascience/liveshare/liveshareProxy';

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

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

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

constructor(
@inject(IDisposableRegistry) private disposables: IDisposableRegistry,
@inject(IApplicationShell) private appShell : IApplicationShell,
@inject(IApplicationShell) private appShell: IApplicationShell,
@inject(IConfigurationService) private config: IConfigurationService
) {
) {
}

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