TML-2984: map interpreter spans via source offsets; family-neutral fixture stubs

The span-to-range mapping now recovers positions from the span offsets
through SourceFile.positionAt -- the literal inverse of how
rangeToPslSpan derives them -- which also keeps the framework packages
family-vocabulary-clean. Test stubs stop borrowing family names for
arbitrary strings.

Signed-off-by: Serhii Tatarintsev <tatarintsev@prisma.io>

Author: SevInf

packages/1-framework/3-tooling/language-server/src/diagnostic-mapping.ts

@@ -2,7 +2,7 @@ import type {
   ContractSourceDiagnostic,
   ContractSourceDiagnosticSpan,
 } from '@prisma-next/config/config-types';
-import type { ParseDiagnostic, Range } from '@prisma-next/psl-parser/syntax';
+import type { ParseDiagnostic, Range, SourceFile } from '@prisma-next/psl-parser/syntax';
 
 export const ParseDiagnosticSeverity = {
   Error: 1,
@@ -38,20 +38,25 @@ const documentStartRange: Range = {
 
 export function mapInterpreterDiagnostics(
   diagnostics: readonly ContractSourceDiagnostic[],
+  sourceFile: SourceFile,
 ): readonly LspDiagnostic[] {
   return diagnostics.map((diagnostic) => ({
-    range: diagnostic.span === undefined ? documentStartRange : pslSpanToRange(diagnostic.span),
+    range:
+      diagnostic.span === undefined
+        ? documentStartRange
+        : pslSpanToRange(diagnostic.span, sourceFile),
     message: diagnostic.message,
     code: diagnostic.code,
     severity: ParseDiagnosticSeverity.Error,
   }));
 }
 
-// Inverse of psl-parser's rangeToPslSpan: spans carry 1-based line/column,
-// LSP ranges are 0-based line/character.
-function pslSpanToRange(span: ContractSourceDiagnosticSpan): Range {
+// Inverse of psl-parser's rangeToPslSpan, which derives every span position
+// from a source offset: recovering the 0-based LSP position from that same
+// offset round-trips exactly.
+function pslSpanToRange(span: ContractSourceDiagnosticSpan, sourceFile: SourceFile): Range {
   return {
-    start: { line: span.start.line - 1, character: span.start.column - 1 },
-    end: { line: span.end.line - 1, character: span.end.column - 1 },
+    start: sourceFile.positionAt(span.start.offset),
+    end: sourceFile.positionAt(span.end.offset),
   };
 }

packages/1-framework/3-tooling/language-server/src/project-artifacts.ts

@@ -67,7 +67,10 @@ export function createProjectArtifacts(options: ProjectArtifactsOptions): Projec
           },
           interpretation.context,
         );
-        memo = mapInterpreterDiagnostics(result.ok ? [] : result.failure.diagnostics);
+        memo = mapInterpreterDiagnostics(
+          result.ok ? [] : result.failure.diagnostics,
+          computed.sourceFile,
+        );
       }
       return memo;
     };

packages/1-framework/3-tooling/language-server/test/config-resolution.test.ts

@@ -35,7 +35,7 @@ function interpretCapableConfig(inputs: readonly string[]): PrismaNextConfig {
 function stubStackWithContext(): ControlStack {
   return {
     extensionPacks: [{ id: 'ext-a' }, { id: 'ext-b' }],
-    extensionContracts: new Map([['ext-a', { targetFamily: 'sql' }]]),
+    extensionContracts: new Map([['ext-a', { targetFamily: 'demo' }]]),
     scalarTypeDescriptors: new Map([['Int', 'int']]),
     authoringContributions: {
       field: {},
@@ -49,7 +49,7 @@ function stubStackWithContext(): ControlStack {
       defaultFunctionRegistry: new Map(),
       generatorDescriptors: [],
     },
-    capabilities: { sql: { scalarList: true } },
+    capabilities: { demo: { scalarList: true } },
   } as unknown as ControlStack;
 }
 

packages/1-framework/3-tooling/language-server/test/diagnostic-mapping.test.ts

@@ -34,41 +34,48 @@ describe('mapParseDiagnostics', () => {
 });
 
 describe('mapInterpreterDiagnostics', () => {
-  it('maps a 1-based span to a 0-based LSP range (hand-computed)', () => {
+  const text = 'model User {\n  id Int @id\n  posts Post[]\n}\n';
+  const sourceFile = new SourceFile(text);
+
+  it('maps a span to a 0-based LSP range (hand-computed)', () => {
+    // Offsets 28..33 sit on the third line ("  posts Post[]"), landing on
+    // "posts": 0-based positions {2,2}..{2,7}.
     const diagnostic: ContractSourceDiagnostic = {
       code: 'PSL_UNRESOLVED_RELATION',
       message: 'relation target not found',
       span: {
-        start: { offset: 20, line: 3, column: 3 },
-        end: { offset: 27, line: 3, column: 10 },
+        start: { offset: 28, line: 3, column: 3 },
+        end: { offset: 33, line: 3, column: 8 },
       },
     };
 
-    const [mapped] = mapInterpreterDiagnostics([diagnostic]);
+    const [mapped] = mapInterpreterDiagnostics([diagnostic], sourceFile);
 
     expect(mapped).toEqual({
-      range: { start: { line: 2, character: 2 }, end: { line: 2, character: 9 } },
+      range: { start: { line: 2, character: 2 }, end: { line: 2, character: 7 } },
       message: 'relation target not found',
       code: 'PSL_UNRESOLVED_RELATION',
       severity: ParseDiagnosticSeverity.Error,
     });
   });
 
   it('inverts rangeToPslSpan for a span produced from a real source file', () => {
-    const text = 'model User {\n  id Int @id\n  posts Post[]\n}\n';
-    const sourceFile = new SourceFile(text);
     const range = { start: { line: 2, character: 2 }, end: { line: 2, character: 7 } };
     const span = rangeToPslSpan(range, sourceFile);
 
-    const [mapped] = mapInterpreterDiagnostics([{ code: 'PSL_DEMO', message: 'demo', span }]);
+    const [mapped] = mapInterpreterDiagnostics(
+      [{ code: 'PSL_DEMO', message: 'demo', span }],
+      sourceFile,
+    );
 
     expect(mapped?.range).toEqual(range);
   });
 
   it('anchors a span-less diagnostic at document start instead of dropping it', () => {
-    const [mapped] = mapInterpreterDiagnostics([
-      { code: 'PSL_SPANLESS', message: 'no span available' },
-    ]);
+    const [mapped] = mapInterpreterDiagnostics(
+      [{ code: 'PSL_SPANLESS', message: 'no span available' }],
+      sourceFile,
+    );
 
     expect(mapped).toEqual({
       range: { start: { line: 0, character: 0 }, end: { line: 0, character: 1 } },