From cc427e967d63523b90ecc1c6aa2c864cb13b4b58 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Thu, 5 May 2022 10:17:20 +0000
Subject: Pass source string via argument

---
 src/console/completion/hooks.ts          | 17 ++++++-----------
 src/console/components/CommandPrompt.tsx |  6 +-----
 2 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/console/completion/hooks.ts b/src/console/completion/hooks.ts
index 3a2ec33..a2e8bde 100644
--- a/src/console/completion/hooks.ts
+++ b/src/console/completion/hooks.ts
@@ -170,16 +170,12 @@ export const getPropertyCompletions = async (
   return [{ name: "Properties", items }];
 };
 
-export const useCompletions = () => {
+export const useCompletions = (source: string) => {
   const state = React.useContext(CompletionStateContext);
   const dispatch = React.useContext(CompletionDispatchContext);
   const commandLineParser = React.useMemo(() => new CommandLineParser(), []);
   const [completionTypes] = useGetCompletionTypes();
 
-  const updateCompletions = React.useCallback((source: string) => {
-    dispatch(actions.setCompletionSource(source));
-  }, []);
-
   const queryCompletions = React.useCallback(
     (text: string, completionTypes: CompletionType[]) => {
       const phase = commandLineParser.inputPhase(text);
@@ -233,16 +229,15 @@ export const useCompletions = () => {
   );
 
   React.useEffect(() => {
+    dispatch(actions.setCompletionSource(source));
+
     if (typeof completionTypes === "undefined") {
       return;
     }
-    queryCompletions(state.completionSource, completionTypes);
-  }, [state.completionSource, completionTypes]);
+    queryCompletions(source, completionTypes);
+  }, [source, completionTypes]);
 
-  return {
-    completions: state.completions,
-    updateCompletions,
-  };
+  return { completions: state.completions };
 };
 
 export const useSelectCompletion = () => {
diff --git a/src/console/components/CommandPrompt.tsx b/src/console/components/CommandPrompt.tsx
index 0312fe4..89acf57 100644
--- a/src/console/components/CommandPrompt.tsx
+++ b/src/console/components/CommandPrompt.tsx
@@ -22,7 +22,7 @@ const CommandPromptInner: React.FC<Props> = ({ initialInputValue }) => {
   const hide = useHide();
   const [inputValue, setInputValue] = React.useState(initialInputValue);
   const debouncedValue = useDebounce(inputValue, 100);
-  const { completions, updateCompletions } = useCompletions();
+  const { completions } = useCompletions(debouncedValue);
   const { select, currentValue, selectNext, selectPrev } =
     useSelectCompletion();
   const execCommand = useExecCommand();
@@ -83,10 +83,6 @@ const CommandPromptInner: React.FC<Props> = ({ initialInputValue }) => {
     setInputValue(text);
   };
 
-  React.useEffect(() => {
-    updateCompletions(debouncedValue);
-  }, [debouncedValue]);
-
   return (
     <ConsoleWrapper>
       <Completion
-- 
cgit v1.2.3