Address code reviews

Author: Kartik Raj

src/client/activation/common/analysisOptions.ts

@@ -55,9 +55,7 @@ export abstract class LanguageServerAnalysisOptionsBase implements ILanguageServ
     }
 
     protected async getInitializationOptions(): Promise<any> {
-        return {
-            trustedWorkspaceSupport: true,
-        };
+        return undefined;
     }
 }
 

src/client/activation/node/analysisOptions.ts

@@ -14,6 +14,7 @@ export class NodeLanguageServerAnalysisOptions extends LanguageServerAnalysisOpt
     protected async getInitializationOptions() {
         return {
             experimentationSupport: true,
+            trustedWorkspaceSupport: true,
         };
     }
 }

src/client/activation/node/languageServerProxy.ts

@@ -127,15 +127,6 @@ export class NodeLanguageServerProxy implements ILanguageServerProxy {
                 if (e.newState === State.Running) {
                     this.registerHandlers(resource);
                 }
-                this.languageClient!.onReady().then(() => {
-                    this.disposables.push(
-                        this.languageClient!.onRequest('python/isTrustedWorkspace', async () => {
-                            return {
-                                isTrusted: this.workspace.isTrusted,
-                            };
-                        }),
-                    );
-                });
             });
 
             this.disposables.push(
@@ -243,5 +234,13 @@ export class NodeLanguageServerProxy implements ILanguageServerProxy {
                 return { value };
             },
         );
+
+        this.disposables.push(
+            this.languageClient!.onRequest('python/isTrustedWorkspace', async () => {
+                return {
+                    isTrusted: this.workspace.isTrusted,
+                };
+            }),
+        );
     }
 }