Skip to content

Commit f613d83

Browse files
committed
Fix configuration
1 parent 3a19e48 commit f613d83

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,7 @@
6363
"default": false,
6464
"scope": "application"
6565
},
66-
"gitpod.lsshPort": {
67-
"type": "number",
68-
"description": "The port to use for the local SSH server.",
69-
"scope": "application"
70-
},
71-
"gitpod.lsshIpcPort": {
66+
"gitpod.lsshExtensionIpcPort": {
7267
"type": "number",
7368
"description": "The port to use for the local SSH ipc server.",
7469
"scope": "application"

src/common/telemetry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export async function commonSendEventData(logService: ILogService, segmentClient
8787
logService.error('Failed to log event to app analytics:', err);
8888
}
8989
resolve();
90-
}))
90+
}));
9191
}
9292

9393
interface SendErrorDataOptions {

src/configuration.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ import * as vscode from 'vscode';
1010
// are not available yet and will return `undefined` so we hardcode the defaults here
1111

1212
function getGitpodHost() {
13-
return vscode.workspace.getConfiguration('gitpod').get<string>('host', 'https://gitpod.io/');
13+
return vscode.workspace.getConfiguration('gitpod').get<string>('host') || 'https://gitpod.io/';
1414
}
1515

1616
function getUseLocalApp() {
17-
return vscode.workspace.getConfiguration('gitpod').get<boolean>('remote.useLocalApp', false);
17+
return vscode.workspace.getConfiguration('gitpod').get<boolean>('remote.useLocalApp') || false;
1818
}
1919

2020
function getLocalSshExtensionIpcPort() {
2121
let defaultPort = 43025;
2222
if (vscode.env.appName.includes('Insiders')) {
2323
defaultPort = 43026;
2424
}
25-
return vscode.workspace.getConfiguration('gitpod').get<number>('lsshExtensionIpcPort', defaultPort) || defaultPort;
25+
return vscode.workspace.getConfiguration('gitpod').get<number>('lsshExtensionIpcPort') || defaultPort;
2626
}
2727

2828
export const Configuration = {

src/remoteConnector.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ export class RemoteConnector extends Disposable {
277277
GITPOD_LCA_API_PORT: String(apiPort),
278278
GITPOD_LCA_AUTO_TUNNEL: String(false),
279279
GITPOD_LCA_AUTH_REDIRECT_URL: `${vscode.env.uriScheme}://${this.context.extension.id}${RemoteConnector.AUTH_COMPLETE_PATH}`,
280-
GITPOD_LCA_VERBOSE: String(vscode.workspace.getConfiguration('gitpod').get<boolean>('verbose', false)),
281-
GITPOD_LCA_TIMEOUT: String(vscode.workspace.getConfiguration('gitpod').get<string>('timeout', '3h'))
280+
GITPOD_LCA_VERBOSE: String(false),
281+
GITPOD_LCA_TIMEOUT: '3h'
282282
}
283283
});
284284
localAppProcess.unref();

0 commit comments

Comments
 (0)