fix e2e

Author: MaxKless

apps/nxls-e2e/src/document-links/interpolated-path-link.test.ts

@@ -18,7 +18,7 @@ const projectJsonPath = join(
   workspaceName,
   'apps',
   workspaceName,
-  'project.json'
+  'project.json',
 );
 
 describe('interpolated path links', () => {
@@ -41,8 +41,8 @@ describe('interpolated path links', () => {
           interpolatedProject: '{projectRoot}/project.json',
         },
         null,
-        2
-      )
+        2,
+      ),
     );
     nxlsWrapper = new NxlsWrapper(true);
     await nxlsWrapper.startNxls(join(e2eCwd, workspaceName));
@@ -64,26 +64,62 @@ describe('interpolated path links', () => {
   });
 
   it('should return correct links for {workspaceRoot} and {projectRoot}', async () => {
-    const linkResponse = await nxlsWrapper.sendRequest({
+    const text = readFileSync(projectJsonPath, 'utf-8');
+    const lines = text.split('\n');
+
+    // Check workspace link
+    const workspaceLine = lines.findIndex((line) =>
+      line.includes('{workspaceRoot}/nx.json'),
+    );
+    const workspaceChar = lines[workspaceLine].indexOf(
+      '{workspaceRoot}/nx.json',
+    );
+
+    const workspaceLinkResponse = await nxlsWrapper.sendRequest({
       method: 'textDocument/documentLink',
       params: {
         textDocument: {
           uri: URI.file(projectJsonPath).toString(),
         },
-        position: Position.create(0, 1),
+        position: Position.create(workspaceLine, workspaceChar + 1),
       },
     });
 
-    const links = linkResponse.result as any[];
-    
-    const workspaceLink = links.find(l => l.target && l.target.endsWith('nx.json'));
-    const projectLink = links.find(l => l.target && l.target.endsWith('project.json'));
-
+    const workspaceLinks = workspaceLinkResponse.result as any[];
+    const workspaceLink = workspaceLinks.find(
+      (l) => l.target && l.target.endsWith('nx.json'),
+    );
     expect(workspaceLink).toBeDefined();
-    expect(decodeURI(workspaceLink.target)).toContain(join(workspaceName, 'nx.json'));
+    expect(decodeURI(workspaceLink.target)).toContain(
+      join(workspaceName, 'nx.json'),
+    );
+
+    // Check project link
+    const projectLine = lines.findIndex((line) =>
+      line.includes('{projectRoot}/project.json'),
+    );
+    const projectChar = lines[projectLine].indexOf(
+      '{projectRoot}/project.json',
+    );
 
+    const projectLinkResponse = await nxlsWrapper.sendRequest({
+      method: 'textDocument/documentLink',
+      params: {
+        textDocument: {
+          uri: URI.file(projectJsonPath).toString(),
+        },
+        position: Position.create(projectLine, projectChar + 1),
+      },
+    });
+
+    const projectLinks = projectLinkResponse.result as any[];
+    const projectLink = projectLinks.find(
+      (l) => l.target && l.target.endsWith('project.json'),
+    );
     expect(projectLink).toBeDefined();
-    expect(decodeURI(projectLink.target)).toContain(join(workspaceName, 'apps', workspaceName, 'project.json'));
+    expect(decodeURI(projectLink.target)).toContain(
+      join(workspaceName, 'apps', workspaceName, 'project.json'),
+    );
   });
 
   it('should return correct links for negated {workspaceRoot} and {projectRoot}', async () => {
@@ -109,33 +145,62 @@ describe('interpolated path links', () => {
       },
     });
 
-    const linkResponse = await nxlsWrapper.sendRequest({
+    const text = readFileSync(projectJsonPath, 'utf-8');
+    writeFileSync('/tmp/debug-project.json', text);
+    const lines = text.split('\n');
+
+    // Check workspace link
+    const workspaceLine = lines.findIndex((line) =>
+      line.includes('!{workspaceRoot}/nx.json'),
+    );
+    const workspaceChar = lines[workspaceLine].indexOf(
+      '!{workspaceRoot}/nx.json',
+    );
+
+    const workspaceLinkResponse = await nxlsWrapper.sendRequest({
       method: 'textDocument/documentLink',
       params: {
         textDocument: {
           uri: URI.file(projectJsonPath).toString(),
         },
-        position: Position.create(0, 1),
+        position: Position.create(workspaceLine, workspaceChar + 1),
       },
     });
 
-    const links = linkResponse.result as any[];
-
-    const workspaceLink = links.find(
-      (l) => l.target && l.target.endsWith('nx.json')
-    );
-    const projectLink = links.find(
-      (l) => l.target && l.target.endsWith('project.json')
+    const workspaceLinks = workspaceLinkResponse.result as any[];
+    const workspaceLink = workspaceLinks.find(
+      (l) => l.target && l.target.endsWith('nx.json'),
     );
-
     expect(workspaceLink).toBeDefined();
     expect(decodeURI(workspaceLink.target)).toContain(
-      join(workspaceName, 'nx.json')
+      join(workspaceName, 'nx.json'),
+    );
+
+    // Check project link
+    const projectLine = lines.findIndex((line) =>
+      line.includes('!{projectRoot}/project.json'),
     );
+    const projectChar = lines[projectLine].indexOf(
+      '!{projectRoot}/project.json',
+    );
+
+    const projectLinkResponse = await nxlsWrapper.sendRequest({
+      method: 'textDocument/documentLink',
+      params: {
+        textDocument: {
+          uri: URI.file(projectJsonPath).toString(),
+        },
+        position: Position.create(projectLine, projectChar + 1),
+      },
+    });
 
+    const projectLinks = projectLinkResponse.result as any[];
+    const projectLink = projectLinks.find(
+      (l) => l.target && l.target.endsWith('project.json'),
+    );
     expect(projectLink).toBeDefined();
     expect(decodeURI(projectLink.target)).toContain(
-      join(workspaceName, 'apps', workspaceName, 'project.json')
+      join(workspaceName, 'apps', workspaceName, 'project.json'),
     );
   });
 });

libs/language-server/capabilities/document-links/src/lib/get-document-links.spec.ts

@@ -86,8 +86,8 @@ it('should get document links for interpolated paths', async () => {
   "interpolatedProject": "{projectRoot}/src/main.ts",
   "interpolatedGlob": "{projectRoot}/**/*.ts"
 }
-      `
-    )
+      `,
+    ),
   );
 
   const matchingSchemas = await languageService.getMatchingSchemas(
@@ -100,14 +100,14 @@ it('should get document links for interpolated paths', async () => {
         interpolatedProject: { type: 'string' },
         interpolatedGlob: { type: 'string' },
       },
-    }
+    },
   );
 
   const documentLinks = await getDocumentLinks(
     '/workspace',
     jsonAst,
     document,
-    matchingSchemas
+    matchingSchemas,
   );
 
   expect(documentLinks.map((link) => link.target)).toEqual([
@@ -129,8 +129,8 @@ it('should get document links for negated interpolated paths', async () => {
   "interpolatedWorkspace": "!{workspaceRoot}/libs/my-lib/src/index.ts",
   "interpolatedProject": "!{projectRoot}/src/main.ts"
 }
-      `
-    )
+      `,
+    ),
   );
 
   const matchingSchemas = await languageService.getMatchingSchemas(
@@ -142,14 +142,14 @@ it('should get document links for negated interpolated paths', async () => {
         interpolatedWorkspace: { type: 'string' },
         interpolatedProject: { type: 'string' },
       },
-    }
+    },
   );
 
   const documentLinks = await getDocumentLinks(
     '/workspace',
     jsonAst,
     document,
-    matchingSchemas
+    matchingSchemas,
   );
 
   expect(documentLinks.map((link) => link.target)).toEqual([
@@ -372,5 +372,4 @@ describe('project links', () => {
 
     documentMapper.dispose();
   });
-})
-
+});

libs/language-server/capabilities/document-links/src/lib/get-document-links.ts

@@ -16,8 +16,7 @@ import {
   JSONDocument,
   MatchingSchema,
   TextDocument,
-}
-from 'vscode-json-languageservice';
+} from 'vscode-json-languageservice';
 import { createRange } from './create-range';
 import { targetLink } from './target-link';
 import { namedInputLink } from './named-input-link';

libs/language-server/capabilities/document-links/src/lib/interpolated-path-link.ts

@@ -9,7 +9,7 @@ import { URI } from 'vscode-uri';
 
 export async function interpolatedPathLink(
   workingPath: string,
-  node: ASTNode
+  node: ASTNode,
 ): Promise<string | undefined> {
   if (!isStringNode(node)) {
     return;