@platformos/platformos-language-server-common 0.0.7 → 0.0.9

package/src/documentLinks/DocumentLinksProvider.ts

@@ -6,13 +6,13 @@ import { URI, Utils } from 'vscode-uri';
 
 import { visit, Visitor } from '@platformos/platformos-check-common';
 import { DocumentManager } from '../documents';
-import { FindThemeRootURI } from '../internal-types';
+import { FindAppRootURI } from '../internal-types';
 import { DocumentsLocator, TranslationProvider } from '@platformos/platformos-common';
 
 export class DocumentLinksProvider {
   constructor(
     private documentManager: DocumentManager,
-    private findThemeRootURI: FindThemeRootURI,
+    private findAppRootURI: FindAppRootURI,
     private documentsLocator: DocumentsLocator,
     private translationProvider: TranslationProvider,
   ) {}
@@ -27,7 +27,7 @@ export class DocumentLinksProvider {
       return [];
     }
 
-    const rootUri = await this.findThemeRootURI(uriString);
+    const rootUri = await this.findAppRootURI(uriString);
     if (!rootUri) {
       return [];
     }
@@ -53,12 +53,12 @@ function documentLinksVisitor(
       if (
         (node.name === 'render' || node.name === 'include') &&
         typeof node.markup !== 'string' &&
-        isLiquidString(node.markup.snippet)
+        isLiquidString(node.markup.partial)
       ) {
-        const snippet = node.markup.snippet;
+        const partial = node.markup.partial;
         return DocumentLink.create(
-          range(textDocument, snippet),
-          await documentsLocator.locate(root, node.name, snippet.value),
+          range(textDocument, partial),
+          await documentsLocator.locate(root, node.name, partial.value),
         );
       }
 
@@ -67,10 +67,10 @@ function documentLinksVisitor(
         typeof node.markup !== 'string' &&
         isLiquidString(node.markup.partial)
       ) {
-        const snippet = node.markup.partial;
+        const partial = node.markup.partial;
         return DocumentLink.create(
-          range(textDocument, snippet),
-          await documentsLocator.locate(root, node.name, snippet.value),
+          range(textDocument, partial),
+          await documentsLocator.locate(root, node.name, partial.value),
         );
       }
 

package/src/documents/DocumentManager.spec.ts

@@ -1,10 +1,4 @@
-import {
-  path,
-  Section,
-  Setting,
-  ThemeBlock,
-  ThemeSchemaType,
-} from '@platformos/platformos-check-common';
+import { path } from '@platformos/platformos-check-common';
 import { AbstractFileSystem } from '@platformos/platformos-common';
 import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
 import { assert, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -23,28 +17,28 @@ describe('Module: DocumentManager', () => {
     documentManager = new DocumentManager();
   });
 
-  it('should return a theme for a root', () => {
+  it('should return an app for a root', () => {
     // these will be different in windows vs unix
     const rootUri = URI.file(__dirname);
-    const fileUri = Utils.joinPath(rootUri, 'test.liquid');
+    const fileUri = Utils.joinPath(rootUri, 'app', 'views', 'partials', 'test.liquid');
 
     // We expect forward slash paths (windows path get normalized)
     expect(fileUri.path).not.to.include('\\');
     documentManager.open(fileUri.toString(), '{{ "hi" }}', 0);
-    const theme = documentManager.theme(path.normalize(rootUri));
-    expect(theme).to.have.lengthOf(1);
-    expect(theme[0].uri).not.to.include('\\');
+    const app = documentManager.app(path.normalize(rootUri));
+    expect(app).to.have.lengthOf(1);
+    expect(app[0].uri).not.to.include('\\');
     // `fileURI.toString()` lowercases c: in 'C:\dir\path'
     // Without the URI.parse().path, this test was failing for a dumb reason
-    expect(theme[0].uri).to.equal(path.normalize(fileUri));
+    expect(app[0].uri).to.equal(path.normalize(fileUri));
   });
 
   describe('when initialized with an abstract file system', () => {
     beforeEach(async () => {
       fs = new MockFileSystem(
         {
-          'snippet/foo.liquid': `hello {% render 'bar' %}`,
-          'snippet/bar.liquid': `world`,
+          'app/views/partials/foo.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/bar.liquid': `world`,
         },
         'mock-fs:',
       );
@@ -58,35 +52,43 @@ describe('Module: DocumentManager', () => {
       });
 
       it('preloads source codes with a version of undefined', async () => {
-        const sc = documentManager.get('mock-fs:/snippet/foo.liquid');
+        const sc = documentManager.get('mock-fs:/app/views/partials/foo.liquid');
         assert(sc);
         expect(sc.version).to.equal(undefined);
       });
 
       it('returns defined versions of opened files', () => {
-        documentManager.open('mock-fs:/snippet/foo.liquid', 'hello {% render "bar" %}', 0);
-        const sc = documentManager.get('mock-fs:/snippet/foo.liquid');
+        documentManager.open(
+          'mock-fs:/app/views/partials/foo.liquid',
+          'hello {% render "bar" %}',
+          0,
+        );
+        const sc = documentManager.get('mock-fs:/app/views/partials/foo.liquid');
         assert(sc);
         expect(sc.version).to.equal(0);
       });
 
-      describe('Unit: theme(rootUri, includeFilesFromDisk)', () => {
+      describe('Unit: app(rootUri, includeFilesFromDisk)', () => {
         it('only returns the source codes of the opened files by default', () => {
-          const theme = documentManager.theme('mock-fs:/');
-          expect(theme).to.have.lengthOf(0);
+          const app = documentManager.app('mock-fs:/');
+          expect(app).to.have.lengthOf(0);
         });
 
         it('returns all the files when called with includeFilesFromDisk', async () => {
-          const theme = documentManager.theme('mock-fs:/', true);
-          expect(theme).to.have.lengthOf(2);
+          const app = documentManager.app('mock-fs:/', true);
+          expect(app).to.have.lengthOf(2);
         });
       });
 
       describe('Unit: close(uri)', () => {
         it('sets the source version to undefined (value is on disk)', () => {
-          documentManager.open('mock-fs:/snippet/foo.liquid', 'hello {% render "bar" %}', 10);
-          documentManager.close('mock-fs:/snippet/foo.liquid');
-          const sc = documentManager.get('mock-fs:/snippet/foo.liquid');
+          documentManager.open(
+            'mock-fs:/app/views/partials/foo.liquid',
+            'hello {% render "bar" %}',
+            10,
+          );
+          documentManager.close('mock-fs:/app/views/partials/foo.liquid');
+          const sc = documentManager.get('mock-fs:/app/views/partials/foo.liquid');
           assert(sc);
           expect(sc.source).to.equal('hello {% render "bar" %}');
           expect(sc.version).to.equal(undefined);
@@ -96,9 +98,13 @@ describe('Module: DocumentManager', () => {
       describe('Unit: delete(uri)', () => {
         it('deletes the source code from the document manager', () => {
           // as though the file no longer exists
-          documentManager.open('mock-fs:/snippet/foo.liquid', 'hello {% render "bar" %}', 10);
-          documentManager.delete('mock-fs:/snippet/foo.liquid');
-          const sc = documentManager.get('mock-fs:/snippet/foo.liquid');
+          documentManager.open(
+            'mock-fs:/app/views/partials/foo.liquid',
+            'hello {% render "bar" %}',
+            10,
+          );
+          documentManager.delete('mock-fs:/app/views/partials/foo.liquid');
+          const sc = documentManager.get('mock-fs:/app/views/partials/foo.liquid');
           assert(!sc);
         });
       });
@@ -110,7 +116,7 @@ describe('Module: DocumentManager', () => {
           await documentManager.preload('mock-fs:/');
           await documentManager.preload('mock-fs:/');
           expect(vi.mocked(fs.readFile)).toHaveBeenCalledTimes(
-            documentManager.theme('mock-fs:/', true).length,
+            documentManager.app('mock-fs:/', true).length,
           );
         });
       });
@@ -137,16 +143,16 @@ describe('Module: DocumentManager', () => {
 
       fs = new MockFileSystem(
         {
-          'snippet/1.liquid': `hello {% render 'bar' %}`,
-          'snippet/2.liquid': `hello {% render 'bar' %}`,
-          'snippet/3.liquid': `hello {% render 'bar' %}`,
-          'snippet/4.liquid': `hello {% render 'bar' %}`,
-          'snippet/5.liquid': `hello {% render 'bar' %}`,
-          'snippet/6.liquid': `hello {% render 'bar' %}`,
-          'snippet/7.liquid': `hello {% render 'bar' %}`,
-          'snippet/8.liquid': `hello {% render 'bar' %}`,
-          'snippet/9.liquid': `hello {% render 'bar' %}`,
-          'snippet/10.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/1.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/2.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/3.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/4.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/5.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/6.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/7.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/8.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/9.liquid': `hello {% render 'bar' %}`,
+          'app/views/partials/10.liquid': `hello {% render 'bar' %}`,
         },
         mockRoot,
       );
@@ -194,83 +200,4 @@ describe('Module: DocumentManager', () => {
       );
     });
   });
-
-  describe('when initialized with a fs, getModeForURI, and isValidSchema', () => {
-    const mockFsRoot = path.normalize('mock-fs:/theme');
-    const sectionSchema: Section.Schema = {
-      name: 'hello',
-      settings: [{ type: 'number' as Setting.Type.Number, id: 'my_num' }],
-      default: { settings: { my_num: 1 } },
-    };
-    const blockSchema: ThemeBlock.Schema = {
-      name: 'world',
-      blocks: [{ type: '@theme' }],
-    };
-
-    beforeEach(async () => {
-      fs = new MockFileSystem(
-        {
-          'sections/foo.liquid': `
-             {% schema %}
-               ${JSON.stringify(sectionSchema, null, 2)}
-             {% endschema %}`,
-          'blocks/bar.liquid': `
-            {% schema %}
-              ${JSON.stringify(blockSchema, null, 2)}
-            {% endschema %}`,
-        },
-        mockFsRoot,
-      );
-      documentManager = new DocumentManager(
-        fs,
-        undefined,
-        undefined,
-        async () => 'theme',
-        async () => true, // let's assume they are valid for testing purposes...
-      );
-      await documentManager.preload(mockFsRoot);
-    });
-
-    it('should augment section files with a getSchema property that resolves to a type-safe schema', async () => {
-      const section = documentManager.get(path.join(mockFsRoot, 'sections/foo.liquid'));
-      assert(section);
-      assert(section.type === 'LiquidHtml');
-      const schema = await section.getSchema();
-      assert(schema);
-      assert(schema.type === ThemeSchemaType.Section);
-      expect(schema.parsed).to.eql(sectionSchema);
-      const validSchema = schema.validSchema;
-      assert(!(validSchema instanceof Error));
-
-      // Note below that validSchema.name is accessed in a type-safe manner
-      expect(validSchema.name).to.equal(sectionSchema.name);
-      assert(validSchema.settings);
-      for (const setting of validSchema.settings) {
-        assert(setting.type);
-        assert(setting.id);
-      }
-
-      // Default is a section-only property
-      assert(validSchema.default);
-    });
-
-    it('should augment block files with a getSchema property that resolves to a type-safe schema', async () => {
-      const block = documentManager.get(path.join(mockFsRoot, 'blocks/bar.liquid'));
-      assert(block);
-      assert(block.type === 'LiquidHtml');
-      const schema = await block.getSchema();
-      assert(schema);
-      assert(schema.type === ThemeSchemaType.Block);
-      expect(schema.parsed).to.eql(blockSchema);
-      const validSchema = schema.validSchema;
-      assert(!(validSchema instanceof Error));
-
-      // Note below that validSchema.name is accessed in a type-safe manner
-      expect(validSchema.name).to.equal(blockSchema.name);
-      assert(validSchema.blocks);
-      for (const block of validSchema.blocks) {
-        assert(block.type);
-      }
-    });
-  });
 });

package/src/documents/DocumentManager.ts

@@ -1,16 +1,15 @@
 import {
   assertNever,
+  isKnownLiquidFile,
   memoize,
   path,
   recursiveReadDirectory,
   SourceCodeType,
-  Theme,
+  App,
   toSourceCode,
-  toSchema,
   UriString,
   IsValidSchema,
   memo,
-  Mode,
   isError,
 } from '@platformos/platformos-check-common';
 
@@ -40,7 +39,6 @@ export class DocumentManager {
     private readonly fs?: AbstractFileSystem,
     private readonly connection?: Connection,
     private readonly clientCapabilities?: ClientCapabilities,
-    private readonly getModeForUri?: (uri: UriString) => Promise<Mode>,
     private readonly isValidSchema?: IsValidSchema,
   ) {
     this.sourceCodes = new Map();
@@ -78,12 +76,16 @@ export class DocumentManager {
     this.set(newUri, sourceCode.source, sourceCode.version);
   }
 
-  public theme(root: UriString, includeFilesFromDisk = false): AugmentedSourceCode[] {
+  public app(root: UriString, includeFilesFromDisk = false): AugmentedSourceCode[] {
     return [...this.sourceCodes.values()]
       .filter((sourceCode) => sourceCode.uri.startsWith(root))
+      .filter((sourceCode) => includeFilesFromDisk || sourceCode.version !== undefined)
       .filter(
-        (sourceCode) => includeFilesFromDisk || sourceCode.version !== undefined,
-      ) satisfies Theme;
+        // Exclude .liquid files that aren't in a recognized platformOS directory
+        // (e.g. generator templates). Non-liquid files are always included.
+        (sourceCode) =>
+          sourceCode.type !== SourceCodeType.LiquidHtml || isKnownLiquidFile(sourceCode.uri),
+      ) satisfies App;
   }
 
   public get openDocuments(): AugmentedSourceCode[] {
@@ -109,8 +111,8 @@ export class DocumentManager {
 
   private set(uri: UriString, source: string, version: number | undefined) {
     uri = path.normalize(uri);
-    // We only support json and liquid files.
-    if (!/\.(json|liquid|graphql)$/.test(uri) || /\.(s?css|js).liquid$/.test(uri)) {
+    // We only support json, liquid, graphql, and yaml files.
+    if (!/\.(json|liquid|graphql|ya?ml)$/.test(uri) || /\.(s?css|js).liquid$/.test(uri)) {
       return;
     }
 
@@ -119,7 +121,7 @@ export class DocumentManager {
 
   /**
    * The preload method is used to pre-load and pre-parse all the files in the
-   * theme. It is smart and only will load files that are not already in the
+   * app. It is smart and only will load files that are not already in the
    * DocumentManager.
    *
    * Files that are loaded from the AbstractFileSystem will have a version of `undefined`.
@@ -137,7 +139,7 @@ export class DocumentManager {
       const filesToLoad = await recursiveReadDirectory(
         this.fs,
         rootUri,
-        ([uri]) => /\.(liquid|json|graphql)$/.test(uri) && !this.sourceCodes.has(uri),
+        ([uri]) => /\.(liquid|json|graphql|ya?ml)$/.test(uri) && !this.sourceCodes.has(uri),
       );
 
       progress.report(10, 'Preloading files');
@@ -189,16 +191,18 @@ export class DocumentManager {
           ...sourceCode,
           textDocument,
         };
+      case SourceCodeType.YAML:
+        return {
+          ...sourceCode,
+          textDocument,
+        };
       case SourceCodeType.LiquidHtml:
         return {
           ...sourceCode,
           textDocument,
           /** Lazy and only computed once per file version */
           getSchema: memo(async () => {
-            if (!this.getModeForUri || !this.isValidSchema) return undefined;
-
-            const mode = await this.getModeForUri!(uri);
-            return toSchema(mode, uri, sourceCode, this.isValidSchema, false);
+            return undefined;
           }),
           /** Lazy and only computed once per file version */
           getLiquidDoc: memo(async () => {

package/src/documents/types.ts

@@ -1,13 +1,19 @@
-import {
-  SourceCodeType,
-  SourceCode,
-  SectionSchema,
-  ThemeBlockSchema,
-  AppBlockSchema,
-} from '@platformos/platformos-check-common';
+import { SourceCodeType, SourceCode } from '@platformos/platformos-check-common';
+import { JSONNode } from '@platformos/platformos-check-common';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { DocDefinition } from '@platformos/platformos-check-common';
 
+/**
+ * Reserved for future use. platformOS does not use `{% schema %}` blocks,
+ * so `getSchema()` always returns `undefined`.
+ */
+export interface SchemaObject {
+  parsed: any;
+  validSchema?: unknown;
+  ast: JSONNode | Error;
+  offset: number;
+}
+
 /** Util type to add the common `textDocument` property to the SourceCode. */
 type _AugmentedSourceCode<SCT extends SourceCodeType = SourceCodeType> = SourceCode<SCT> & {
   textDocument: TextDocument;
@@ -25,7 +31,7 @@ export type AugmentedGraphQLSourceCode = _AugmentedSourceCode<SourceCodeType.Gra
  * about cache invalidation and will mean we'll parse the schema at most once.
  */
 export type AugmentedLiquidSourceCode = _AugmentedSourceCode<SourceCodeType.LiquidHtml> & {
-  getSchema: () => Promise<SectionSchema | ThemeBlockSchema | AppBlockSchema | undefined>;
+  getSchema: () => Promise<SchemaObject | undefined>;
   getLiquidDoc: () => Promise<DocDefinition | undefined>;
 };
 
@@ -39,10 +45,13 @@ export type AugmentedLiquidSourceCode = _AugmentedSourceCode<SourceCodeType.Liqu
  * AugmentedSourceCode<SourceCodeType.JSON> -> AugmentedJsonSourceCode
  * AugmentedSourceCode<SourceCodeType.LiquidHtml> -> AugmentedLiquidSourceCode
  */
+export type AugmentedYAMLSourceCode = _AugmentedSourceCode<SourceCodeType.YAML>;
+
 export type AugmentedSourceCode<SCT extends SourceCodeType = SourceCodeType> = {
   [SourceCodeType.JSON]: AugmentedJsonSourceCode;
   [SourceCodeType.LiquidHtml]: AugmentedLiquidSourceCode;
   [SourceCodeType.GraphQL]: AugmentedGraphQLSourceCode;
+  [SourceCodeType.YAML]: AugmentedYAMLSourceCode;
 }[SCT];
 
 export const isLiquidSourceCode = (file: AugmentedSourceCode): file is AugmentedLiquidSourceCode =>
@@ -51,5 +60,5 @@ export const isLiquidSourceCode = (file: AugmentedSourceCode): file is Augmented
 export const isJsonSourceCode = (file: AugmentedSourceCode): file is AugmentedJsonSourceCode =>
   file.type === SourceCodeType.JSON;
 
-export const isGraphQLSourceceCode = (file: AugmentedSourceCode): file is AugmentedJsonSourceCode =>
+export const isGraphQLSourceCode = (file: AugmentedSourceCode): file is AugmentedJsonSourceCode =>
   file.type === SourceCodeType.GraphQL;

package/src/hover/HoverProvider.ts

@@ -1,8 +1,7 @@
 import {
   GetDocDefinitionForURI,
-  MetafieldDefinitionMap,
   SourceCodeType,
-  ThemeDocset,
+  PlatformOSDocset,
 } from '@platformos/platformos-check-common';
 import { Hover, HoverParams } from 'vscode-languageserver';
 import { TypeSystem } from '../TypeSystem';
@@ -23,42 +22,31 @@ import {
 } from './providers';
 import { HtmlAttributeValueHoverProvider } from './providers/HtmlAttributeValueHoverProvider';
 import { findCurrentNode } from '@platformos/platformos-check-common';
-import { GetThemeSettingsSchemaForURI } from '../settings';
 import { LiquidDocTagHoverProvider } from './providers/LiquidDocTagHoverProvider';
-import { ContentForArgumentHoverProvider } from './providers/ContentForArgumentHoverProvider';
-import { ContentForTypeHoverProvider } from './providers/ContentForTypeHoverProvider';
 import { TranslationProvider } from '@platformos/platformos-common';
-import { FindThemeRootURI } from '../../src/internal-types';
+import { FindAppRootURI } from '../../src/internal-types';
 export class HoverProvider {
   private providers: BaseHoverProvider[] = [];
 
   constructor(
     readonly documentManager: DocumentManager,
-    readonly themeDocset: ThemeDocset,
+    readonly platformosDocset: PlatformOSDocset,
     readonly translationProvider: TranslationProvider,
-    readonly getMetafieldDefinitions: (rootUri: string) => Promise<MetafieldDefinitionMap>,
     readonly getTranslationsForURI: GetTranslationsForURI = async () => ({}),
-    readonly getSettingsSchemaForURI: GetThemeSettingsSchemaForURI = async () => [],
     readonly getDocDefinitionForURI: GetDocDefinitionForURI = async () => undefined,
-    readonly findThemeRootURI: FindThemeRootURI = async () => null,
+    readonly findAppRootURI: FindAppRootURI = async () => null,
   ) {
-    const typeSystem = new TypeSystem(
-      themeDocset,
-      getSettingsSchemaForURI,
-      getMetafieldDefinitions,
-    );
+    const typeSystem = new TypeSystem(platformosDocset);
     this.providers = [
-      new ContentForArgumentHoverProvider(getDocDefinitionForURI),
-      new ContentForTypeHoverProvider(getDocDefinitionForURI),
-      new LiquidTagHoverProvider(themeDocset),
-      new LiquidFilterArgumentHoverProvider(themeDocset),
-      new LiquidFilterHoverProvider(themeDocset),
+      new LiquidTagHoverProvider(platformosDocset),
+      new LiquidFilterArgumentHoverProvider(platformosDocset),
+      new LiquidFilterHoverProvider(platformosDocset),
       new LiquidObjectHoverProvider(typeSystem),
       new LiquidObjectAttributeHoverProvider(typeSystem),
       new HtmlTagHoverProvider(),
       new HtmlAttributeHoverProvider(),
       new HtmlAttributeValueHoverProvider(),
-      new TranslationHoverProvider(documentManager, translationProvider, findThemeRootURI),
+      new TranslationHoverProvider(documentManager, translationProvider, findAppRootURI),
       new RenderPartialHoverProvider(getDocDefinitionForURI),
       new RenderPartialParameterHoverProvider(getDocDefinitionForURI),
       new LiquidDocTagHoverProvider(documentManager),

package/src/hover/providers/HtmlAttributeHoverProvider.spec.ts

@@ -1,7 +1,7 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { DocumentManager } from '../../documents';
 import { HoverProvider } from '../HoverProvider';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
+
 import { TranslationProvider } from '@platformos/platformos-common';
 import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
 
@@ -17,10 +17,8 @@ describe('Module: HtmlAttributeHoverProvider', async () => {
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
       new TranslationProvider(new MockFileSystem({}, '.')),
-      async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     );
   });
 

package/src/hover/providers/HtmlAttributeValueHoverProvider.spec.ts

@@ -1,7 +1,7 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { DocumentManager } from '../../documents';
 import { HoverProvider } from '../HoverProvider';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
+
 import { TranslationProvider } from '@platformos/platformos-common';
 import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
 
@@ -17,10 +17,8 @@ describe('Module: HtmlAttributeHoverProvider', async () => {
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
       new TranslationProvider(new MockFileSystem({}, '.')),
-      async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     );
   });
 

package/src/hover/providers/HtmlTagHoverProvider.spec.ts

@@ -1,7 +1,7 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { DocumentManager } from '../../documents';
 import { HoverProvider } from '../HoverProvider';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
+
 import { TranslationProvider } from '@platformos/platformos-common';
 import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
 
@@ -17,10 +17,8 @@ describe('Module: HtmlTagHoverProvider', async () => {
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
       new TranslationProvider(new MockFileSystem({})),
-      async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     );
   });
 

package/src/hover/providers/LiquidDocTagHoverProvider.spec.ts

@@ -1,13 +1,12 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { DocumentManager } from '../../documents';
 import { HoverProvider } from '../HoverProvider';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
 import '../../../../platformos-check-common/src/test/test-setup';
 import { formatLiquidDocTagHandle, SUPPORTED_LIQUID_DOC_TAG_HANDLES } from '../../utils/liquidDoc';
 import { TranslationProvider } from '@platformos/platformos-common';
 import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
 
-describe('Module: RenderSnippetParameterHoverProvider', async () => {
+describe('Module: RenderPartialParameterHoverProvider', async () => {
   let provider: HoverProvider;
 
   beforeEach(() => {
@@ -19,10 +18,8 @@ describe('Module: RenderSnippetParameterHoverProvider', async () => {
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
       new TranslationProvider(new MockFileSystem({})),
-      async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     );
   });
 

package/src/hover/providers/LiquidFilterArgumentHoverProvider.spec.ts

@@ -1,7 +1,6 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { DocumentManager } from '../../documents';
 import { HoverProvider } from '../HoverProvider';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
 import { TranslationProvider } from '@platformos/platformos-common';
 import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
 
@@ -33,10 +32,8 @@ describe('Module: LiquidFilterArgumentHoverProvider', async () => {
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
       new TranslationProvider(new MockFileSystem({})),
-      async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     );
   });
 

package/src/hover/providers/LiquidFilterArgumentHoverProvider.ts

@@ -1,11 +1,11 @@
 import { NodeTypes } from '@platformos/liquid-html-parser';
-import { LiquidHtmlNode, ThemeDocset } from '@platformos/platformos-check-common';
+import { LiquidHtmlNode, PlatformOSDocset } from '@platformos/platformos-check-common';
 import { Hover } from 'vscode-languageserver';
 import { render } from '../../docset';
 import { BaseHoverProvider } from '../BaseHoverProvider';
 
 export class LiquidFilterArgumentHoverProvider implements BaseHoverProvider {
-  constructor(private themeDocset: ThemeDocset) {}
+  constructor(private platformosDocset: PlatformOSDocset) {}
 
   async hover(currentNode: LiquidHtmlNode, ancestors: LiquidHtmlNode[]): Promise<Hover | null> {
     const parentNode = ancestors.at(-1);
@@ -19,7 +19,7 @@ export class LiquidFilterArgumentHoverProvider implements BaseHoverProvider {
     }
 
     const parentName = parentNode.name;
-    const entries = await this.themeDocset.filters();
+    const entries = await this.platformosDocset.filters();
     const entry = entries.find((entry) => entry.name === parentName);
 
     if (!entry) {

package/src/hover/providers/LiquidFilterHoverProvider.spec.ts

@@ -1,7 +1,6 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { DocumentManager } from '../../documents';
 import { HoverProvider } from '../HoverProvider';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
 import { TranslationProvider } from '@platformos/platformos-common';
 import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
 
@@ -24,10 +23,8 @@ describe('Module: LiquidFilterHoverProvider', async () => {
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
       new TranslationProvider(new MockFileSystem({})),
-      async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     );
   });