Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 14:01:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

single AutoInsertRequest message for both autoQuote and autoClose

Browse Source
This commit is contained in:
Martin Aeschlimann
2021-12-14 16:00:35 +01:00
parent 72287bfab6
commit 1f9d809e35
4 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
extensions/html-language-features/server/src/htmlServer.ts
View File

@@ -5,7 +5,7 @@
import {
Connection, TextDocuments, InitializeParams, InitializeResult, RequestType,
DocumentRangeFormattingRequest, Disposable, TextDocumentPositionParams, ServerCapabilities,
DocumentRangeFormattingRequest, Disposable, ServerCapabilities,
ConfigurationRequest, ConfigurationParams, DidChangeWorkspaceFoldersNotification,
DocumentColorRequest, ColorPresentationRequest, TextDocumentSyncKind, NotificationType, RequestType0, DocumentFormattingRequest, FormattingOptions, TextEdit
} from 'vscode-languageserver';
@@ -34,12 +34,23 @@ namespace CustomDataContent {
export const type: RequestType<string, string, any> = new RequestType('html/customDataContent');
}
namespace QuoteCreateRequest {
export const type: RequestType<TextDocumentPositionParams, string, any> = new RequestType('html/quote');
interface AutoInsertParams {
/**
* The auto insert kind
*/
kind: 'autoQuote' | 'autoClose';
/**
* The text document.
*/
textDocument: TextDocumentIdentifier;
/**
* The position inside the text document.
*/
position: Position;
}
namespace TagCloseRequest {
export const type: RequestType<TextDocumentPositionParams, string | null, any> = new RequestType('html/tag');
namespace AutoInsertRequest {
export const type: RequestType<AutoInsertParams, string, any> = new RequestType('html/autoInsert');
}
// experimental: semantic tokens
@@ -487,36 +498,20 @@ export function startServer(connection: Connection, runtime: RuntimeEnvironment)
}, [], `Error while computing color presentations for ${params.textDocument.uri}`, token);
});
connection.onRequest(QuoteCreateRequest.type, (params, token) => {
connection.onRequest(AutoInsertRequest.type, (params, token) => {
return runSafe(runtime, async () => {
const document = documents.get(params.textDocument.uri);
if (document) {
const pos = params.position;
if (pos.character > 0) {
const mode = languageModes.getModeAtPosition(document, Position.create(pos.line, pos.character - 1));
if (mode && mode.doAutoQuote) {
return mode.doAutoQuote(document, pos);
if (mode && mode.doAutoInsert) {
return mode.doAutoInsert(document, pos, params.kind);
}
}
}
return null;
}, null, `Error while computing tag close actions for ${params.textDocument.uri}`, token);
});
connection.onRequest(TagCloseRequest.type, (params, token) => {
return runSafe(runtime, async () => {
const document = documents.get(params.textDocument.uri);
if (document) {
const pos = params.position;
if (pos.character > 0) {
const mode = languageModes.getModeAtPosition(document, Position.create(pos.line, pos.character - 1));
if (mode && mode.doAutoClose) {
return mode.doAutoClose(document, pos);
}
}
}
return null;
}, null, `Error while computing tag close actions for ${params.textDocument.uri}`, token);
}, null, `Error while computing auto insert actions for ${params.textDocument.uri}`, token);
});
connection.onFoldingRanges((params, token) => {