feat: support reactive decorationTypeOrOptions (#21)

kermanx · Feb 23, 2025 · f64ace0 · f64ace0
1 parent 07f02d7
commit f64ace0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/packages/core/src/composables/useActiveEditorDecorations.ts b/packages/core/src/composables/useActiveEditorDecorations.ts
@@ -9,7 +9,7 @@ import { useEditorDecorations } from './useEditorDecorations'
  * @category editor
  */
 export function useActiveEditorDecorations(
-  decorationTypeOrOptions: TextEditorDecorationType | DecorationRenderOptions,
+  decorationTypeOrOptions: MaybeRefOrGetter<TextEditorDecorationType | DecorationRenderOptions>,
   rangesOrOptions: MaybeRefOrGetter<readonly Range[] | readonly DecorationOptions[]>,
 ) {
   const activeEditor = useActiveTextEditor()

diff --git a/packages/core/src/composables/useEditorDecorations.ts b/packages/core/src/composables/useEditorDecorations.ts
@@ -1,7 +1,7 @@
 import type { MaybeRef, MaybeRefOrGetter } from '@reactive-vscode/reactivity'
 import type { DecorationOptions, DecorationRenderOptions, Range, TextEditor, TextEditorDecorationType } from 'vscode'
 import type { Awaitable, Nullable } from '../utils/types'
-import { toValue, watch, watchEffect } from '@reactive-vscode/reactivity'
+import { computed, toValue, watch, watchEffect } from '@reactive-vscode/reactivity'
 import { window } from 'vscode'
 import { useDisposable } from './useDisposable'
 import { useDocumentText } from './useDocumentText'
@@ -22,7 +22,7 @@ export interface UseEditorDecorationsOptions {
  */
 export function useEditorDecorations(
   editor: MaybeRefOrGetter<Nullable<TextEditor>>,
-  decorationTypeOrOptions: TextEditorDecorationType | DecorationRenderOptions,
+  decorationTypeOrOptions: MaybeRefOrGetter<TextEditorDecorationType | DecorationRenderOptions>,
   decorations:
     | MaybeRef<readonly Range[] | readonly DecorationOptions[]>
     | ((editor: TextEditor) => Awaitable<readonly Range[] | readonly DecorationOptions[]>),
@@ -32,17 +32,23 @@ export function useEditorDecorations(
     updateOn = ['effect', 'documentChanged'],
   } = options
 
-  const decorationType = 'key' in decorationTypeOrOptions
-    ? decorationTypeOrOptions
-    : useDisposable(window.createTextEditorDecorationType(decorationTypeOrOptions))
+  const decorationType = computed<TextEditorDecorationType>(
+    (oldDecorationTypeOrOptions) => {
+      oldDecorationTypeOrOptions?.dispose()
+      const decorationTypeOrOptionsValue = toValue(decorationTypeOrOptions)
+      return 'key' in decorationTypeOrOptionsValue
+        ? decorationTypeOrOptionsValue
+        : useDisposable(window.createTextEditorDecorationType(decorationTypeOrOptionsValue))
+    },
+  )
 
   const update = async () => {
     const editorValue = toValue(editor)
     if (!editorValue)
       return
 
     editorValue.setDecorations(
-      decorationType,
+      decorationType.value,
       typeof decorations === 'function'
         ? await decorations(editorValue)
         : toValue(decorations),