More comments flags

Author: CompuIves

packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts

@@ -7,6 +7,7 @@ import {
 } from '@codesandbox/common/lib/types';
 import { getTextOperation } from '@codesandbox/common/lib/utils/diff';
 import { hasPermission } from '@codesandbox/common/lib/utils/permission';
+import { COMMENTS } from '@codesandbox/common/lib/utils/feature-flags';
 import { indexToLineAndColumn } from 'app/overmind/utils/common';
 import { actions, dispatch } from 'codesandbox-api';
 import { css } from 'glamor';
@@ -161,16 +162,18 @@ export class ModelsHandler {
 
     const model = await moduleModel.model;
 
-    const newDecorationComments = this.createCommentDecorations(
-      moduleModel.comments,
-      model,
-      this.currentCommentThreadId,
-      moduleModel.currentLine
-    );
-    moduleModel.currentCommentDecorations = model.deltaDecorations(
-      moduleModel.currentCommentDecorations,
-      newDecorationComments
-    );
+    if (COMMENTS) {
+      const newDecorationComments = this.createCommentDecorations(
+        moduleModel.comments,
+        model,
+        this.currentCommentThreadId,
+        moduleModel.currentLine
+      );
+      moduleModel.currentCommentDecorations = model.deltaDecorations(
+        moduleModel.currentCommentDecorations,
+        newDecorationComments
+      );
+    }
 
     return moduleModel.model;
   };

packages/app/src/app/overmind/effects/vscode/index.ts

@@ -146,18 +146,21 @@ export class VSCodeEffect {
     this.onSelectionChangeDebounced = debounce(options.onSelectionChanged, 500);
 
     this.prepareElements();
-    this.options.reaction(
-      state => ({
-        fileComments: json(state.comments.fileComments),
-        currentCommentId: state.comments.currentCommentId,
-      }),
-      ({ fileComments, currentCommentId }) => {
-        if (this.modelsHandler) {
-          this.modelsHandler.applyComments(fileComments, currentCommentId);
+
+    if (COMMENTS) {
+      this.options.reaction(
+        state => ({
+          fileComments: json(state.comments.fileComments),
+          currentCommentId: state.comments.currentCommentId,
+        }),
+        ({ fileComments, currentCommentId }) => {
+          if (this.modelsHandler) {
+            this.modelsHandler.applyComments(fileComments, currentCommentId);
+          }
         }
-      }
-    );
-    this.listenToCommentClick();
+      );
+      this.listenToCommentClick();
+    }
 
     // We instantly create a sandbox sync, as we want our
     // extension host to get its messages handled to initialize