refact: extract existence check of activeEditor

yoshi389111 · Mar 21, 2023 · 2b5cfa8 · 2b5cfa8
1 parent 1eafa5f
commit 2b5cfa8
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -16,15 +16,10 @@ export const activate = (context: vscode.ExtensionContext): void => {
         })
     );
     context.subscriptions.push(...decorationTypes);
-    let activeEditor = vscode.window.activeTextEditor;
 
     const REGEX_LINE = /^([ \t]*>)*[ \t]*\|[^\r\n]*$/mg;
     const REGEX_COLUMN = /\|[^|\r\n]*(?=\|)/g;
-    const updateDecorations = (): void => {
-        const editor = activeEditor;
-        if (!editor) {
-            return;
-        }
+    const updateDecorations = (editor: vscode.TextEditor): void => {
         const options: vscode.DecorationOptions[][] = decorationTypes.map(_ => []);
         Array.from(editor.document.getText().matchAll(REGEX_LINE)).forEach(matchLine => {
             Array.from(matchLine[0].matchAll(REGEX_COLUMN)).forEach((matchColumn, index) => {
@@ -42,16 +37,24 @@ export const activate = (context: vscode.ExtensionContext): void => {
         );
     };
 
+    let activeEditor = vscode.window.activeTextEditor;
+    const updateDecorationsIfPossible = (): void => {
+        const editor = activeEditor;
+        if (editor) {
+            updateDecorations(editor);
+        }
+    };
+
     let timer: NodeJS.Timer | undefined = undefined;
     const triggerUpdateDecorations = (throttle = false): void => {
         if (timer) {
             clearTimeout(timer);
             timer = undefined;
         }
         if (throttle) {
-            timer = setTimeout(updateDecorations, updateDelay);
+            timer = setTimeout(updateDecorationsIfPossible, updateDelay);
         } else {
-            updateDecorations();
+            updateDecorationsIfPossible();
         }
     };
 
@@ -61,9 +64,7 @@ export const activate = (context: vscode.ExtensionContext): void => {
 
     vscode.window.onDidChangeActiveTextEditor(editor => {
         activeEditor = editor;
-        if (editor) {
-            triggerUpdateDecorations();
-        }
+        triggerUpdateDecorations();
     }, null, context.subscriptions);
 
     vscode.workspace.onDidChangeTextDocument(event => {