Cleanup a little more

Author: vezwork

packages/editor-codemirror/src/behaviors/diagnostics.ts

@@ -20,7 +20,16 @@ import { Decoration, DecorationSet } from "@codemirror/view";
 import { StateField, StateEffect } from "@codemirror/state";
 import { hoverTooltip } from "@codemirror/view";
 
-import { CodeViewCellContext, codeViewCellContext, kEndColumn, kEndRow, kStartColumn, kStartRow, LintItem } from "editor";
+import {
+  CodeViewCellContext,
+  codeViewCellContext,
+  kEndColumn,
+  kEndRow,
+  kStartColumn,
+  kStartRow,
+  LintItem,
+  stripYamlFrontmatterDelimiters
+} from "editor";
 import { lines } from "core";
 import { Position } from "vscode-languageserver-types";
 
@@ -52,13 +61,14 @@ export function diagnosticsBehavior(behaviorContext: BehaviorContext): Behavior
       if (filepath === null) return;
 
       const code = lines(pmNode.textContent);
+      const strippedCodeLines = stripYamlFrontmatterDelimiters(code);
 
       // here we hand-craft an artisinal cellContext because `codeViewCellContext(..)`
       // seems to return undefined inside of init
       const cellContext = {
         filepath,
         language: 'yaml',
-        code: code.map(line => !/^(---|\.\.\.)\s*$/.test(line) ? line : ""),
+        code: strippedCodeLines,
         cellBegin: 0,
         cellEnd: code.length - 1,
         selection: EMPTY_CODEVIEW_SELECTION
@@ -102,10 +112,7 @@ async function getDiagnostics(
   cellContext: CodeViewCellContext,
   behaviorContext: BehaviorContext
 ): Promise<LintItem[] | undefined> {
-  const diagnostics = await behaviorContext.pmContext.ui.codeview?.codeViewDiagnostics(cellContext);
-  if (!diagnostics) return undefined;
-
-  return diagnostics;
+  return await behaviorContext.pmContext.ui.codeview?.codeViewDiagnostics(cellContext);
 }
 
 //Check if there is an underline at position and display a tooltip there
@@ -205,14 +212,15 @@ const rangeAndSpecOfDecorationAtPos = (pos: number, d: DecorationSet) => {
 };
 
 /**
- * @param strs A representation of a string, split by newlines.
+ * @param lines A representation of a string, split by newlines.
  * @param [row, col] row and column into the string, row being the same as line number
- * @returns An index into the string i.e. An index into `strs.join('\n')`
+ * @returns An index into the string i.e. An index into `lines.join('\n')`
  */
-function rowColumnToIndex(strs: string[], [col, row]: [number, number]): number {
+function rowColumnToIndex(lines: string[], [col, row]: [number, number]): number {
   let index = 0;
   for (let i = 0; i < row; i++) {
-    index += strs[i].length + 1;
+    // + 1 to account for the newline character
+    index += lines[i].length + 1;
   }
   return index + col;
 }

packages/editor-codemirror/src/behaviors/index.ts

@@ -16,7 +16,7 @@
  *
  */
 
-import { Node as ProsemirrorNode } from 'prosemirror-model'
+import { Node as ProsemirrorNode } from 'prosemirror-model';
 import { EditorView as PMEditorView } from "prosemirror-view";
 
 import { Extension, Transaction } from "@codemirror/state";
@@ -52,7 +52,7 @@ export interface BehaviorContext {
   getPos: boolean | (() => number);
   options: CodeViewOptions;
   pmContext: ExtensionContext;
-  withState: WithState
+  withState: WithState;
 }
 
 export enum State { Updating, Escaping };

packages/editor/src/api/codeview.ts

@@ -347,6 +347,10 @@ export function codeViewCompletionContext(filepath: string, state: EditorState,
   }
 }
 
+export function stripYamlFrontmatterDelimiters(lines: string[]): string[] {
+  return lines.map(line => !/^(---|\.\.\.)\s*$/.test(line) ? line : "");
+}
+
 export function codeViewCellContext(filepath: string, state: EditorState): CodeViewCellContext | undefined {
 
   // get blocks (for active language only)
@@ -356,7 +360,7 @@ export function codeViewCellContext(filepath: string, state: EditorState): CodeV
     // if this is yaml we strip the delimiters and use only the active block
     if (activeBlockContext.activeLanguage === "yaml") {
       const activeBlock = activeBlockContext.blocks.find(block => block.active) || activeBlockContext.blocks[0];
-      const codeLines = lines(activeBlock.code).map(line => !/^(---|\.\.\.)\s*$/.test(line) ? line : "");
+      const codeLines = stripYamlFrontmatterDelimiters(lines(activeBlock.code));
       return {
         filepath,
         language: activeBlockContext.activeLanguage,