feat: Passing block error validation through the importer.

Author: ramitha

packages/@css-blocks/language-server/src/Server.ts

@@ -52,16 +52,17 @@ export class Server {
 
   async onDidChangeContent(e: TextDocumentChangeEvent) {
       // only track incremental changes within block files
-      // NOTE: this does seem to cause a little bit of weirdness when editing a
-      // template with errors since the error locations do not get updated until
-      // saving the file. We may want to validate the open template files on
-      // every change?
+      this.blockFactory.reset();
       if (isBlockFile(e.document.uri)) {
-        const cssBlockErrors = await documentContentChange(e, this.blockParser);
+        const cssBlockErrors = await documentContentChange(e, this.blockFactory);
         this.sendDiagnostics(cssBlockErrors, e.document.uri);
 
       } else if (isTemplateFile(e.document.uri)) {
         // Validate template
+        // NOTE: this does seem to cause a little bit of weirdness when editing a
+        // template with errors since the error locations do not get updated until
+        // saving the file. We may want to validate the open template files on
+        // every change?
       }
 
   }

packages/@css-blocks/language-server/src/eventHandlers/documentContentChange.ts

@@ -1,16 +1,25 @@
-import { CssBlockError } from "@css-blocks/core/dist/src";
-import { BlockParser } from "@css-blocks/core/dist/src/BlockParser/BlockParser";
+import { BlockFactory, CssBlockError } from "@css-blocks/core/dist/src";
 import { TextDocumentChangeEvent } from "vscode-languageserver";
 import { URI } from "vscode-uri";
 
-import { isBlockFile, parseBlockErrors } from "../util/blockUtils";
+import { isBlockFile } from "../util/blockUtils";
 
-export async function documentContentChange(e: TextDocumentChangeEvent, parser: BlockParser): Promise<CssBlockError[]> {
+export async function documentContentChange(e: TextDocumentChangeEvent, blockFactory: BlockFactory): Promise<CssBlockError[]> {
   const { uri } = e.document;
 
   if (isBlockFile(uri)) {
-    return await parseBlockErrors(parser, URI.parse(uri).fsPath, e.document.getText());
+    let errors: CssBlockError[] = [];
+    try {
+      // parses the block file to get the block and errors if there's a problem
+      // along the way. The importer ensures that we're getting live contents if
+      // the block file is opened
+      await blockFactory.getBlockFromPath(URI.parse(uri).fsPath);
+    } catch (error) {
+      if (error instanceof CssBlockError) {
+        errors = errors.concat(error);
+      }
+      return errors;
+    }
   }
-
   return [];
 }

packages/@css-blocks/language-server/src/util/blockUtils.ts

@@ -1,31 +1,5 @@
-import { CssBlockError, Syntax } from "@css-blocks/core/dist/src";
-import { BlockParser } from "@css-blocks/core/dist/src/BlockParser/BlockParser";
-import { postcss } from "opticss";
-import * as path from "path";
-
 // TODO: Currently we are only supporting css. This should eventually support all
 // of the file types supported by css blocks
 export function isBlockFile(uriOrFsPath: string) {
   return uriOrFsPath.endsWith(".block.css");
 }
-
-export async function parseBlockErrors(parser: BlockParser, blockFsPath: string, sourceText: string): Promise<CssBlockError[]> {
-  let errors: CssBlockError[] = [];
-
-  try {
-    await parser.parseSource({
-      identifier: blockFsPath,
-      defaultName: path.parse(blockFsPath).name.replace(/\.block/, ""),
-      originalSource: sourceText,
-      originalSyntax: Syntax.css,
-      parseResult: postcss.parse(sourceText, { from: blockFsPath }),
-      dependencies: [],
-    });
-  } catch (error) {
-    if (error instanceof CssBlockError) {
-      errors = errors.concat(error);
-    }
-  }
-
-  return errors;
-}