Fix configuration

gitpod-io · Sep 8, 2023 · f613d83 · f613d83
1 parent 3a19e48
commit f613d83
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git 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
@@ -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
@@ -10,19 +10,19 @@ 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<string>('host', 'https://gitpod.io/');
+    return vscode.workspace.getConfiguration('gitpod').get<string>('host') || 'https://gitpod.io/';
 }
 
 function getUseLocalApp() {
-    return vscode.workspace.getConfiguration('gitpod').get<boolean>('remote.useLocalApp', false);
+    return vscode.workspace.getConfiguration('gitpod').get<boolean>('remote.useLocalApp') || false;
 }
 
 function getLocalSshExtensionIpcPort() {
     let defaultPort = 43025;
     if (vscode.env.appName.includes('Insiders')) {
         defaultPort = 43026;
     }
-    return vscode.workspace.getConfiguration('gitpod').get<number>('lsshExtensionIpcPort', defaultPort) || defaultPort;
+    return vscode.workspace.getConfiguration('gitpod').get<number>('lsshExtensionIpcPort') || defaultPort;
 }
 
 export const Configuration = {

diff --git 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<boolean>('verbose', false)),
-					GITPOD_LCA_TIMEOUT: String(vscode.workspace.getConfiguration('gitpod').get<string>('timeout', '3h'))
+					GITPOD_LCA_VERBOSE: String(false),
+					GITPOD_LCA_TIMEOUT: '3h'
 				}
 			});
 			localAppProcess.unref();
-Original file line number
+Diff line change
@@ Expand Up @@
     				logService.error('Failed to log event to app analytics:', err);
     			}
     			resolve();
-    		}))
+    		}));
     }
     interface SendErrorDataOptions {
@@ Expand Down @@