@volar/test-utils 2.4.0-alpha.9 → 2.4.1

package/README.md

@@ -18,7 +18,7 @@ The returned server handle provides several methods to interact with the languag
 
 - `initialize(rootUri: string, initializationOptions: InitializationOptions)`: Initializes the language server.
 - `openTextDocument(fileName: string, languageId: string)`: Opens a text document.
-- `openUntitledDocument(content: string, languageId: string)`: Opens an untitled text document.
+- `openUntitledDocument(languageId: string, content: string)`: Opens an untitled text document.
 - `closeTextDocument(uri: string)`: Closes a text document.
 - Various `send*Request` methods: Send language-related requests to the server.
 

package/index.d.ts

@@ -6,10 +6,10 @@ export type LanguageServerHandle = ReturnType<typeof startLanguageServer>;
 export declare function startLanguageServer(serverModule: string, cwd?: string | URL): {
     process: cp.ChildProcess;
     connection: _.ProtocolConnection;
-    initialize(rootUri: string, initializationOptions: _._InitializeParams["initializationOptions"], capabilities?: _.ClientCapabilities, locale?: string): Promise<_.InitializeResult<any>>;
+    initialize(rootUri: string | _.WorkspaceFolder[], initializationOptions: _._InitializeParams["initializationOptions"], capabilities?: _.ClientCapabilities, locale?: string): Promise<_.InitializeResult<any>>;
     shutdown(): Promise<void>;
     openTextDocument(fileName: string, languageId: string): Promise<TextDocument>;
-    openUntitledDocument(content: string, languageId: string): Promise<TextDocument>;
+    openUntitledDocument(languageId: string, content: string): Promise<TextDocument>;
     openInMemoryDocument(uri: string, languageId: string, content: string): Promise<TextDocument>;
     closeTextDocument(uri: string): Promise<void>;
     updateTextDocument(uri: string, edits: _.TextEdit[]): Promise<TextDocument>;
@@ -39,6 +39,8 @@ export declare function startLanguageServer(serverModule: string, cwd?: string |
     sendColorPresentationRequest(uri: string, color: _.Color, range: _.Range): Promise<_.ColorPresentation[]>;
     sendDocumentLinkRequest(uri: string): Promise<_.DocumentLink[] | null>;
     sendDocumentLinkResolveRequest(link: _.DocumentLink): Promise<_.DocumentLink>;
+    sendInlayHintRequest(uri: string, range: _.Range): Promise<_.InlayHint[] | null>;
+    sendInlayHintResolveRequest(hint: _.InlayHint): Promise<_.InlayHint>;
 };
 export declare function printSnapshots(sourceScript: _.SourceScript<URI>): Generator<string, void, unknown>;
 export declare function printSnapshot(sourceScript: {

package/index.js

@@ -18,6 +18,7 @@ function startLanguageServer(serverModule, cwd) {
         stdio: 'pipe',
     });
     const connection = _.createProtocolConnection(childProcess.stdout, childProcess.stdin);
+    const documentVersions = new Map();
     const openedDocuments = new Map();
     const settings = {};
     let untitledCounter = 0;
@@ -50,7 +51,8 @@ function startLanguageServer(serverModule, cwd) {
         async initialize(rootUri, initializationOptions, capabilities = {}, locale) {
             const result = await connection.sendRequest(_.InitializeRequest.type, {
                 processId: childProcess.pid ?? null,
-                rootUri,
+                rootUri: typeof rootUri === 'string' ? rootUri : null,
+                workspaceFolders: Array.isArray(rootUri) ? rootUri : null,
                 initializationOptions,
                 capabilities,
                 locale,
@@ -67,7 +69,8 @@ function startLanguageServer(serverModule, cwd) {
         async openTextDocument(fileName, languageId) {
             const uri = vscode_uri_1.URI.file(fileName).toString();
             if (!openedDocuments.has(uri)) {
-                const document = vscode_languageserver_textdocument_1.TextDocument.create(uri, languageId, 0, fs.readFileSync(fileName, 'utf-8'));
+                const document = vscode_languageserver_textdocument_1.TextDocument.create(uri, languageId, (documentVersions.get(uri) ?? 0) + 1, fs.readFileSync(fileName, 'utf-8'));
+                documentVersions.set(uri, document.version);
                 openedDocuments.set(uri, document);
                 await connection.sendNotification(_.DidOpenTextDocumentNotification.type, {
                     textDocument: {
@@ -80,9 +83,10 @@ function startLanguageServer(serverModule, cwd) {
             }
             return openedDocuments.get(uri);
         },
-        async openUntitledDocument(content, languageId) {
+        async openUntitledDocument(languageId, content) {
             const uri = vscode_uri_1.URI.from({ scheme: 'untitled', path: `Untitled-${untitledCounter++}` }).toString();
-            const document = vscode_languageserver_textdocument_1.TextDocument.create(uri, languageId, 0, content);
+            const document = vscode_languageserver_textdocument_1.TextDocument.create(uri, languageId, (documentVersions.get(uri) ?? 0) + 1, content);
+            documentVersions.set(uri, document.version);
             openedDocuments.set(uri, document);
             await connection.sendNotification(_.DidOpenTextDocumentNotification.type, {
                 textDocument: {
@@ -99,7 +103,8 @@ function startLanguageServer(serverModule, cwd) {
             if (oldDocument) {
                 await this.closeTextDocument(uri);
             }
-            const document = vscode_languageserver_textdocument_1.TextDocument.create(uri, languageId, (oldDocument?.version ?? 0) + 1, content);
+            const document = vscode_languageserver_textdocument_1.TextDocument.create(uri, languageId, (documentVersions.get(uri) ?? 0) + 1, content);
+            documentVersions.set(uri, document.version);
             openedDocuments.set(uri, document);
             await connection.sendNotification(_.DidOpenTextDocumentNotification.type, {
                 textDocument: {
@@ -123,6 +128,7 @@ function startLanguageServer(serverModule, cwd) {
             assert(document);
             const newText = vscode_languageserver_textdocument_1.TextDocument.applyEdits(document, edits);
             document = vscode_languageserver_textdocument_1.TextDocument.create(uri, document.languageId, document.version + 1, newText);
+            documentVersions.set(uri, document.version);
             openedDocuments.set(uri, document);
             await connection.sendNotification(_.DidChangeTextDocumentNotification.type, {
                 textDocument: {
@@ -279,6 +285,15 @@ function startLanguageServer(serverModule, cwd) {
         sendDocumentLinkResolveRequest(link) {
             return connection.sendRequest(_.DocumentLinkResolveRequest.type, link);
         },
+        sendInlayHintRequest(uri, range) {
+            return connection.sendRequest(_.InlayHintRequest.type, {
+                textDocument: { uri },
+                range,
+            });
+        },
+        sendInlayHintResolveRequest(hint) {
+            return connection.sendRequest(_.InlayHintResolveRequest.type, hint);
+        },
     };
     function getConfiguration(section) {
         if (section in settings) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/test-utils",
-	"version": "2.4.0-alpha.9",
+	"version": "2.4.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,10 +15,10 @@
 		"@types/node": "latest"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.0-alpha.9",
-		"@volar/language-server": "2.4.0-alpha.9",
+		"@volar/language-core": "2.4.1",
+		"@volar/language-server": "2.4.1",
 		"vscode-languageserver-textdocument": "^1.0.11",
 		"vscode-uri": "^3.0.8"
 	},
-	"gitHead": "4a3fc1bf36eb12ccd58bc8cb25f11f1a9f7b2300"
+	"gitHead": "b920b6c4a3e4b2d8f46c676ea414e94c437cb5b7"
 }