fix(labs): source code editor decorations loss when opened multiple v…

…irtual code editors
volarjs · Jun 4, 2023 · 0922639 · 0922639
1 parent df7c50c
commit 0922639
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/packages/labs/src/common/showVirtualFile.ts b/packages/labs/src/common/showVirtualFile.ts
@@ -169,6 +169,15 @@ export async function activate(info: ExportsInfoForLabs) {
  return vscode.Disposable.from(...subscriptions);
 
  function updateDecorations() {
+ for (const [_, sources] of virtualUriToSourceMap) {
+ for (const [sourceUri] of sources) {
+ const sourceEditor = vscode.window.visibleTextEditors.find(editor => editor.document.uri.toString() === sourceUri);
+ if (sourceEditor) {
+ sourceEditor.setDecorations(mappingDecorationType, []);
+ sourceEditor.setDecorations(mappingSelectionDecorationType, []);
+ }
+ }
+ }
  for (const [virtualUri, sources] of virtualUriToSourceMap) {
 
  const virtualEditor = vscode.window.visibleTextEditors.find(editor => editor.document.uri.toString() === virtualUri);
@@ -241,15 +250,6 @@ export async function activate(info: ExportsInfoForLabs) {
  virtualEditor.setDecorations(mappingDecorationType, virtualRanges1);
  virtualEditor.setDecorations(mappingSelectionDecorationType, virtualRanges2);
  }
- else {
- for (const [sourceUri] of sources) {
- const sourceEditor = vscode.window.visibleTextEditors.find(editor => editor.document.uri.toString() === sourceUri);
- if (sourceEditor) {
- sourceEditor.setDecorations(mappingDecorationType, []);
- sourceEditor.setDecorations(mappingSelectionDecorationType, []);
- }
- }
- }
  }
  }
 

diff --git a/packages/labs/src/extension.ts b/packages/labs/src/extension.ts
@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import * as serverView from './views/serversView';
 import * as virtualFilesView from './views/virtualFilesView';
 
-export async function activate(context: vscode.ExtensionContext) {
+export function activate(context: vscode.ExtensionContext) {
  serverView.activate(context);
  virtualFilesView.activate(context);
 }