Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +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);

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) => {

16
extensions/html-language-features/server/src/modes/htmlMode.ts
View File

@@ -55,24 +55,22 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace:
async getFoldingRanges(document: TextDocument): Promise<FoldingRange[]> {
return htmlLanguageService.getFoldingRanges(document);
},
async doAutoQuote(document: TextDocument, position: Position, settings = workspace.settings) {
async doAutoInsert(document: TextDocument, position: Position, kind: 'autoQuote' | 'autoClose', settings = workspace.settings) {
const offset = document.offsetAt(position);
const text = document.getText();
if (kind === 'autoQuote') {
if (offset > 0 && text.charAt(offset - 1) === '=') {
const htmlSettings = settings?.html;
const options = merge(htmlSettings?.suggest, {});
options.attributeDefaultValue = htmlSettings?.completion?.attributeDefaultValue ?? 'doublequotes';
const offset = document.offsetAt(position);
const text = document.getText();
if (offset > 0 && text.charAt(offset - 1) === '=') {
return htmlLanguageService.doQuoteComplete(document, position, htmlDocuments.get(document), options);
}
return null;
},
async doAutoClose(document: TextDocument, position: Position) {
const offset = document.offsetAt(position);
const text = document.getText();
} else if (kind === 'autoClose') {
if (offset > 0 && text.charAt(offset - 1).match(/[>\/]/g)) {
return htmlLanguageService.doTagComplete(document, position, htmlDocuments.get(document));
}
}
return null;
},
async doRename(document: TextDocument, position: Position, newName: string) {

3
extensions/html-language-features/server/src/modes/languageModes.ts
View File

@@ -72,8 +72,7 @@ export interface LanguageMode {
format?: (document: TextDocument, range: Range, options: FormattingOptions, settings?: Settings) => Promise<TextEdit[]>;
findDocumentColors?: (document: TextDocument) => Promise<ColorInformation[]>;
getColorPresentations?: (document: TextDocument, color: Color, range: Range) => Promise<ColorPresentation[]>;
doAutoQuote?: (document: TextDocument, position: Position) => Promise<string | null>;
doAutoClose?: (document: TextDocument, position: Position) => Promise<string | null>;
doAutoInsert?: (document: TextDocument, position: Position, kind: 'autoClose' | 'autoQuote') => Promise<string | null>;
findMatchingTagPosition?: (document: TextDocument, position: Position) => Promise<Position | null>;
getFoldingRanges?: (document: TextDocument) => Promise<FoldingRange[]>;
onDocumentRemoved(document: TextDocument): void;