[LiquidDoc] Return undefined for invalid snippet definitions

Author: jamesmengo

packages/theme-language-server-common/src/documents/DocumentManager.ts

@@ -175,7 +175,7 @@ export class DocumentManager {
           }),
           /** Lazy and only computed once per file version */
           getLiquidDoc: memo(async (snippetName: string) => {
-            if (isError(sourceCode.ast)) return { name: snippetName };
+            if (isError(sourceCode.ast)) return undefined;
 
             return getSnippetDefinition(sourceCode.ast, snippetName);
           }),

packages/theme-language-server-common/src/documents/types.ts

@@ -24,7 +24,7 @@ export type AugmentedJsonSourceCode = _AugmentedSourceCode<SourceCodeType.JSON>;
  */
 export type AugmentedLiquidSourceCode = _AugmentedSourceCode<SourceCodeType.LiquidHtml> & {
   getSchema: () => Promise<SectionSchema | ThemeBlockSchema | AppBlockSchema | undefined>;
-  getLiquidDoc: (snippetName: string) => Promise<SnippetDefinition>;
+  getLiquidDoc: (snippetName: string) => Promise<SnippetDefinition | undefined>;
 };
 
 /**

packages/theme-language-server-common/src/hover/providers/RenderSnippetHoverProvider.ts

@@ -9,7 +9,7 @@ export class RenderSnippetHoverProvider implements BaseHoverProvider {
     private getSnippetDefinitionForURI: (
       uri: string,
       snippetName: string,
-    ) => Promise<SnippetDefinition>,
+    ) => Promise<SnippetDefinition | undefined>,
   ) {}
 
   async hover(
@@ -32,6 +32,10 @@ export class RenderSnippetHoverProvider implements BaseHoverProvider {
       snippetName,
     );
 
+    if (!snippetDefinition) {
+      return null;
+    }
+
     const liquidDoc = snippetDefinition.liquidDoc;
 
     if (!liquidDoc) {

packages/theme-language-server-common/src/liquidDoc.ts

@@ -7,13 +7,7 @@ import { LiquidDocParamNode } from '@shopify/liquid-html-parser';
 export type GetSnippetDefinitionForURI = (
   uri: string,
   snippetName: string,
-) => Promise<SnippetDefinition>;
-
-export type LiquidDocParameter = {
-  name: string;
-  description: string | null;
-  type: string | null;
-};
+) => Promise<SnippetDefinition | undefined>;
 
 export type SnippetDefinition = {
   name: string;
@@ -24,27 +18,33 @@ type LiquidDocDefinition = {
   parameters?: LiquidDocParameter[];
 };
 
+export type LiquidDocParameter = {
+  name: string;
+  description: string | null;
+  type: string | null;
+};
+
 export function getSnippetDefinition(
   snippet: LiquidHtmlNode,
   snippetName: string,
 ): SnippetDefinition {
-  const liquidDocParameters: LiquidDocParameter[] = visit<
-    SourceCodeType.LiquidHtml,
-    LiquidDocParameter
-  >(snippet, {
-    LiquidDocParamNode(node: LiquidDocParamNode) {
-      return {
-        name: node.paramName.value,
-        description: node.paramDescription?.value ?? null,
-        type: node.paramType?.value ?? null,
-      };
+  const parameters: LiquidDocParameter[] = visit<SourceCodeType.LiquidHtml, LiquidDocParameter>(
+    snippet,
+    {
+      LiquidDocParamNode(node: LiquidDocParamNode) {
+        return {
+          name: node.paramName.value,
+          description: node.paramDescription?.value ?? null,
+          type: node.paramType?.value ?? null,
+        };
+      },
     },
-  });
+  );
 
   return {
     name: snippetName,
     liquidDoc: {
-      parameters: liquidDocParameters,
+      parameters: parameters,
     },
   };
 }

packages/theme-language-server-common/src/server/startServer.ts

@@ -43,8 +43,7 @@ import { snippetName } from '../utils/uri';
 import { VERSION } from '../version';
 import { CachedFileSystem } from './CachedFileSystem';
 import { Configuration } from './Configuration';
-import { LiquidHtmlNode } from '@shopify/liquid-html-parser';
-import { getSnippetDefinition, SnippetDefinition } from '../liquidDoc';
+import { SnippetDefinition } from '../liquidDoc';
 
 const defaultLogger = () => {};
 
@@ -176,13 +175,13 @@ export function startServer(
   const getSnippetDefinitionForURI = async (
     uri: string,
     snippetName: string,
-  ): Promise<SnippetDefinition> => {
+  ): Promise<SnippetDefinition | undefined> => {
     const rootUri = await findThemeRootURI(uri);
     const snippetURI = path.join(rootUri, 'snippets', `${snippetName}.liquid`);
     const snippet = documentManager.get(snippetURI);
 
     if (!snippet || snippet.type !== SourceCodeType.LiquidHtml || isError(snippet.ast)) {
-      return { name: snippetName };
+      return undefined;
     }
 
     return snippet.getLiquidDoc(snippetName);