Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 12:19:20 +00: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

42
extensions/html-language-features/client/src/htmlClient.ts
View File

@@ -12,8 +12,8 @@ import {
DocumentSemanticTokensProvider, DocumentRangeSemanticTokensProvider, SemanticTokens, window, commands
} from 'vscode';
import {
LanguageClientOptions, RequestType, TextDocumentPositionParams, DocumentRangeFormattingParams,
DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, TextDocumentIdentifier, RequestType0, Range as LspRange, NotificationType, CommonLanguageClient
LanguageClientOptions, RequestType, DocumentRangeFormattingParams,
DocumentRangeFormattingRequest, ProvideCompletionItemsSignature, TextDocumentIdentifier, RequestType0, Range as LspRange, Position as LspPosition, NotificationType, CommonLanguageClient
} from 'vscode-languageclient';
import { FileSystemProvider, serveFileSystemRequests } from './requests';
import { getCustomDataSource } from './customData';
@@ -27,6 +27,25 @@ namespace CustomDataContent {
export const type: RequestType<string, string, any> = new RequestType('html/customDataContent');
}
interface AutoInsertParams {
/**
* The auto insert kind
*/
kind: 'autoQuote' | 'autoClose';
/**
* The text document.
*/
textDocument: TextDocumentIdentifier;
/**
* The position inside the text document.
*/
position: LspPosition;
}
namespace AutoInsertRequest {
export const type: RequestType<AutoInsertParams, string, any> = new RequestType('html/autoInsert');
}
// experimental: semantic tokens
interface SemanticTokenParams {
textDocument: TextDocumentIdentifier;
@@ -130,18 +149,13 @@ export function startClient(context: ExtensionContext, newLanguageClient: Langua
client.onRequest(CustomDataContent.type, customDataSource.getContent);
let insertRequestor = (kind: 'autoQuote' | 'autoClose', document: TextDocument, position: Position) => {
let param = client.code2ProtocolConverter.asTextDocumentPositionParams(document, position);
let request: RequestType<TextDocumentPositionParams, string, any>;
switch (kind) {
case 'autoQuote':
request = new RequestType('html/quote');
break;
case 'autoClose':
request = new RequestType('html/tag');
break;
}
return client.sendRequest(request, param);
const insertRequestor = (kind: 'autoQuote' | 'autoClose', document: TextDocument, position: Position): Promise<string> => {
let param: AutoInsertParams = {
kind,
textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
position: client.code2ProtocolConverter.asPosition(position)
};
return client.sendRequest(AutoInsertRequest.type, param);
};
let disposable = activateAutoInsertion(insertRequestor, { html: true, handlebars: true }, runtime);
toDispose.push(disposable);