Merge pull request #279 from onflow/amit/bug-fixes

Amit/bug fixes

Author: Guy Pavlov

src/components/CadenceEditor/index.tsx

@@ -144,7 +144,7 @@ const CadenceEditor = (props: any) => {
     if (editor) {
       setupEditor();
     }
-  }, [editor, project.active.index, project.active.type]);
+  }, [editor, project.active.index, project.active.type, project.project.accounts]);
 
   // "initEditor" will create new instance of Monaco Editor and set it up
   const initEditor = async () => {

src/hooks/useLanguageServer.ts

@@ -1,10 +1,9 @@
-import { useEffect, useState, useMemo } from 'react';
+import { useEffect, useState } from 'react';
 import { CadenceLanguageServer, Callbacks } from 'util/language-server';
 import { MonacoServices } from 'monaco-languageclient/lib/monaco-services';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 import { createCadenceLanguageClient } from 'util/language-client';
 import { useProject } from 'providers/Project/projectHooks';
-import debounce from "util/debounce";
 
 let monacoServicesInstalled = false;
 
@@ -88,21 +87,12 @@ export default function useLanguageServer() {
     });
   };
 
-  const debouncedServerRestart = useMemo(
-      () => debounce(restartServer, 150),
-      [languageServer]
-  )
-
   useEffect(() => {
     if (languageServer) {
       languageServer.updateCodeGetter(getCode);
     }
   }, [project.project.accounts]);
 
-  // TODO: Disable this, once the cadence language server package is updated
-  useEffect(debouncedServerRestart, [project.project.accounts, project.active]);
-
-
   useEffect(() => {
     // The Monaco Language Client services have to be installed globally, once.
     // An editor must be passed, which is only used for commands.
@@ -117,19 +107,15 @@ export default function useLanguageServer() {
     restartServer();
   }, []);
 
-
-
   useEffect(() => {
     if (!languageClient) {
       launchLanguageClient(callbacks, languageServer, setLanguageClient).then();
     }
   }, [languageServer]);
 
-
-
   return {
     languageClient,
     languageServer,
     restartServer,
   };
-}
+}

src/providers/Project/index.tsx

@@ -1,4 +1,4 @@
-import React, {createContext, useState, useMemo} from 'react';
+import React, {createContext, useState} from 'react';
 import { useApolloClient, useQuery } from '@apollo/react-hooks';
 import { navigate, useLocation, Redirect } from '@reach/router';
 import ProjectMutator from './projectMutator';
@@ -349,10 +349,7 @@ export const ProjectProvider: React.FC<ProjectProviderProps> = ({
     }
   };
 
-  const activeEditor = useMemo(
-      getActiveEditor,
-      [active.type, active.index, project]
-  )
+  const activeEditor = getActiveEditor()
 
   const location = useLocation();
   if (isLoading) return null;