Set context keys for cell language when background is painted

Author: juliasilge

apps/vscode/src/providers/background.ts

@@ -22,6 +22,7 @@ import { isQuartoDoc, kQuartoDocSelector } from "../core/doc";
 import { MarkdownEngine } from "../markdown/engine";
 import { isExecutableLanguageBlock } from "quarto-core";
 import { vscRange } from "../core/range";
+import { mainLanguage } from "../vdoc/vdoc";
 
 export function activateBackgroundHighlighter(
   context: vscode.ExtensionContext,
@@ -162,6 +163,10 @@ async function setEditorHighlightDecorations(
       blockRanges.push(vscRange(block.range));
     }
 
+    // expose cell language for use in keybindings, etc
+    const language = mainLanguage(tokens);
+    vscode.commands.executeCommand('setContext', 'quartoLangId', language?.ids[0]);
+
     // find inline executable code
     for (let i = 0; i < editor.document.lineCount; i++) {
       const line = editor.document.lineAt(i);

apps/vscode/src/vdoc/vdoc.ts

@@ -13,7 +13,7 @@
  *
  */
 
-import { Position, TextDocument, Uri, Range, commands } from "vscode";
+import { Position, TextDocument, Uri, Range } from "vscode";
 import { Token, isExecutableLanguageBlock, languageBlockAtPosition, languageNameFromBlock } from "quarto-core";
 
 import { isQuartoDoc } from "../core/doc";
@@ -157,12 +157,8 @@ export async function virtualDocUri(
 export function languageAtPosition(tokens: Token[], position: Position) {
   const block = languageBlockAtPosition(tokens, position);
   if (block) {
-    const language = languageFromBlock(block);
-    // expose cell language for use in keybindings, etc
-    commands.executeCommand('setContext', 'quarto.cellLangId', language?.ids[0]);
-    return language;
+    return languageFromBlock(block);
   } else {
-    commands.executeCommand('setContext', 'quarto.cellLangId', undefined);
     return undefined;
   }
 }