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

package/src/documentLinks/DocumentLinksProvider.ts

@@ -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

@@ -20,7 +20,7 @@ describe('Module: DocumentManager', () => {
   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('\\');
@@ -37,8 +37,8 @@ describe('Module: DocumentManager', () => {
     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:',
       );
@@ -52,14 +52,18 @@ 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);
       });
@@ -78,9 +82,13 @@ describe('Module: DocumentManager', () => {
 
       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);
@@ -90,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);
         });
       });
@@ -131,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,
       );

package/src/documents/DocumentManager.ts

@@ -1,5 +1,6 @@
 import {
   assertNever,
+  isKnownLiquidFile,
   memoize,
   path,
   recursiveReadDirectory,
@@ -78,8 +79,12 @@ export class DocumentManager {
   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,
+        // 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;
   }
 

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

@@ -6,7 +6,7 @@ import { formatLiquidDocTagHandle, SUPPORTED_LIQUID_DOC_TAG_HANDLES } from '../.
 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(() => {

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

@@ -6,11 +6,11 @@ import { GetDocDefinitionForURI, DocDefinition } from '@platformos/platformos-ch
 import { TranslationProvider } from '@platformos/platformos-common';
 import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
 
-const uri = 'file:///snippets/product-card.liquid';
+const uri = 'file:///app/views/partials/product-card.liquid';
 
-describe('Module: RenderSnippetHoverProvider', async () => {
+describe('Module: RenderPartialHoverProvider', async () => {
   let provider: HoverProvider;
-  const mockSnippetDefinition: DocDefinition = {
+  const mockPartialDefinition: DocDefinition = {
     uri,
     liquidDoc: {
       parameters: [
@@ -36,10 +36,10 @@ describe('Module: RenderSnippetHoverProvider', async () => {
   };
 
   describe('hover', () => {
-    it('should return snippet definition with all parameters', async () => {
-      provider = createProvider(async () => mockSnippetDefinition);
+    it('should return partial definition with all parameters', async () => {
+      provider = createProvider(async () => mockPartialDefinition);
       // prettier-ignore
-      const expectedHoverContent = 
+      const expectedHoverContent =
 `### product-card
 
 **Description:**
@@ -59,13 +59,13 @@ This is a description
     });
 
     it('should return nothing if not in render tag', async () => {
-      await expect(provider).to.hover(`{% assign asdf = 'snip█pet' %}`, null);
-      await expect(provider).to.hover(`{{ 'snip█pet' }}`, null);
+      await expect(provider).to.hover(`{% assign asdf = 'any-str█ing' %}`, null);
+      await expect(provider).to.hover(`{{ 'any-str█ing' }}`, null);
     });
   });
 });
 
-const createProvider = (getSnippetDefinition: GetDocDefinitionForURI) => {
+const createProvider = (getPartialDefinition: GetDocDefinitionForURI) => {
   return new HoverProvider(
     new DocumentManager(),
     {
@@ -77,6 +77,6 @@ const createProvider = (getSnippetDefinition: GetDocDefinitionForURI) => {
     },
     new TranslationProvider(new MockFileSystem({})),
     async () => ({}),
-    getSnippetDefinition,
+    getPartialDefinition,
   );
 };

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

@@ -6,12 +6,12 @@ import { GetDocDefinitionForURI, DocDefinition } from '@platformos/platformos-ch
 import { TranslationProvider } from '@platformos/platformos-common';
 import { MockFileSystem } from '@platformos/platformos-check-common/src/test';
 
-const uri = 'file:///snippets/product-card.liquid';
+const uri = 'file:///app/views/partials/product-card.liquid';
 
-describe('Module: RenderSnippetParameterHoverProvider', async () => {
+describe('Module: RenderPartialParameterHoverProvider', async () => {
   let provider: HoverProvider;
-  let getSnippetDefinition: GetDocDefinitionForURI;
-  const mockSnippetDefinition: DocDefinition = {
+  let getPartialDefinition: GetDocDefinitionForURI;
+  const mockPartialDefinition: DocDefinition = {
     uri,
     liquidDoc: {
       parameters: [
@@ -28,12 +28,12 @@ describe('Module: RenderSnippetParameterHoverProvider', async () => {
 
   describe('hover', () => {
     beforeEach(() => {
-      provider = createProvider(async () => mockSnippetDefinition);
+      provider = createProvider(async () => mockPartialDefinition);
     });
 
     it('should return null if doc definition not found', async () => {
-      getSnippetDefinition = async () => undefined;
-      provider = createProvider(getSnippetDefinition);
+      getPartialDefinition = async () => undefined;
+      provider = createProvider(getPartialDefinition);
       await expect(provider).to.hover(`{% render 'product-card' tit█le: 'value' %}`, null);
     });
 
@@ -50,7 +50,7 @@ describe('Module: RenderSnippetParameterHoverProvider', async () => {
   });
 });
 
-const createProvider = (getSnippetDefinition: GetDocDefinitionForURI) => {
+const createProvider = (getPartialDefinition: GetDocDefinitionForURI) => {
   return new HoverProvider(
     new DocumentManager(),
     {
@@ -62,6 +62,6 @@ const createProvider = (getSnippetDefinition: GetDocDefinitionForURI) => {
     },
     new TranslationProvider(new MockFileSystem({})),
     async () => ({}),
-    getSnippetDefinition,
+    getPartialDefinition,
   );
 };

package/src/hover/providers/RenderPartialParameterHoverProvider.ts

@@ -17,14 +17,14 @@ export class RenderPartialParameterHoverProvider implements BaseHoverProvider {
       currentNode.type !== NodeTypes.NamedArgument ||
       !parentNode ||
       parentNode.type !== NodeTypes.RenderMarkup ||
-      parentNode.snippet.type !== NodeTypes.String
+      parentNode.partial.type !== NodeTypes.String
     ) {
       return null;
     }
 
     const docDefinition = await this.getDocDefinitionForURI(
       params.textDocument.uri,
-      parentNode.snippet.value,
+      parentNode.partial.value,
     );
 
     const paramName = currentNode.name;

package/src/index.ts

@@ -1,5 +1,5 @@
 import {
-  Config as ThemeCheckConfig,
+  Config as PlatformOSCheckConfig,
   allChecks,
   recommended as recommendedChecks,
   SourceCodeType,
@@ -20,7 +20,7 @@ export {
 export { debounce, memo, parseJSON, ArgumentTypes } from './utils';
 export { startServer } from './server';
 export {
-  ThemeCheckConfig,
+  PlatformOSCheckConfig,
   recommendedChecks,
   allChecks,
   AbstractFileSystem,

package/src/rename/RenameProvider.ts

@@ -17,7 +17,7 @@ import { ClientCapabilities } from '../ClientCapabilities';
 import { FindAppRootURI } from '../internal-types';
 
 /**
- * RenameProvider is responsible for providing rename support for the theme language server.
+ * RenameProvider is responsible for providing rename support for the platformOS language server.
  *
  * Rename is a pretty abstract concept, it can be renaming a tag name, a variable, a class name, etc.
  */

package/src/rename/providers/LiquidVariableRenameProvider.spec.ts

@@ -507,5 +507,5 @@ function createSectionWithSource(
 }
 
 function getSectionUri(sectionName: string) {
-  return `${mockRoot}///sections/${sectionName}.liquid`;
+  return `${mockRoot}///app/views/partials/${sectionName}.liquid`;
 }

package/src/rename/providers/LiquidVariableRenameProvider.ts

@@ -104,8 +104,8 @@ export class LiquidVariableRenameProvider implements BaseRenameProvider {
     });
 
     if (this.clientCapabilities.hasApplyEditSupport && liquidDocParamUpdated) {
-      const themeFiles = this.documentManager.app(rootUri, true);
-      const liquidSourceCodes = themeFiles.filter(isLiquidSourceCode);
+      const appFiles = this.documentManager.app(rootUri, true);
+      const liquidSourceCodes = appFiles.filter(isLiquidSourceCode);
       const name = partialName(params.textDocument.uri);
 
       await updateRenderTags(this.connection, liquidSourceCodes, name, oldName, params.newName);
@@ -242,7 +242,7 @@ async function updateRenderTags(
     const textDocument = sourceCode.textDocument;
     const edits: TextEdit[] = await visit<SourceCodeType.LiquidHtml, TextEdit>(sourceCode.ast, {
       async RenderMarkup(node: RenderMarkup) {
-        if (node.snippet.type !== NodeTypes.String || node.snippet.value !== partialName) {
+        if (node.partial.type !== NodeTypes.String || node.partial.value !== partialName) {
           return;
         }
 

package/src/renamed/handlers/AssetRenameHandler.spec.ts

@@ -22,9 +22,9 @@ describe('Module: AssetRenameHandler', () => {
     capabilities = new ClientCapabilities();
     fs = new MockFileSystem(
       {
-        'assets/oldName.js': 'console.log("Hello, world!")',
-        'sections/section.liquid': `<script src="{{ 'oldName.js' | asset_url }}" defer></script>`,
-        'blocks/block.liquid': `{{ 'oldName.js' | asset_url | script_tag }} oldName.js`,
+        'app/assets/oldName.js': 'console.log("Hello, world!")',
+        'app/views/partials/section.liquid': `<script src="{{ 'oldName.js' | asset_url }}" defer></script>`,
+        'app/views/partials/block.liquid': `{{ 'oldName.js' | asset_url | script_tag }} oldName.js`,
       },
       mockRoot,
     );
@@ -45,8 +45,8 @@ describe('Module: AssetRenameHandler', () => {
       await handler.onDidRenameFiles({
         files: [
           {
-            oldUri: 'mock-fs:/assets/oldName.js',
-            newUri: 'mock-fs:/assets/newName.js',
+            oldUri: 'mock-fs:/app/assets/oldName.js',
+            newUri: 'mock-fs:/app/assets/newName.js',
           },
         ],
       });
@@ -67,8 +67,8 @@ describe('Module: AssetRenameHandler', () => {
       await handler.onDidRenameFiles({
         files: [
           {
-            oldUri: 'mock-fs:/assets/oldName.js',
-            newUri: 'mock-fs:/assets/newName.js',
+            oldUri: 'mock-fs:/app/assets/oldName.js',
+            newUri: 'mock-fs:/app/assets/newName.js',
           },
         ],
       });
@@ -90,7 +90,7 @@ describe('Module: AssetRenameHandler', () => {
           documentChanges: [
             {
               textDocument: {
-                uri: 'mock-fs:/sections/section.liquid',
+                uri: 'mock-fs:/app/views/partials/section.liquid',
                 version: null,
               },
               edits: [expectedTextEdit],
@@ -98,7 +98,7 @@ describe('Module: AssetRenameHandler', () => {
             },
             {
               textDocument: {
-                uri: 'mock-fs:/blocks/block.liquid',
+                uri: 'mock-fs:/app/views/partials/block.liquid',
                 version: null,
               },
               edits: [expectedTextEdit],
@@ -113,8 +113,8 @@ describe('Module: AssetRenameHandler', () => {
       await handler.onDidRenameFiles({
         files: [
           {
-            oldUri: 'mock-fs:/assets/oldName.js',
-            newUri: 'mock-fs:/assets/newName.js',
+            oldUri: 'mock-fs:/app/assets/oldName.js',
+            newUri: 'mock-fs:/app/assets/newName.js',
           },
         ],
       });
@@ -122,9 +122,9 @@ describe('Module: AssetRenameHandler', () => {
       const params: ApplyWorkspaceEditParams = connection.spies.sendRequest.mock.calls[0][1];
       const expectedFs = new MockFileSystem(
         {
-          'assets/oldName.js': 'console.log("Hello, world!")',
-          'sections/section.liquid': `<script src="{{ 'newName.js' | asset_url }}" defer></script>`,
-          'blocks/block.liquid': `{{ 'newName.js' | asset_url | script_tag }} oldName.js`,
+          'app/assets/oldName.js': 'console.log("Hello, world!")',
+          'app/views/partials/section.liquid': `<script src="{{ 'newName.js' | asset_url }}" defer></script>`,
+          'app/views/partials/block.liquid': `{{ 'newName.js' | asset_url | script_tag }} oldName.js`,
         },
         'mock-fs:',
       );
@@ -145,8 +145,8 @@ describe('Module: AssetRenameHandler', () => {
       await handler.onDidRenameFiles({
         files: [
           {
-            oldUri: 'mock-fs:/assets/oldName.js',
-            newUri: `mock-fs:/assets/newName.js.liquid`,
+            oldUri: 'mock-fs:/app/assets/oldName.js',
+            newUri: `mock-fs:/app/assets/newName.js.liquid`,
           },
         ],
       });
@@ -154,9 +154,9 @@ describe('Module: AssetRenameHandler', () => {
       const params: ApplyWorkspaceEditParams = connection.spies.sendRequest.mock.calls[0][1];
       const expectedFs = new MockFileSystem(
         {
-          'assets/oldName.js': 'console.log("Hello, world!")',
-          'sections/section.liquid': `<script src="{{ 'newName.js' | asset_url }}" defer></script>`,
-          'blocks/block.liquid': `{{ 'newName.js' | asset_url | script_tag }} oldName.js`,
+          'app/assets/oldName.js': 'console.log("Hello, world!")',
+          'app/views/partials/section.liquid': `<script src="{{ 'newName.js' | asset_url }}" defer></script>`,
+          'app/views/partials/block.liquid': `{{ 'newName.js' | asset_url | script_tag }} oldName.js`,
         },
         'mock-fs:',
       );
@@ -176,8 +176,8 @@ describe('Module: AssetRenameHandler', () => {
     it('handles .css.liquid files', async () => {
       fs = new MockFileSystem(
         {
-          'assets/oldName.css.liquid': 'body { color: red; }',
-          'sections/section.liquid': `{% echo 'oldName.css' | asset_url | stylesheet_tag %}`,
+          'app/assets/oldName.css.liquid': 'body { color: red; }',
+          'app/views/partials/section.liquid': `{% echo 'oldName.css' | asset_url | stylesheet_tag %}`,
         },
         'mock-fs:',
       );
@@ -187,8 +187,8 @@ describe('Module: AssetRenameHandler', () => {
       await handler.onDidRenameFiles({
         files: [
           {
-            oldUri: 'mock-fs:/assets/oldName.css.liquid',
-            newUri: `mock-fs:/assets/newName.css.liquid`,
+            oldUri: 'mock-fs:/app/assets/oldName.css.liquid',
+            newUri: `mock-fs:/app/assets/newName.css.liquid`,
           },
         ],
       });
@@ -196,8 +196,8 @@ describe('Module: AssetRenameHandler', () => {
       const params: ApplyWorkspaceEditParams = connection.spies.sendRequest.mock.calls[0][1];
       const expectedFs = new MockFileSystem(
         {
-          'assets/newName.css.liquid': 'body { color: red; }',
-          'sections/section.liquid': `{% echo 'newName.css' | asset_url | stylesheet_tag %}`,
+          'app/assets/newName.css.liquid': 'body { color: red; }',
+          'app/views/partials/section.liquid': `{% echo 'newName.css' | asset_url | stylesheet_tag %}`,
         },
         'mock-fs:',
       );

package/src/renamed/handlers/AssetRenameHandler.ts

@@ -22,7 +22,7 @@ import { FindAppRootURI } from '../../internal-types';
  *
  * We'll do that for `.(css|js).liquid` files as well
  *
- * We'll do this by visiting all the liquid files in the theme and looking for
+ * We'll do this by visiting all the liquid files in the app and looking for
  * string | asset_url Variable nodes that reference the old asset. We'll then create a
  * WorkspaceEdit that changes the references to the new asset.
  */

package/src/renamed/handlers/PartialRenameHandler.spec.ts

@@ -21,8 +21,8 @@ describe('Module: PartialRenameHandler', () => {
     capabilities = new ClientCapabilities();
     fs = new MockFileSystem(
       {
-        'sections/section.liquid': `<div>{% render 'oldName', foo: 'bar' %}oldName</div>`,
-        'blocks/block.liquid': `<div>{% render 'oldName', foo: 'baz' %}</div>`,
+        'app/views/partials/page.liquid': `<div>{% render 'oldName', foo: 'bar' %}oldName</div>`,
+        'app/lib/component.liquid': `<div>{% render 'oldName', foo: 'baz' %}</div>`,
         'app/views/partials/oldName.liquid': `<div>oldName{%</div>`,
         'app/views/partials/other.liquid': `<div>{% render 'oldName' %}{% render 'other' %}</div>`,
       },
@@ -90,7 +90,7 @@ describe('Module: PartialRenameHandler', () => {
           documentChanges: [
             {
               textDocument: {
-                uri: 'mock-fs:/sections/section.liquid',
+                uri: 'mock-fs:/app/views/partials/page.liquid',
                 version: null,
               },
               edits: [expectedTextEdit],
@@ -98,7 +98,7 @@ describe('Module: PartialRenameHandler', () => {
             },
             {
               textDocument: {
-                uri: 'mock-fs:/blocks/block.liquid',
+                uri: 'mock-fs:/app/views/partials/other.liquid',
                 version: null,
               },
               edits: [expectedTextEdit],
@@ -106,7 +106,7 @@ describe('Module: PartialRenameHandler', () => {
             },
             {
               textDocument: {
-                uri: 'mock-fs:/app/views/partials/other.liquid',
+                uri: 'mock-fs:/app/lib/component.liquid',
                 version: null,
               },
               edits: [expectedTextEdit],
@@ -130,8 +130,8 @@ describe('Module: PartialRenameHandler', () => {
       const params: ApplyWorkspaceEditParams = connection.spies.sendRequest.mock.calls[0][1];
       const expectedFs = new MockFileSystem(
         {
-          'sections/section.liquid': `<div>{% render 'newName', foo: 'bar' %}oldName</div>`,
-          'blocks/block.liquid': `<div>{% render 'newName', foo: 'baz' %}</div>`,
+          'app/views/partials/page.liquid': `<div>{% render 'newName', foo: 'bar' %}oldName</div>`,
+          'app/lib/component.liquid': `<div>{% render 'newName', foo: 'baz' %}</div>`,
           'app/views/partials/newName.liquid': `<div>oldName{%</div>`,
           'app/views/partials/other.liquid': `<div>{% render 'newName' %}{% render 'other' %}</div>`,
         },

package/src/renamed/handlers/PartialRenameHandler.ts

@@ -22,7 +22,7 @@ import { FindAppRootURI } from '../../internal-types';
  *
  *   {% render 'oldName' %} -> {% render 'newName' %}
  *
- * We'll do this by visiting all the liquid files in the theme and looking for
+ * We'll do this by visiting all the liquid files in the app and looking for
  * render and include tags that reference the old partial. We'll then create a
  * WorkspaceEdit that changes the references to the new partial.
  */
@@ -73,13 +73,13 @@ export class PartialRenameHandler implements BaseRenameHandler {
           if (typeof node.markup === 'string') {
             return;
           }
-          const snippet = node.markup.snippet;
-          if (snippet.type === NodeTypes.String && snippet.value === oldPartialName) {
+          const partial = node.markup.partial;
+          if (partial.type === NodeTypes.String && partial.value === oldPartialName) {
             return {
               newText: `${newPartialName}`,
               range: Range.create(
-                textDocument.positionAt(snippet.position.start + 1), // +1 to skip the opening quote
-                textDocument.positionAt(snippet.position.end - 1), // -1 to skip the closing quote
+                textDocument.positionAt(partial.position.start + 1), // +1 to skip the opening quote
+                textDocument.positionAt(partial.position.end - 1), // -1 to skip the closing quote
               ),
             };
           }

package/src/server/safe.ts

@@ -14,7 +14,7 @@
  * @param defaultReturnValue
  *
  * @example
- * const getThemeBlockNames = safe(async function () { ... }, []);
+ * const getPartialNames = safe(async function () { ... }, []);
  */
 export const safe = <T extends (...args: any[]) => Promise<any>>(
   fn: T,

package/src/server/startServer.spec.ts

@@ -16,8 +16,8 @@ import { startServer } from './startServer';
 const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 describe('Module: server', () => {
-  const mockRoot = path.normalize('browser:/theme');
-  const filePath = 'app/code.liquid';
+  const mockRoot = path.normalize('browser:/app');
+  const filePath = 'app/views/partials/code.liquid';
   const fileURI = path.join(mockRoot, filePath);
   const fileContents = `{% render 'foo' %}`;
   let checkOnChange: boolean | null = null;
@@ -60,7 +60,7 @@ describe('Module: server', () => {
 
     fileTree = {
       '.pos': '',
-      'app/code.liquid': fileContents,
+      'app/views/partials/code.liquid': fileContents,
       '.git/test': 'test',
       'modules/test': 'test',
     };

package/src/server/startServer.ts

@@ -362,18 +362,17 @@ export function startServer(
       runChecks([uri]);
     }
 
-    // The objective at the time of writing this is to make {Asset,Snippet}Rename
+    // The objective at the time of writing this is to make {Asset,Partial}Rename
     // fast when you eventually need it.
     //
     // I'm choosing the textDocument/didOpen notification as a hook because
     // I'm not sure we have a better solution than this. Yes we have the
     // initialize request with the workspace folders, but you might have opened
-    // an app folder. The root of a theme app extension would probably be
-    // at ${workspaceRoot}/extensions/${appExtensionName}. It'd be hard to
-    // figure out from the initialize request params.
+    // an app folder. It'd be hard to figure out the root from the
+    // initialize request params alone.
     //
     // If we open a file that we know is liquid, then we can kind of guarantee
-    // we'll find a theme root and we'll preload that.
+    // we'll find an app root and we'll preload that.
     if (await configuration.shouldPreloadOnBoot()) {
       const rootUri = await findAppRootURI(uri);
       if (rootUri) {

package/src/utils/debounce.ts

@@ -27,7 +27,7 @@ export interface DebouncedFunction<F extends Function> {
  * This is useful in cases where you have an "expensive" function that you only want
  * to execute after the user is idle for a little bit.
  *
- * e.g. Run theme check after the user has stopped typing for at least 100ms.
+ * e.g. Run platformos-check after the user has stopped typing for at least 100ms.
  *
  * The debounced function has the same type signature as its argument.
  *