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

package/src/completions/CompletionsProvider.ts

@@ -1,21 +1,16 @@
 import {
   GetDocDefinitionForURI,
-  MetafieldDefinitionMap,
   SourceCodeType,
-  ThemeDocset,
+  PlatformOSDocset,
 } from '@platformos/platformos-check-common';
 import type { AbstractFileSystem, DocumentsLocator } from '@platformos/platformos-common';
 import { CompletionItem, CompletionParams } from 'vscode-languageserver';
 import { TypeSystem } from '../TypeSystem';
 import { DocumentManager } from '../documents';
-import { FindThemeRootURI } from '../internal-types';
-import { GetThemeSettingsSchemaForURI } from '../settings';
+import { FindAppRootURI } from '../internal-types';
 import { GetTranslationsForURI } from '../translations';
 import { createLiquidCompletionParams } from './params';
 import {
-  ContentForCompletionProvider,
-  ContentForBlockTypeCompletionProvider,
-  ContentForParameterCompletionProvider,
   FilterCompletionProvider,
   FilterNamedParameterCompletionProvider,
   HtmlAttributeCompletionProvider,
@@ -35,19 +30,16 @@ import { GetPartialNamesForURI } from './providers/PartialCompletionProvider';
 
 export interface CompletionProviderDependencies {
   documentManager: DocumentManager;
-  themeDocset: ThemeDocset;
+  platformosDocset: PlatformOSDocset;
   getTranslationsForURI?: GetTranslationsForURI;
   getPartialNamesForURI?: GetPartialNamesForURI;
-  getThemeSettingsSchemaForURI?: GetThemeSettingsSchemaForURI;
-  getMetafieldDefinitions: (rootUri: string) => Promise<MetafieldDefinitionMap>;
   getDocDefinitionForURI?: GetDocDefinitionForURI;
-  getThemeBlockNames?: (rootUri: string, includePrivate: boolean) => Promise<string[]>;
   /** File system for reading GraphQL files */
   fs?: AbstractFileSystem;
   /** Locator for finding documents by type */
   documentsLocator?: DocumentsLocator;
   /** Function to find the theme root URI for a given file */
-  findThemeRootURI?: FindThemeRootURI;
+  findAppRootURI?: FindAppRootURI;
   log?: (message: string) => void;
   /** Callback to notify when unable to infer properties for a variable */
   notifyUnableToInferProperties?: (variableName: string) => void;
@@ -56,52 +48,39 @@ export interface CompletionProviderDependencies {
 export class CompletionsProvider {
   private providers: Provider[] = [];
   readonly documentManager: DocumentManager;
-  readonly themeDocset: ThemeDocset;
+  readonly platformosDocset: PlatformOSDocset;
   readonly log: (message: string) => void;
 
   constructor({
     documentManager,
-    themeDocset,
-    getMetafieldDefinitions,
+    platformosDocset,
     getTranslationsForURI = async () => ({}),
     getPartialNamesForURI = async () => [],
-    getThemeSettingsSchemaForURI = async () => [],
-    getDocDefinitionForURI = async (uri, _relativePath) => ({ uri }),
-    getThemeBlockNames = async (_rootUri: string, _includePrivate: boolean) => [],
+    getDocDefinitionForURI = async (uri, _partialName) => ({ uri }),
     fs,
     documentsLocator,
-    findThemeRootURI,
+    findAppRootURI,
     log = () => {},
   }: CompletionProviderDependencies) {
     this.documentManager = documentManager;
-    this.themeDocset = themeDocset;
+    this.platformosDocset = platformosDocset;
     this.log = log;
-    const typeSystem = new TypeSystem(
-      themeDocset,
-      getThemeSettingsSchemaForURI,
-      getMetafieldDefinitions,
-      fs,
-      documentsLocator,
-      findThemeRootURI,
-    );
+    const typeSystem = new TypeSystem(platformosDocset, fs, documentsLocator, findAppRootURI);
 
     this.providers = [
-      new ContentForCompletionProvider(),
-      new ContentForBlockTypeCompletionProvider(getThemeBlockNames),
-      new ContentForParameterCompletionProvider(getDocDefinitionForURI),
       new HtmlTagCompletionProvider(),
       new HtmlAttributeCompletionProvider(documentManager),
       new HtmlAttributeValueCompletionProvider(),
-      new LiquidTagsCompletionProvider(themeDocset),
+      new LiquidTagsCompletionProvider(platformosDocset),
       new ObjectCompletionProvider(typeSystem),
       new ObjectAttributeCompletionProvider(typeSystem),
       new FilterCompletionProvider(typeSystem),
       new TranslationCompletionProvider(documentManager, getTranslationsForURI),
       new PartialCompletionProvider(getPartialNamesForURI),
       new RenderPartialParameterCompletionProvider(getDocDefinitionForURI),
-      new FilterNamedParameterCompletionProvider(themeDocset),
+      new FilterNamedParameterCompletionProvider(platformosDocset),
       new LiquidDocTagCompletionProvider(),
-      new LiquidDocParamTypeCompletionProvider(themeDocset),
+      new LiquidDocParamTypeCompletionProvider(platformosDocset),
     ];
   }
 

package/src/completions/params/LiquidCompletionParams.spec.ts

@@ -140,7 +140,6 @@ describe('Module: LiquidCompletionParams', async () => {
           `{% render '█' %}`,
           `{% render 'snip', var: '█' %}`,
           `{% content_for '█' %}`,
-          `{% content_for 'block', id: '█' %}`,
         ];
         for (const context of contexts) {
           const { completionContext } = createLiquidParamsFromContext(context);
@@ -181,8 +180,6 @@ describe('Module: LiquidCompletionParams', async () => {
           `{% assign x = a['b█ %}`,
           `{% for a in b█ %}`,
           `{% for a in b reversed limit: a█ %}`,
-          `{% paginate b by a█ %}`,
-          `{% paginate b by col, window_size: a█ %}`,
           `{% if a█ %}`,
           `{% if a > b█ %}`,
           `{% if a > b or c█ %}`,
@@ -193,7 +190,6 @@ describe('Module: LiquidCompletionParams', async () => {
           `{% cycle a█ %}`,
           `{% cycle 'foo', a█ %}`,
           `{% cycle 'foo': a█ %}`,
-          `{% content_for 'foo', v: █ %}`,
           `{% render 'snip', var: a█ %}`,
           `{% render 'snip' for col█ as item %}`,
           `{% render 'snip' with object█ as name %}`,
@@ -206,7 +202,6 @@ describe('Module: LiquidCompletionParams', async () => {
             endif
            %}`,
           `{% for x in (1..a█) %}`,
-          // `{% paginate a█ by 50 %}`,
           `<a-{{ a█ }}`,
           `<a data-{{ a█ }}`,
           `<a data={{ a█ }}`,
@@ -234,8 +229,6 @@ describe('Module: LiquidCompletionParams', async () => {
           `{% assign x = a['█ %}`,
           `{% for a in █ %}`,
           `{% for a in b reversed limit: █ %}`,
-          `{% paginate b by █ %}`,
-          `{% paginate b by col, window_size: █ %}`,
           `{% if █ %}`,
           `{% if a > █ %}`,
           `{% if a > b or █ %}`,
@@ -246,12 +239,10 @@ describe('Module: LiquidCompletionParams', async () => {
           `{% cycle █ %}`,
           `{% cycle 'foo', █ %}`,
           `{% cycle 'foo': █ %}`,
-          `{% content_for 'snip', var: █ %}`,
           `{% render 'snip', var: █ %}`,
           `{% render 'snip' for █ as item %}`,
           `{% render 'snip' with █ as name %}`,
           `{% for x in (1..█) %}`,
-          // `{% paginate a█ by 50 %}`,
           `<a-{{ █ }}`,
           `<a data-{{ █ }}`,
           `<a data={{ █ }}`,

package/src/completions/params/LiquidCompletionParams.ts

@@ -360,21 +360,8 @@ function findCurrentNode(
         break;
       }
 
-      case NodeTypes.PaginateMarkup: {
-        if (isNotEmpty(current.args)) {
-          finder.current = last(current.args);
-        } else if (isCovered(cursor, current.collection.position)) {
-          finder.current = current.collection;
-        } else if (isCovered(cursor, current.pageSize.position)) {
-          finder.current = current.pageSize;
-        }
-        break;
-      }
-
       case NodeTypes.ContentForMarkup: {
-        if (isNotEmpty(current.args)) {
-          finder.current = last(current.args);
-        } else if (isCovered(cursor, current.contentForType.position)) {
+        if (isCovered(cursor, current.contentForType.position)) {
           finder.current = current.contentForType;
         }
 
@@ -444,6 +431,9 @@ function findCurrentNode(
       case NodeTypes.LiquidDocDescriptionNode:
       case NodeTypes.LiquidDocPromptNode:
       case NodeTypes.RenderAliasExpression:
+      case NodeTypes.JsonHashLiteral:
+      case NodeTypes.JsonArrayLiteral:
+      case NodeTypes.JsonKeyValuePair:
       case NodeTypes.BackgroundMarkup:
       case NodeTypes.BackgroundInlineMarkup:
       case NodeTypes.CacheMarkup:

package/src/completions/params/fix.spec.ts

@@ -86,8 +86,6 @@ describe('Unit: fix', async () => {
       `{% assign x = a['█']%}`,
       `{% for a in █%}`,
       `{% for a in b reversed limit: █%}`,
-      `{% paginate b by █%}`,
-      `{% paginate b by col, window_size: █%}`,
       `{% if █%}`,
       `{% if a > █%}`,
       `{% if a > b or █%}`,
@@ -102,7 +100,6 @@ describe('Unit: fix', async () => {
       `{% render 'snip' for █%}`,
       `{% render 'snip' with █%}`,
       `{% for x in (1..█)%}`,
-      // `{% paginate █ by 50 %}`,
       `<a-{{ █}}>`,
       `<a data-{{ █}}>`,
       `<a data={{ █}}>`,

package/src/completions/providers/FilterCompletionProvider.spec.ts

@@ -1,8 +1,4 @@
-import {
-  FilterEntry,
-  MetafieldDefinitionMap,
-  ObjectEntry,
-} from '@platformos/platformos-check-common';
+import { FilterEntry, ObjectEntry } from '@platformos/platformos-check-common';
 import { InsertTextFormat, type TextEdit } from 'vscode-languageserver';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { describe, beforeEach, it, expect } from 'vitest';
@@ -129,15 +125,13 @@ describe('Module: FilterCompletionProvider', async () => {
   beforeEach(async () => {
     provider = new CompletionsProvider({
       documentManager: new DocumentManager(),
-      themeDocset: {
+      platformosDocset: {
         graphQL: async () => null,
         filters: async () => filters,
         objects: async () => objects,
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
-      getMetafieldDefinitions: async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     });
   });
 

package/src/completions/providers/FilterNamedParameterCompletionProvider.spec.ts

@@ -2,8 +2,6 @@ import { describe, beforeEach, it, expect } from 'vitest';
 import { InsertTextFormat, type TextEdit } from 'vscode-languageserver';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
-
 import { DocumentManager } from '../../documents';
 import { CompletionsProvider } from '../CompletionsProvider';
 import { CURSOR } from '../params';
@@ -14,7 +12,7 @@ describe('Module: ObjectCompletionProvider', async () => {
   beforeEach(async () => {
     provider = new CompletionsProvider({
       documentManager: new DocumentManager(),
-      themeDocset: {
+      platformosDocset: {
         graphQL: async () => null,
         filters: async () => [
           {
@@ -47,9 +45,7 @@ describe('Module: ObjectCompletionProvider', async () => {
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
-      getMetafieldDefinitions: async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     });
   });
 

package/src/completions/providers/FilterNamedParameterCompletionProvider.ts

@@ -1,5 +1,5 @@
 import { LiquidVariableLookup, NodeTypes } from '@platformos/liquid-html-parser';
-import { ThemeDocset } from '@platformos/platformos-check-common';
+import { PlatformOSDocset } from '@platformos/platformos-check-common';
 import {
   CompletionItem,
   CompletionItemKind,
@@ -11,7 +11,7 @@ import { Provider, createCompletionItem } from './common';
 import { AugmentedLiquidSourceCode } from '../../documents';
 
 export class FilterNamedParameterCompletionProvider implements Provider {
-  constructor(private readonly themeDocset: ThemeDocset) {}
+  constructor(private readonly platformosDocset: PlatformOSDocset) {}
 
   async completions(params: LiquidCompletionParams): Promise<CompletionItem[]> {
     if (!params.completionContext) return [];
@@ -34,7 +34,7 @@ export class FilterNamedParameterCompletionProvider implements Provider {
       return [];
     }
 
-    const filters = await this.themeDocset.filters();
+    const filters = await this.platformosDocset.filters();
     const foundFilter = filters.find((f) => f.name === currentContext.name);
 
     if (!foundFilter?.parameters) {
@@ -92,7 +92,7 @@ export class FilterNamedParameterCompletionProvider implements Provider {
     // If the cursor is inside the parameter or at the end and it's the same
     // value as the one we're offering a completion for then we want to restrict
     // the insert to just the name of the parameter.
-    // e.g. `{{ product | image_url: cr█op: 'center' }}` and we're offering `crop`
+    // e.g. `{{ context | parameterize: in█put: 'hello' }}` and we're offering `input`
     if (node.name + remainingText.slice(0, existingParameterOffset) == name) {
       newText = name;
       format = InsertTextFormat.PlainText;
@@ -101,8 +101,8 @@ export class FilterNamedParameterCompletionProvider implements Provider {
 
     // If the cursor is at the beginning of the string we can consider all
     // options and should not replace any text.
-    // e.g. `{{ product | image_url: █crop: 'center' }}`
-    // e.g. `{{ product | image_url: █ }}`
+    // e.g. `{{ context | parameterize: █input: 'hello' }}`
+    // e.g. `{{ context | parameterize: █ }}`
     if (node.name === '█') {
       end = start;
     }

package/src/completions/providers/HtmlAttributeCompletionProvider.spec.ts

@@ -3,7 +3,6 @@ import { DocumentManager } from '../../documents';
 import { CompletionsProvider } from '../CompletionsProvider';
 import { HtmlData } from '../../docset';
 import { sortByName } from './common';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
 
 const globalAttributeNames = [...HtmlData.globalAttributes].sort(sortByName).map((x) => x.name);
 const aTag = HtmlData.tags.find((x) => x.name === 'a')!;
@@ -15,15 +14,13 @@ describe('Module: HtmlAttributeCompletionProvider', async () => {
   beforeEach(async () => {
     provider = new CompletionsProvider({
       documentManager: new DocumentManager(),
-      themeDocset: {
+      platformosDocset: {
         graphQL: async () => null,
         filters: async () => [],
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
-      getMetafieldDefinitions: async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     });
   });
 

package/src/completions/providers/HtmlAttributeValueCompletionProvider.spec.ts

@@ -1,7 +1,6 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { DocumentManager } from '../../documents';
 import { CompletionsProvider } from '../CompletionsProvider';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
 
 describe('Module: HtmlAttributeValueCompletionProvider', async () => {
   let provider: CompletionsProvider;
@@ -9,15 +8,13 @@ describe('Module: HtmlAttributeValueCompletionProvider', async () => {
   beforeEach(async () => {
     provider = new CompletionsProvider({
       documentManager: new DocumentManager(),
-      themeDocset: {
+      platformosDocset: {
         graphQL: async () => null,
         filters: async () => [],
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
-      getMetafieldDefinitions: async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     });
   });
 

package/src/completions/providers/HtmlTagCompletionProvider.spec.ts

@@ -3,7 +3,6 @@ import { DocumentManager } from '../../documents';
 import { CompletionsProvider } from '../CompletionsProvider';
 import { HtmlData } from '../../docset';
 import { sortByName } from './common';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
 
 const allTagNames = [...HtmlData.tags].sort(sortByName).map((x) => x.name);
 
@@ -13,15 +12,13 @@ describe('Module: HtmlTagCompletionProvider', async () => {
   beforeEach(async () => {
     provider = new CompletionsProvider({
       documentManager: new DocumentManager(),
-      themeDocset: {
+      platformosDocset: {
         graphQL: async () => null,
         filters: async () => [],
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
-      getMetafieldDefinitions: async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     });
   });
 

package/src/completions/providers/LiquidDocParamTypeCompletionProvider.spec.ts

@@ -1,7 +1,6 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { CompletionsProvider } from '../CompletionsProvider';
 import { DocumentManager } from '../../documents';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
 import { BasicParamTypes } from '@platformos/platformos-check-common';
 
 describe('Module: LiquidDocParamTypeCompletionProvider', async () => {
@@ -10,7 +9,7 @@ describe('Module: LiquidDocParamTypeCompletionProvider', async () => {
   beforeEach(async () => {
     provider = new CompletionsProvider({
       documentManager: new DocumentManager(),
-      themeDocset: {
+      platformosDocset: {
         graphQL: async () => null,
         filters: async () => [],
         objects: async () => [],
@@ -20,9 +19,7 @@ describe('Module: LiquidDocParamTypeCompletionProvider', async () => {
           },
         ],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
-      getMetafieldDefinitions: async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     });
   });
 
@@ -37,13 +34,6 @@ describe('Module: LiquidDocParamTypeCompletionProvider', async () => {
     }
   });
 
-  it('offers completions within liquid doc tag for blocks', async () => {
-    await expect(provider).to.complete(
-      { source: `{% doc %} @█`, relativePath: 'file://blocks/file.liquid' },
-      ['param', 'example', 'description'],
-    );
-  });
-
   it("does not offer completion if it's not within liquid doc's param type tag", async () => {
     const sources = [
       `{% doc %} @param {}█`,
@@ -59,21 +49,4 @@ describe('Module: LiquidDocParamTypeCompletionProvider', async () => {
       );
     }
   });
-
-  it("does not offer completion if it's not within a snippet or block", async () => {
-    await expect(provider).to.complete(
-      { source: `{% doc %} @param {█`, relativePath: 'file://sections/file.liquid' },
-      [],
-    );
-
-    await expect(provider).to.complete(
-      { source: `{% doc %} @param {█`, relativePath: 'file://templates/file.liquid' },
-      [],
-    );
-
-    await expect(provider).to.complete(
-      { source: `{% doc %} @param {█`, relativePath: 'file://layout/file.liquid' },
-      [],
-    );
-  });
 });

package/src/completions/providers/LiquidDocParamTypeCompletionProvider.ts

@@ -6,11 +6,11 @@ import { filePathSupportsLiquidDoc } from '@platformos/platformos-check-common';
 import {
   getValidParamTypes,
   SupportedDocTagTypes,
-  ThemeDocset,
+  PlatformOSDocset,
 } from '@platformos/platformos-check-common';
 
 export class LiquidDocParamTypeCompletionProvider implements Provider {
-  constructor(private readonly themeDocset: ThemeDocset) {}
+  constructor(private readonly platformosDocset: PlatformOSDocset) {}
 
   async completions(params: LiquidCompletionParams): Promise<CompletionItem[]> {
     if (!params.completionContext) return [];
@@ -44,7 +44,7 @@ export class LiquidDocParamTypeCompletionProvider implements Provider {
       return [];
     }
 
-    const liquidDrops = await this.themeDocset.liquidDrops();
+    const liquidDrops = await this.platformosDocset.liquidDrops();
 
     return Array.from(getValidParamTypes(liquidDrops)).map(([label, description]) => {
       const documentation = description

package/src/completions/providers/LiquidDocTagCompletionProvider.spec.ts

@@ -1,7 +1,6 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { CompletionsProvider } from '../CompletionsProvider';
 import { DocumentManager } from '../../documents';
-import { MetafieldDefinitionMap } from '@platformos/platformos-check-common';
 
 describe('Module: LiquidDocTagCompletionProvider', async () => {
   let provider: CompletionsProvider;
@@ -9,15 +8,13 @@ describe('Module: LiquidDocTagCompletionProvider', async () => {
   beforeEach(async () => {
     provider = new CompletionsProvider({
       documentManager: new DocumentManager(),
-      themeDocset: {
+      platformosDocset: {
         graphQL: async () => null,
         filters: async () => [],
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => [],
-        systemTranslations: async () => ({}),
       },
-      getMetafieldDefinitions: async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     });
   });
 
@@ -32,13 +29,6 @@ describe('Module: LiquidDocTagCompletionProvider', async () => {
     );
   });
 
-  it('offers completions within liquid doc tag for blocks', async () => {
-    await expect(provider).to.complete(
-      { source: `{% doc %} @█`, relativePath: 'file://blocks/file.liquid' },
-      ['param', 'example', 'description'],
-    );
-  });
-
   it("does not offer completion if it doesn't start with @", async () => {
     await expect(provider).to.complete(
       { source: `{% doc %} █`, relativePath: 'file://app/views/partials/file.liquid' },
@@ -53,21 +43,6 @@ describe('Module: LiquidDocTagCompletionProvider', async () => {
     );
   });
 
-  it('does not offer completion if it is not a snippet file or block', async () => {
-    await expect(provider).to.complete(
-      { source: `{% doc %} @█`, relativePath: 'file://sections/file.liquid' },
-      [],
-    );
-    await expect(provider).to.complete(
-      { source: `{% doc %} @█`, relativePath: 'file://templates/file.liquid' },
-      [],
-    );
-    await expect(provider).to.complete(
-      { source: `{% doc %} @█`, relativePath: 'file://layout/file.liquid' },
-      [],
-    );
-  });
-
   describe('nodes that accept free-form text', () => {
     it('offers completions when @ is at the start of a new line following an implicit description', async () => {
       await expect(provider).to.complete(

package/src/completions/providers/LiquidTagsCompletionProvider.spec.ts

@@ -1,7 +1,7 @@
 import { describe, beforeEach, it, expect } from 'vitest';
 import { DocumentManager } from '../../documents';
 import { CompletionsProvider } from '../CompletionsProvider';
-import { MetafieldDefinitionMap, TagEntry } from '@platformos/platformos-check-common';
+import { TagEntry } from '@platformos/platformos-check-common';
 import { InsertTextFormat, InsertTextMode, TextEdit } from 'vscode-languageserver-protocol';
 
 const caseSyntax = `{% case variable %}
@@ -83,15 +83,13 @@ describe('Module: LiquidTagsCompletionProvider', async () => {
   beforeEach(async () => {
     provider = new CompletionsProvider({
       documentManager: new DocumentManager(),
-      themeDocset: {
+      platformosDocset: {
         graphQL: async () => null,
         filters: async () => [],
         objects: async () => [],
         liquidDrops: async () => [],
         tags: async () => tags,
-        systemTranslations: async () => ({}),
       },
-      getMetafieldDefinitions: async (_rootUri: string) => ({}) as MetafieldDefinitionMap,
     });
   });
 
@@ -109,9 +107,6 @@ describe('Module: LiquidTagsCompletionProvider', async () => {
     await expect(provider).to.complete('{% comment %} hello there {% end', ['endcomment']);
     await expect(provider).to.complete('{% if cond %} hello {% else %} then {% end', ['endif']);
     await expect(provider).to.complete('{% for i in (1..3) %}{% end', ['endfor']);
-    await expect(provider).to.complete('{% javascript %} console.log("hi") {% end', [
-      'endjavascript',
-    ]);
     await expect(provider).to.complete('{% form "cart", cart %} ... {% end', ['endform']);
   });
 
@@ -138,10 +133,6 @@ describe('Module: LiquidTagsCompletionProvider', async () => {
       'endif',
     ]);
     await expect(provider).to.complete('{% for i in (1..3) %}{% e', ['echo', 'endfor']);
-    await expect(provider).to.complete('{% javascript %} console.log("hi") {% e', [
-      'echo',
-      'endjavascript',
-    ]);
     await expect(provider).to.complete('{% form "cart", cart %} ... {% e', ['echo', 'endform']);
   });
 
@@ -149,7 +140,6 @@ describe('Module: LiquidTagsCompletionProvider', async () => {
     await expect(provider).to.complete('{% comment %} hello there {% endz', []);
     await expect(provider).to.complete('{% if cond %} hello {% else %} then {% endz', []);
     await expect(provider).to.complete('{% for i in (1..3) %}{% endz', []);
-    await expect(provider).to.complete('{% javascript %} console.log("hi") {% endz', []);
     await expect(provider).to.complete('{% form "cart", cart %} ... {% endz', []);
   });
 
@@ -165,10 +155,6 @@ describe('Module: LiquidTagsCompletionProvider', async () => {
       allTags.concat('endif'),
     );
     await expect(provider).to.complete('{% for i in (1..3) %}{% ', allTags.concat('endfor'));
-    await expect(provider).to.complete(
-      '{% javascript %} console.log("hi") {% ',
-      allTags.concat('endjavascript'),
-    );
     await expect(provider).to.complete(
       '{% form "cart", cart %} ... {% ',
       allTags.concat('endform'),

package/src/completions/providers/LiquidTagsCompletionProvider.ts

@@ -7,7 +7,7 @@ import {
   NodeTypes,
   RAW_TAGS,
 } from '@platformos/liquid-html-parser';
-import { TagEntry, ThemeDocset } from '@platformos/platformos-check-common';
+import { TagEntry, PlatformOSDocset } from '@platformos/platformos-check-common';
 import {
   CompletionItem,
   CompletionItemKind,
@@ -23,7 +23,7 @@ import { CURSOR, LiquidCompletionParams } from '../params';
 import { Provider, createCompletionItem, sortByName } from './common';
 
 export class LiquidTagsCompletionProvider implements Provider {
-  constructor(private readonly themeDocset: ThemeDocset) {}
+  constructor(private readonly platformosDocset: PlatformOSDocset) {}
 
   async completions(params: LiquidCompletionParams): Promise<CompletionItem[]> {
     if (!params.completionContext) return [];
@@ -39,7 +39,7 @@ export class LiquidTagsCompletionProvider implements Provider {
 
     const partial = node.name.replace(CURSOR, '');
     const blockParent = findParentNode(partial, ancestors);
-    const tags = await this.themeDocset.tags();
+    const tags = await this.platformosDocset.tags();
     return tags
       .filter(({ name }) => name.startsWith(partial))
       .sort(sortByName)