diff --git a/package.json b/package.json index 3565520e..cc88e612 100644 --- a/package.json +++ b/package.json @@ -63,12 +63,7 @@ "default": false, "scope": "application" }, - "gitpod.lsshPort": { - "type": "number", - "description": "The port to use for the local SSH server.", - "scope": "application" - }, - "gitpod.lsshIpcPort": { + "gitpod.lsshExtensionIpcPort": { "type": "number", "description": "The port to use for the local SSH ipc server.", "scope": "application" diff --git a/src/common/telemetry.ts b/src/common/telemetry.ts index 7fbe6288..7a73e78e 100644 --- a/src/common/telemetry.ts +++ b/src/common/telemetry.ts @@ -87,7 +87,7 @@ export async function commonSendEventData(logService: ILogService, segmentClient logService.error('Failed to log event to app analytics:', err); } resolve(); - })) + })); } interface SendErrorDataOptions { diff --git a/src/configuration.ts b/src/configuration.ts index bf826318..3fa0b905 100644 --- a/src/configuration.ts +++ b/src/configuration.ts @@ -10,11 +10,11 @@ import * as vscode from 'vscode'; // are not available yet and will return `undefined` so we hardcode the defaults here function getGitpodHost() { - return vscode.workspace.getConfiguration('gitpod').get('host', 'https://gitpod.io/'); + return vscode.workspace.getConfiguration('gitpod').get('host') || 'https://gitpod.io/'; } function getUseLocalApp() { - return vscode.workspace.getConfiguration('gitpod').get('remote.useLocalApp', false); + return vscode.workspace.getConfiguration('gitpod').get('remote.useLocalApp') || false; } function getLocalSshExtensionIpcPort() { @@ -22,7 +22,7 @@ function getLocalSshExtensionIpcPort() { if (vscode.env.appName.includes('Insiders')) { defaultPort = 43026; } - return vscode.workspace.getConfiguration('gitpod').get('lsshExtensionIpcPort', defaultPort) || defaultPort; + return vscode.workspace.getConfiguration('gitpod').get('lsshExtensionIpcPort') || defaultPort; } export const Configuration = { diff --git a/src/remoteConnector.ts b/src/remoteConnector.ts index a3cfb3cc..908c70c5 100644 --- a/src/remoteConnector.ts +++ b/src/remoteConnector.ts @@ -277,8 +277,8 @@ export class RemoteConnector extends Disposable { GITPOD_LCA_API_PORT: String(apiPort), GITPOD_LCA_AUTO_TUNNEL: String(false), GITPOD_LCA_AUTH_REDIRECT_URL: `${vscode.env.uriScheme}://${this.context.extension.id}${RemoteConnector.AUTH_COMPLETE_PATH}`, - GITPOD_LCA_VERBOSE: String(vscode.workspace.getConfiguration('gitpod').get('verbose', false)), - GITPOD_LCA_TIMEOUT: String(vscode.workspace.getConfiguration('gitpod').get('timeout', '3h')) + GITPOD_LCA_VERBOSE: String(false), + GITPOD_LCA_TIMEOUT: '3h' } }); localAppProcess.unref();