♻️ Refactors removal of text decorations to occur after recoloring

This fixes a bug related to flickering when clicking a previously-colored text editor window.

#2

src/colorize.ts

@@ -26,8 +26,8 @@ import {
   rangesByName,
 } from './rangesByName'
 import {
-  removePreviousTextEditorDecorations,
-} from './removePreviousTextEditorDecorations'
+  removeTextEditorDecorations,
+} from './removeTextEditorDecorations'
 import {
   getScopeName,
 } from './textMateGrammars'
@@ -403,8 +403,11 @@ export const colorize = async (
     ]))
   )
 
-  removePreviousTextEditorDecorations(
-    editor
+  const previousTextEditorDecorations = (
+    textEditorDecorationMap
+    .get(
+      editor
+    )
   )
 
   const textEditorDecorations = (
@@ -452,4 +455,13 @@ export const colorize = async (
       ranges,
     )
   })
+
+  removeTextEditorDecorations(
+    previousTextEditorDecorations
+    || (
+      new Set<
+        TextEditorDecorationType
+      >()
+    )
+  )
 }

src/removeAllTextEditorDecorations.ts

@@ -1,19 +1,27 @@
 import {
   textEditorDecorationMap,
 } from './cache'
-import { removePreviousTextEditorDecorations } from './removePreviousTextEditorDecorations'
+import {
+  removeTextEditorDecorations,
+} from './removeTextEditorDecorations'
 
 export const removeAllTextEditorDecorations = () => {
   Array
   .from(
     textEditorDecorationMap
-    .keys()
+    .entries()
   )
-  .forEach((
-    editor,
-  ) => {
-    removePreviousTextEditorDecorations(
-      editor
+  .forEach(([
+    textEditor,
+    textEditorDecorations,
+  ]) => {
+    removeTextEditorDecorations(
+      textEditorDecorations
+    )
+
+    textEditorDecorationMap
+    .delete(
+      textEditor
     )
   })
 }

src/removeTextEditorDecorations.ts

@@ -0,0 +1,22 @@
+import {
+  TextEditorDecorationType,
+} from 'vscode'
+
+export const removeTextEditorDecorations = (
+  textEditorDecorations: (
+    Set<
+      TextEditorDecorationType
+    >
+  ),
+) => {
+  Array
+  .from(
+    textEditorDecorations
+  )
+  .forEach((
+    textEditorDecoration,
+  ) => {
+    textEditorDecoration
+    .dispose()
+  })
+}