use sourceWithYaml for code cell location

Author: cscheid

src/core/lib/yaml-intelligence/yaml-intelligence.ts

@@ -789,7 +789,9 @@ async function automationFromGoodParseMarkdown(
   if (kind === "completions") {
     let foundCell = undefined;
     for (const cell of result.cells) {
-      const size = lines(cell.source.value).length;
+      // use sourceWithYaml when it exists (code cells)
+      // but otherwise use cell.source (metadata cells)
+      const size = lines((cell.sourceWithYaml || cell.source).value).length;
       if (size + cell.cellStartLine > position.row) {
         foundCell = cell;
         break;

src/resources/editor/tools/vs-code.mjs

@@ -6996,21 +6996,18 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-var __reExport = (target, module, desc) => {
-  if (module && typeof module === "object" || typeof module === "function") {
-    for (let key of __getOwnPropNames(module))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, { get: () => module[key], enumerable: !(desc = __getOwnPropDesc(module, key)) || desc.enumerable });
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return target;
-};
-var __toModule = (module) => {
-  return __reExport(__markAsModule(__defProp(module != null ? __create(__getProtoOf(module)) : {}, "default", module && module.__esModule && "default" in module ? { get: () => module.default, enumerable: true } : { value: module, enumerable: true })), module);
+  return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 
 // ../../../resources/editor/tools/yaml/tree-sitter-yaml.json
 var require_tree_sitter_yaml = __commonJS({
@@ -18987,8 +18984,8 @@ var noColor = typeof (Deno2 && Deno2.noColor) === "boolean" ? Deno2.noColor : tr
 var enabled = !noColor;
 function code(open, close) {
   return {
-    open: `[${open.join(";")}m`,
-    close: `[${close}m`,
+    open: `\x1B[${open.join(";")}m`,
+    close: `\x1B[${close}m`,
     regexp: new RegExp(`\\x1b\\[${close}m`, "g")
   };
 }
@@ -19198,7 +19195,7 @@ function resolveCaseConventionRegex(keys, conventions) {
     };
   }
   const disallowedNearMisses = [];
-  const foundConventions = new Set();
+  const foundConventions = /* @__PURE__ */ new Set();
   for (const key of keys) {
     const found = detectCaseConvention(key);
     if (found) {
@@ -19431,7 +19428,7 @@ async function getTreeSitter() {
   }
   await Parser.init();
   _parser = new Parser();
-  const treeSitterYamlJson = await Promise.resolve().then(() => __toModule(require_tree_sitter_yaml()));
+  const treeSitterYamlJson = await Promise.resolve().then(() => __toESM(require_tree_sitter_yaml()));
   const YAML = await Parser.Language.load(new Uint8Array(treeSitterYamlJson.data));
   _parser.setLanguage(YAML);
   return _parser;
@@ -20458,7 +20455,7 @@ function fromDecimalCode(c) {
   return -1;
 }
 function simpleEscapeSequence(c) {
-  return c === 48 ? "\0" : c === 97 ? "\x07" : c === 98 ? "\b" : c === 116 ? "	" : c === 9 ? "	" : c === 110 ? "\n" : c === 118 ? "\v" : c === 102 ? "\f" : c === 114 ? "\r" : c === 101 ? "" : c === 32 ? " " : c === 34 ? '"' : c === 47 ? "/" : c === 92 ? "\\" : c === 78 ? "\x85" : c === 95 ? "\xA0" : c === 76 ? "\u2028" : c === 80 ? "\u2029" : "";
+  return c === 48 ? "\0" : c === 97 ? "\x07" : c === 98 ? "\b" : c === 116 ? "	" : c === 9 ? "	" : c === 110 ? "\n" : c === 118 ? "\v" : c === 102 ? "\f" : c === 114 ? "\r" : c === 101 ? "\x1B" : c === 32 ? " " : c === 34 ? '"' : c === 47 ? "/" : c === 92 ? "\\" : c === 78 ? "\x85" : c === 95 ? "\xA0" : c === 76 ? "\u2028" : c === 80 ? "\u2029" : "";
 }
 function charFromCodepoint(c) {
   if (c <= 65535) {
@@ -20468,10 +20465,11 @@ function charFromCodepoint(c) {
 }
 var simpleEscapeCheck = new Array(256);
 var simpleEscapeMap = new Array(256);
-for (var i = 0; i < 256; i++) {
+for (i = 0; i < 256; i++) {
   simpleEscapeCheck[i] = simpleEscapeSequence(i) ? 1 : 0;
   simpleEscapeMap[i] = simpleEscapeSequence(i);
 }
+var i;
 function State$1(input, options) {
   this.input = input;
   this.filename = options["filename"] || null;
@@ -20858,7 +20856,7 @@ function readDoubleQuotedScalar(state, nodeIndent) {
   throwError(state, "unexpected end of the stream within a double quoted scalar");
 }
 function readFlowCollection(state, nodeIndent) {
-  var readNext = true, _line, _lineStart, _pos, _tag = state.tag, _result, _anchor = state.anchor, following, terminator, isPair, isExplicitPair, isMapping, overridableKeys = Object.create(null), keyNode, keyTag, valueNode, ch;
+  var readNext = true, _line, _lineStart, _pos, _tag = state.tag, _result, _anchor = state.anchor, following, terminator, isPair, isExplicitPair, isMapping, overridableKeys = /* @__PURE__ */ Object.create(null), keyNode, keyTag, valueNode, ch;
   ch = state.input.charCodeAt(state.position);
   if (ch === 91) {
     terminator = 93;
@@ -21079,7 +21077,7 @@ function readBlockSequence(state, nodeIndent) {
   return false;
 }
 function readBlockMapping(state, nodeIndent, flowIndent) {
-  var following, allowCompact, _line, _keyLine, _keyLineStart, _keyPos, _tag = state.tag, _anchor = state.anchor, _result = {}, overridableKeys = Object.create(null), keyTag = null, keyNode = null, valueNode = null, atExplicitKey = false, detected = false, ch;
+  var following, allowCompact, _line, _keyLine, _keyLineStart, _keyPos, _tag = state.tag, _anchor = state.anchor, _result = {}, overridableKeys = /* @__PURE__ */ Object.create(null), keyTag = null, keyNode = null, valueNode = null, atExplicitKey = false, detected = false, ch;
   if (state.firstTabInLine !== -1)
     return false;
   if (state.anchor !== null) {
@@ -21430,8 +21428,8 @@ function readDocument(state) {
   var documentStart = state.position, _position, directiveName, directiveArgs, hasDirectives = false, ch;
   state.version = null;
   state.checkLineBreaks = state.legacy;
-  state.tagMap = Object.create(null);
-  state.anchorMap = Object.create(null);
+  state.tagMap = /* @__PURE__ */ Object.create(null);
+  state.anchorMap = /* @__PURE__ */ Object.create(null);
   while ((ch = state.input.charCodeAt(state.position)) !== 0) {
     skipSeparationSpace(state, true, -1);
     ch = state.input.charCodeAt(state.position);
@@ -22438,8 +22436,8 @@ var DataSet = class {
     return this._set2021 || (this._set2021 = new Set(this._raw2021.split(" ")));
   }
 };
-var gcNameSet = new Set(["General_Category", "gc"]);
-var scNameSet = new Set(["Script", "Script_Extensions", "sc", "scx"]);
+var gcNameSet = /* @__PURE__ */ new Set(["General_Category", "gc"]);
+var scNameSet = /* @__PURE__ */ new Set(["Script", "Script_Extensions", "sc", "scx"]);
 var gcValueSets = new DataSet("C Cased_Letter Cc Cf Close_Punctuation Cn Co Combining_Mark Connector_Punctuation Control Cs Currency_Symbol Dash_Punctuation Decimal_Number Enclosing_Mark Final_Punctuation Format Initial_Punctuation L LC Letter Letter_Number Line_Separator Ll Lm Lo Lowercase_Letter Lt Lu M Mark Math_Symbol Mc Me Mn Modifier_Letter Modifier_Symbol N Nd Nl No Nonspacing_Mark Number Open_Punctuation Other Other_Letter Other_Number Other_Punctuation Other_Symbol P Paragraph_Separator Pc Pd Pe Pf Pi Po Private_Use Ps Punctuation S Sc Separator Sk Sm So Space_Separator Spacing_Mark Surrogate Symbol Titlecase_Letter Unassigned Uppercase_Letter Z Zl Zp Zs cntrl digit punct", "", "", "");
 var scValueSets = new DataSet("Adlam Adlm Aghb Ahom Anatolian_Hieroglyphs Arab Arabic Armenian Armi Armn Avestan Avst Bali Balinese Bamu Bamum Bass Bassa_Vah Batak Batk Beng Bengali Bhaiksuki Bhks Bopo Bopomofo Brah Brahmi Brai Braille Bugi Buginese Buhd Buhid Cakm Canadian_Aboriginal Cans Cari Carian Caucasian_Albanian Chakma Cham Cher Cherokee Common Copt Coptic Cprt Cuneiform Cypriot Cyrillic Cyrl Deseret Deva Devanagari Dsrt Dupl Duployan Egyp Egyptian_Hieroglyphs Elba Elbasan Ethi Ethiopic Geor Georgian Glag Glagolitic Gonm Goth Gothic Gran Grantha Greek Grek Gujarati Gujr Gurmukhi Guru Han Hang Hangul Hani Hano Hanunoo Hatr Hatran Hebr Hebrew Hira Hiragana Hluw Hmng Hung Imperial_Aramaic Inherited Inscriptional_Pahlavi Inscriptional_Parthian Ital Java Javanese Kaithi Kali Kana Kannada Katakana Kayah_Li Khar Kharoshthi Khmer Khmr Khoj Khojki Khudawadi Knda Kthi Lana Lao Laoo Latin Latn Lepc Lepcha Limb Limbu Lina Linb Linear_A Linear_B Lisu Lyci Lycian Lydi Lydian Mahajani Mahj Malayalam Mand Mandaic Mani Manichaean Marc Marchen Masaram_Gondi Meetei_Mayek Mend Mende_Kikakui Merc Mero Meroitic_Cursive Meroitic_Hieroglyphs Miao Mlym Modi Mong Mongolian Mro Mroo Mtei Mult Multani Myanmar Mymr Nabataean Narb Nbat New_Tai_Lue Newa Nko Nkoo Nshu Nushu Ogam Ogham Ol_Chiki Olck Old_Hungarian Old_Italic Old_North_Arabian Old_Permic Old_Persian Old_South_Arabian Old_Turkic Oriya Orkh Orya Osage Osge Osma Osmanya Pahawh_Hmong Palm Palmyrene Pau_Cin_Hau Pauc Perm Phag Phags_Pa Phli Phlp Phnx Phoenician Plrd Prti Psalter_Pahlavi Qaac Qaai Rejang Rjng Runic Runr Samaritan Samr Sarb Saur Saurashtra Sgnw Sharada Shavian Shaw Shrd Sidd Siddham SignWriting Sind Sinh Sinhala Sora Sora_Sompeng Soyo Soyombo Sund Sundanese Sylo Syloti_Nagri Syrc Syriac Tagalog Tagb Tagbanwa Tai_Le Tai_Tham Tai_Viet Takr Takri Tale Talu Tamil Taml Tang Tangut Tavt Telu Telugu Tfng Tglg Thaa Thaana Thai Tibetan Tibt Tifinagh Tirh Tirhuta Ugar Ugaritic Vai Vaii Wara Warang_Citi Xpeo Xsux Yi Yiii Zanabazar_Square Zanb Zinh Zyyy", "Dogr Dogra Gong Gunjala_Gondi Hanifi_Rohingya Maka Makasar Medefaidrin Medf Old_Sogdian Rohg Sogd Sogdian Sogo", "Elym Elymaic Hmnp Nand Nandinagari Nyiakeng_Puachue_Hmong Wancho Wcho", "Chorasmian Chrs Diak Dives_Akuru Khitan_Small_Script Kits Yezi Yezidi");
 var binPropertySets = new DataSet("AHex ASCII ASCII_Hex_Digit Alpha Alphabetic Any Assigned Bidi_C Bidi_Control Bidi_M Bidi_Mirrored CI CWCF CWCM CWKCF CWL CWT CWU Case_Ignorable Cased Changes_When_Casefolded Changes_When_Casemapped Changes_When_Lowercased Changes_When_NFKC_Casefolded Changes_When_Titlecased Changes_When_Uppercased DI Dash Default_Ignorable_Code_Point Dep Deprecated Dia Diacritic Emoji Emoji_Component Emoji_Modifier Emoji_Modifier_Base Emoji_Presentation Ext Extender Gr_Base Gr_Ext Grapheme_Base Grapheme_Extend Hex Hex_Digit IDC IDS IDSB IDST IDS_Binary_Operator IDS_Trinary_Operator ID_Continue ID_Start Ideo Ideographic Join_C Join_Control LOE Logical_Order_Exception Lower Lowercase Math NChar Noncharacter_Code_Point Pat_Syn Pat_WS Pattern_Syntax Pattern_White_Space QMark Quotation_Mark RI Radical Regional_Indicator SD STerm Sentence_Terminal Soft_Dotted Term Terminal_Punctuation UIdeo Unified_Ideograph Upper Uppercase VS Variation_Selector White_Space XIDC XIDS XID_Continue XID_Start space", "Extended_Pictographic", "", "EBase EComp EMod EPres ExtPict");
@@ -22701,8 +22699,8 @@ var RegExpValidator = class {
     this._lastValValue = "";
     this._lastAssertionIsQuantifiable = false;
     this._numCapturingParens = 0;
-    this._groupNames = new Set();
-    this._backreferenceNames = new Set();
+    this._groupNames = /* @__PURE__ */ new Set();
+    this._backreferenceNames = /* @__PURE__ */ new Set();
     this._options = options || {};
   }
   validateLiteral(source, start = 0, end = source.length) {
@@ -22723,7 +22721,7 @@ var RegExpValidator = class {
     this.onLiteralLeave(start, end);
   }
   validateFlags(source, start = 0, end = source.length) {
-    const existingFlags = new Set();
+    const existingFlags = /* @__PURE__ */ new Set();
     let global = false;
     let ignoreCase = false;
     let multiline = false;
@@ -25812,7 +25810,7 @@ function validateObject(value, schema2, context) {
     }
     throw new Error(`Internal Error, couldn't locate key ${key}`);
   };
-  const inspectedProps = new Set();
+  const inspectedProps = /* @__PURE__ */ new Set();
   if (schema2.properties !== void 0) {
     result = context.withSchemaPath("properties", () => {
       let result2 = true;
@@ -27918,7 +27916,7 @@ var noCompletions = {
   cacheable: false
 };
 function uniqBy(lst, keyFun) {
-  const itemSet = new Set();
+  const itemSet = /* @__PURE__ */ new Set();
   return lst.filter((item) => {
     const key = keyFun(item);
     if (key === void 0) {
@@ -28001,7 +27999,7 @@ function completions(obj) {
       const key = completion.value.split(":")[0];
       const matchingSubSchemas = navigateSchemaByInstancePath(completion.schema, [key]);
       const canSuggestOnAccept = (ss) => {
-        const matchingTypes = new Set();
+        const matchingTypes = /* @__PURE__ */ new Set();
         walkSchema(ss, (s) => {
           const t = schemaType(s);
           switch (t) {
@@ -28098,7 +28096,7 @@ function completions(obj) {
       return false;
     }
     const enabled2 = formatTags.filter((tag) => !tag.startsWith("!"));
-    const enabledSet = new Set();
+    const enabledSet = /* @__PURE__ */ new Set();
     if (enabled2.length === 0) {
       for (const el of aliases["pandoc-all"]) {
         enabledSet.add(el);
@@ -28155,7 +28153,7 @@ async function automationFromGoodParseMarkdown(kind, context) {
   if (kind === "completions") {
     let foundCell = void 0;
     for (const cell of result.cells) {
-      const size = lines(cell.source.value).length;
+      const size = lines((cell.sourceWithYaml || cell.source).value).length;
       if (size + cell.cellStartLine > position.row) {
         foundCell = cell;
         break;
@@ -28374,7 +28372,7 @@ initialization does not contain language extensions`);
 }
 async function init(context) {
   const ideInit = async () => {
-    const resourceModule = (await Promise.resolve().then(() => __toModule(require_yaml_intelligence_resources()))).default;
+    const resourceModule = (await Promise.resolve().then(() => __toESM(require_yaml_intelligence_resources()))).default;
     await getTreeSitter();
     if (context.client && context.client === "lsp") {
       await initYamlIntelligence({ resourceModule, patchMarkdown: false });