@volar/test-utils 2.0.0-alpha.13 → 2.0.0-alpha.14

package/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import * as _ from '@volar/language-server/node';
 import * as cp from 'child_process';
 import { TextDocument } from 'vscode-languageserver-textdocument';
@@ -35,8 +36,7 @@ export declare function startLanguageServer(serverModule: string, cwd?: string |
     sendDocumentLinkRequest(uri: string): Promise<_.DocumentLink[] | null>;
     sendDocumentLinkResolveRequest(link: _.DocumentLink): Promise<_.DocumentLink>;
 };
-export declare function printSnapshots(sourceFile: _.SourceFile, root?: string): Generator<string, void, unknown>;
+export declare function printSnapshots(sourceFile: _.SourceFile): Generator<string, void, unknown>;
 export declare function printSnapshot(sourceFile: {
-    fileName: string;
     snapshot: _.SourceFile['snapshot'];
-}, file: _.VirtualFile, root?: string): Generator<string, void, unknown>;
+}, file: _.VirtualCode): Generator<string, void, unknown>;

package/index.js

@@ -5,7 +5,6 @@ const _ = require("@volar/language-server/node");
 const assert = require("assert");
 const cp = require("child_process");
 const fs = require("fs");
-const path = require("path");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const vscode_uri_1 = require("vscode-uri");
 const language_core_1 = require("@volar/language-core");
@@ -19,9 +18,9 @@ function startLanguageServer(serverModule, cwd) {
     const openedDocuments = new Map();
     let untitledCounter = 0;
     connection.listen();
-    connection.onClose((e) => console.log(e));
-    connection.onUnhandledNotification((e) => console.log(e));
-    connection.onError((e) => console.log(e));
+    connection.onClose(e => console.log(e));
+    connection.onUnhandledNotification(e => console.log(e));
+    connection.onError(e => console.log(e));
     connection.onDispose(() => {
         childProcess.kill();
     });
@@ -221,18 +220,20 @@ function startLanguageServer(serverModule, cwd) {
     };
 }
 exports.startLanguageServer = startLanguageServer;
-function* printSnapshots(sourceFile, root = process.cwd()) {
-    if (sourceFile.virtualFile) {
-        for (const file of (0, language_core_1.forEachEmbeddedFile)(sourceFile.virtualFile[0])) {
-            yield path.relative(root, file.fileName);
-            for (const line of printSnapshot(sourceFile, file, root)) {
+function* printSnapshots(sourceFile) {
+    if (sourceFile.generated) {
+        let lastId = 0;
+        for (const file of (0, language_core_1.forEachEmbeddedCode)(sourceFile.generated.code)) {
+            const id = lastId++;
+            yield `#${id}`;
+            for (const line of printSnapshot(sourceFile, file)) {
                 yield '  ' + line;
             }
         }
     }
 }
 exports.printSnapshots = printSnapshots;
-function* printSnapshot(sourceFile, file, root = process.cwd()) {
+function* printSnapshot(sourceFile, file) {
     const sourceCode = sourceFile.snapshot.getText(0, sourceFile.snapshot.getLength());
     const sourceFileDocument = vscode_languageserver_textdocument_1.TextDocument.create('', '', 0, sourceCode);
     const virtualCode = file.snapshot.getText(0, file.snapshot.getLength());
@@ -269,7 +270,6 @@ function* printSnapshot(sourceFile, file, root = process.cwd()) {
         for (const log of logs.reverse()) {
             const sourcePosition = sourceFileDocument.positionAt(log.sourceOffset);
             const spanText = log.length === 0 ? '^' : '~'.repeat(log.length);
-            const sourceFilePath = path.relative(root, log.mapping.source ?? sourceFile.fileName);
             const prefix = ' '.repeat(lineHead.length);
             const sourceLineEnd = sourceFileDocument.offsetAt({ line: sourcePosition.line + 1, character: 0 }) - 1;
             const sourceLine = sourceFileDocument.getText().substring(sourceFileDocument.offsetAt({ line: sourcePosition.line, character: 0 }), sourceLineEnd + 1);
@@ -285,7 +285,7 @@ function* printSnapshot(sourceFile, file, root = process.cwd()) {
                     ' '.repeat(log.lineOffset),
                     sourceLineHead,
                     '(exact match)',
-                    `(${sourceFilePath
+                    `(${log.mapping.source
                         + ':' + (sourcePosition.line + 1)
                         + ':' + (sourcePosition.character + 1)})`,
                 ].join(' ');
@@ -296,7 +296,7 @@ function* printSnapshot(sourceFile, file, root = process.cwd()) {
                     ' '.repeat(log.lineOffset),
                     sourceLineHead,
                     normalizeLogText(sourceLine),
-                    `(${sourceFilePath
+                    `(${log.mapping.source
                         + ':' + (sourcePosition.line + 1)
                         + ':' + (sourcePosition.character + 1)})`,
                 ].join(' ');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/test-utils",
-	"version": "2.0.0-alpha.13",
+	"version": "2.0.0-alpha.14",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,10 +15,10 @@
 		"@types/node": "latest"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0-alpha.13",
-		"@volar/language-server": "2.0.0-alpha.13",
+		"@volar/language-core": "2.0.0-alpha.14",
+		"@volar/language-server": "2.0.0-alpha.14",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-uri": "^3.0.8"
 	},
-	"gitHead": "b052e3d47235325ac614257be1cebd541d421134"
+	"gitHead": "83eb6a4a4475a3680f14fb3808e48ec4dbe62cc1"
 }