💄

Author: jeanp413

src/services/remoteService.ts

@@ -286,7 +286,7 @@ export class RemoteService extends Disposable implements IRemoteService {
 
             const parsedKey = parsedResult as ParsedKey;
             return { name: k.name, fingerprint: crypto.createHash('sha256').update(parsedKey.getPublicSSH()).digest('base64') };
-        })
+        });
         this.logService.trace(`Registered public keys in Gitpod account:`, registeredKeys.length ? registeredKeys.map(k => `${k.name} SHA256:${k.fingerprint}`).join('\n') : 'None');
 
         identityKeys = identityKeys.filter(k => !!registeredKeys.find(regKey => regKey.fingerprint === k.fingerprint));
@@ -328,27 +328,27 @@ export class RemoteService extends Disposable implements IRemoteService {
         let flowData = this.flow ?? { gitpodHost: this.hostService.gitpodHost, userId: this.sessionService.safeGetUserId() };
         flowData = { ...flowData, flow: 'sync_local_extensions', useLocalAPP: String(Configuration.getUseLocalApp()) };
 
-        let extensionsJson: IStoredProfileExtension[] = [];
-        const extensionsDir = path.posix.dirname(this.context.extensionMode === vscode.ExtensionMode.Production ? this.context.extensionPath : vscode.extensions.getExtension('ms-vscode-remote.remote-ssh')!.extensionPath);
-        const extensionFile = path.join(extensionsDir, 'extensions.json');
         try {
-            const rawContent = await vscode.workspace.fs.readFile(vscode.Uri.file(extensionFile));
-            const jsonSting = new TextDecoder().decode(rawContent);
-            extensionsJson = JSON.parse(jsonSting);
-        } catch (e) {
-            this.logService.error(`Could not read ${extensionFile} file contents`, e);
-            return;
-        }
+            let extensionsJson: IStoredProfileExtension[] = [];
+            const extensionsDir = path.posix.dirname(this.context.extensionMode === vscode.ExtensionMode.Production ? this.context.extensionPath : vscode.extensions.getExtension('ms-vscode-remote.remote-ssh')!.extensionPath);
+            const extensionFile = path.join(extensionsDir, 'extensions.json');
+            try {
+                const rawContent = await vscode.workspace.fs.readFile(vscode.Uri.file(extensionFile));
+                const jsonSting = new TextDecoder().decode(rawContent);
+                extensionsJson = JSON.parse(jsonSting);
+            } catch (e) {
+                this.logService.error(`Could not read ${extensionFile} file contents`, e);
+                throw e;
+            }
 
-        const localExtensions = extensionsJson.filter(e => !e.metadata?.isBuiltin && !e.metadata?.isSystem).map(e => ({ identifier: { id: e.identifier.id.toLowerCase() } }));
+            const localExtensions = extensionsJson.filter(e => !e.metadata?.isBuiltin && !e.metadata?.isSystem).map(e => ({ identifier: { id: e.identifier.id.toLowerCase() } }));
 
-        const allUserActiveExtensions = vscode.extensions.all.filter(ext => !ext.packageJSON['isBuiltin'] && !ext.packageJSON['isUserBuiltin']);
-        const localActiveExtensions = new Set<string>();
-        allUserActiveExtensions.forEach(e => localActiveExtensions.add(e.id.toLowerCase()));
+            const allUserActiveExtensions = vscode.extensions.all.filter(ext => !ext.packageJSON['isBuiltin'] && !ext.packageJSON['isUserBuiltin']);
+            const localActiveExtensions = new Set<string>();
+            allUserActiveExtensions.forEach(e => localActiveExtensions.add(e.id.toLowerCase()));
 
-        const extensionsToInstall = localExtensions.filter(e => !localActiveExtensions.has(e.identifier.id));
+            const extensionsToInstall = localExtensions.filter(e => !localActiveExtensions.has(e.identifier.id));
 
-        try {
             try {
                 this.logService.trace(`Installing local extensions on remote: `, extensionsToInstall.map(e => e.identifier.id).join('\n'));
                 await retry(async () => {