track position kind of completion to control completion suppression more finely.

Author: cscheid

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

@@ -9,6 +9,7 @@ import { Schema } from "../yaml-schema/types.ts";
 import { MappedString } from "../text-types.ts";
 
 export type AutomationKind = "validation" | "completions";
+export type PositionKind = "code-cell" | "metadata";
 
 export interface YamlIntelligenceContext {
   code: string | MappedString;
@@ -30,6 +31,8 @@ export interface YamlIntelligenceContext {
   commentPrefix?: string;
   explicit?: boolean;
   client?: string;
+
+  positionKind?: PositionKind;
 }
 
 export interface LocateFromIndentationContext {

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

@@ -5,7 +5,11 @@
 *
 */
 
-import { AutomationKind, YamlIntelligenceContext } from "./types.ts";
+import {
+  AutomationKind,
+  PositionKind,
+  YamlIntelligenceContext,
+} from "./types.ts";
 
 import { buildTreeSitterAnnotation, locateCursor } from "./annotated-yaml.ts";
 
@@ -83,6 +87,7 @@ interface CompletionContext {
   commentPrefix: string;
   context: IDEContext;
   completionPosition?: "key" | "value";
+  positionKind: PositionKind;
 }
 
 interface ValidationResult {
@@ -249,6 +254,8 @@ async function completionsFromGoodParseYAML(context: YamlIntelligenceContext) {
     schema, // schema of yaml object
   } = context;
 
+  const positionKind = context.positionKind || "metadata";
+
   // if this is a yaml inside a language chunk, it will have a
   // comment prefix which we need to know about in order to
   // autocomplete linebreaks correctly.
@@ -273,6 +280,7 @@ async function completionsFromGoodParseYAML(context: YamlIntelligenceContext) {
       commentPrefix,
       context,
       completionPosition: "key",
+      positionKind,
     });
     return rawCompletions;
   }
@@ -301,6 +309,7 @@ async function completionsFromGoodParseYAML(context: YamlIntelligenceContext) {
       commentPrefix,
       context,
       completionPosition: "key",
+      positionKind,
     });
     return rawCompletions;
   };
@@ -396,6 +405,7 @@ async function completionsFromGoodParseYAML(context: YamlIntelligenceContext) {
           : completionOnArraySequence // this picks up case 5 (and 1, but case one was already handled.)
           ? "key"
           : undefined,
+        positionKind,
       });
       // never followup a suggestion in value position
       if (completionOnValuePosition) {
@@ -444,16 +454,20 @@ function uniqBy<T>(lst: T[], keyFun: (item: T) => (string | undefined)): T[] {
 }
 
 // Currently, the only special case we have is for "execute-only" tags
-// in paths that don't start with execute.
+// in paths that don't start with execute in yaml metadata completions
 function dropCompletionsFromSchema(
   obj: CompletionContext,
   completion: Completion,
 ) {
   const matchingSchema = resolveSchema(completion.schema!);
   const {
     path,
+    positionKind,
   } = obj;
 
+  if (positionKind === "code-cell") {
+    return false;
+  }
   if (completion.type === "value") {
     return false;
   }
@@ -815,6 +829,7 @@ async function automationFromGoodParseMarkdown(
         schema,
         code: foundCell.source,
         schemaName: "front-matter",
+        positionKind: "metadata",
       };
       // user asked for autocomplete on "---": report none
       if (positionInTicks(context)) {
@@ -840,6 +855,7 @@ async function automationFromGoodParseMarkdown(
           column: position.column,
         },
         line,
+        positionKind: "code-cell",
       });
     } else {
       // do not complete what we do not understand
@@ -862,6 +878,7 @@ async function automationFromGoodParseMarkdown(
             schemaName: "front-matter",
             line,
             position, // we don't need to adjust position because front matter only shows up at start of file.
+            positionKind: "metadata",
           }),
         ) as ValidationResult[];
         lints.push(...innerLints);
@@ -882,6 +899,7 @@ async function automationFromGoodParseMarkdown(
             ...position,
             row: position.row - (linesSoFar + 1),
           },
+          positionKind: "code-cell",
         }) as ValidationResult[];
         lints.push(...innerLints);
       }
@@ -1002,9 +1020,15 @@ async function automationFileTypeDispatch(
     case "markdown":
       return automationFromGoodParseMarkdown(kind, context);
     case "yaml":
-      return automationFromGoodParseYAML(kind, context);
+      return automationFromGoodParseYAML(kind, {
+        ...context,
+        positionKind: "metadata",
+      });
     case "script":
-      return automationFromGoodParseScript(kind, context);
+      return automationFromGoodParseScript(kind, {
+        ...context,
+        positionKind: "code-cell",
+      });
     default:
       return null;
   }

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

@@ -28175,6 +28175,7 @@ async function completionsFromGoodParseYAML(context) {
     position,
     schema: schema2
   } = context;
+  const positionKind = context.positionKind || "metadata";
   const commentPrefix = context.commentPrefix || "";
   const parser = await getTreeSitter();
   let word = "";
@@ -28191,7 +28192,8 @@ async function completionsFromGoodParseYAML(context) {
       indent: indent2,
       commentPrefix,
       context,
-      completionPosition: "key"
+      completionPosition: "key",
+      positionKind
     });
     return rawCompletions;
   }
@@ -28212,7 +28214,8 @@ async function completionsFromGoodParseYAML(context) {
       indent,
       commentPrefix,
       context,
-      completionPosition: "key"
+      completionPosition: "key",
+      positionKind
     });
     return rawCompletions;
   };
@@ -28263,7 +28266,8 @@ async function completionsFromGoodParseYAML(context) {
         indent,
         commentPrefix,
         context,
-        completionPosition: completionOnValuePosition ? "value" : completionOnArraySequence ? "key" : void 0
+        completionPosition: completionOnValuePosition ? "value" : completionOnArraySequence ? "key" : void 0,
+        positionKind
       });
       if (completionOnValuePosition) {
         rawCompletions.completions = rawCompletions.completions.map((c) => ({
@@ -28298,8 +28302,12 @@ function uniqBy(lst, keyFun) {
 function dropCompletionsFromSchema(obj, completion) {
   const matchingSchema = resolveSchema(completion.schema);
   const {
-    path
+    path,
+    positionKind
   } = obj;
+  if (positionKind === "code-cell") {
+    return false;
+  }
   if (completion.type === "value") {
     return false;
   }
@@ -28545,7 +28553,8 @@ async function automationFromGoodParseMarkdown(kind, context) {
         position,
         schema: schema2,
         code: foundCell.source,
-        schemaName: "front-matter"
+        schemaName: "front-matter",
+        positionKind: "metadata"
       };
       if (positionInTicks(context)) {
         return noCompletions;
@@ -28565,7 +28574,8 @@ async function automationFromGoodParseMarkdown(kind, context) {
           row: position.row - foundCell.cellStartLine,
           column: position.column
         },
-        line
+        line,
+        positionKind: "code-cell"
       });
     } else {
       return noCompletions;
@@ -28582,7 +28592,8 @@ async function automationFromGoodParseMarkdown(kind, context) {
           schema: await getFrontMatterSchema(),
           schemaName: "front-matter",
           line,
-          position
+          position,
+          positionKind: "metadata"
         }));
         lints.push(...innerLints);
       } else if (cell.cell_type === "markdown" || cell.cell_type === "math") {
@@ -28600,7 +28611,8 @@ async function automationFromGoodParseMarkdown(kind, context) {
           position: {
             ...position,
             row: position.row - (linesSoFar + 1)
-          }
+          },
+          positionKind: "code-cell"
         });
         lints.push(...innerLints);
       }
@@ -28673,9 +28685,15 @@ async function automationFileTypeDispatch(filetype, kind, context) {
     case "markdown":
       return automationFromGoodParseMarkdown(kind, context);
     case "yaml":
-      return automationFromGoodParseYAML(kind, context);
+      return automationFromGoodParseYAML(kind, {
+        ...context,
+        positionKind: "metadata"
+      });
     case "script":
-      return automationFromGoodParseScript(kind, context);
+      return automationFromGoodParseScript(kind, {
+        ...context,
+        positionKind: "code-cell"
+      });
     default:
       return null;
   }