rebase fixes

Signed-off-by: Jonah Iden <jonah.iden@typefox.io>
eclipse-theia · Mar 15, 2024 · c98a4e2 · c98a4e2
1 parent ac8b157
commit c98a4e2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/packages/dev-container/src/electron-browser/container-connection-contribution.ts b/packages/dev-container/src/electron-browser/container-connection-contribution.ts
@@ -21,8 +21,6 @@ import { RemotePreferences } from '@theia/remote/lib/electron-browser/remote-pre
 import { WorkspaceStorageService } from '@theia/workspace/lib/browser/workspace-storage-service';
 import { Command, QuickInputService } from '@theia/core';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { RemoteContainerConnectionProvider } from '../electron-common/remote-container-connection-provider';
-import { RemotePreferences } from '@theia/remote/lib/electron-browser/remote-preferences';
 
 export namespace RemoteContainerCommands {
     export const REOPEN_IN_CONTAINER = Command.toLocalizedCommand({

diff --git a/packages/dev-container/src/electron-node/docker-container-service.ts b/packages/dev-container/src/electron-node/docker-container-service.ts
@@ -17,7 +17,6 @@
 import { ContributionProvider, URI } from '@theia/core';
 import { inject, injectable, named } from '@theia/core/shared/inversify';
 import { WorkspaceServer } from '@theia/workspace/lib/common';
-import { parse } from 'jsonc-parser';
 import * as fs from '@theia/core/shared/fs-extra';
 import * as Docker from 'dockerode';
 import { LastContainerInfo } from '../electron-common/remote-container-connection-provider';

diff --git a/packages/dev-container/src/electron-node/remote-container-connection-provider.ts b/packages/dev-container/src/electron-node/remote-container-connection-provider.ts
@@ -111,7 +111,7 @@ export class DevContainerConnectionProvider implements RemoteContainerConnection
         return this.devContainerFileService.getAvailableFiles();
     }
 
-    async createContainerConnection(container: Docker.Container, docker: Docker, port: number): Promise<RemoteDockerContainerConnection> {
+    async createContainerConnection(container: Docker.Container, docker: Docker): Promise<RemoteDockerContainerConnection> {
         return Promise.resolve(new RemoteDockerContainerConnection({
             id: generateUuid(),
             name: 'dev-container',
@@ -129,7 +129,6 @@ export interface RemoteContainerConnectionOptions {
     type: string;
     docker: Docker;
     container: Docker.Container;
-    port: number;
 }
 
 interface ContainerTerminalSession {
@@ -174,7 +173,6 @@ export class RemoteDockerContainerConnection implements RemoteConnection {
 
         this.docker = options.docker;
         this.container = options.container;
-        this.remotePort = options.port;
     }
 
     async forwardOut(socket: Socket, port?: number): Promise<void> {