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

Move logic to service

Browse Source
This commit is contained in:
Pine Wu
2019-01-23 12:11:29 -08:00
parent d1690ad706
commit d3c14cf0af
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/html-language-features/server/src/htmlServerMain.ts
View File

@@ -480,7 +480,7 @@ connection.onFoldingRanges((params, token) => {
}, null, `Error while computing folding regions for ${params.textDocument.uri}`, token);
});
connection.onRequest('$/selection', async (params) => {
connection.onRequest('$/textDocument/selectionRange', async (params) => {
const document = documents.get(params.textDocument.uri);
const position: Position = params.position;
@@ -489,8 +489,6 @@ connection.onRequest('$/selection', async (params) => {
if (htmlMode && htmlMode.doSelection) {
return htmlMode.doSelection(document, position);
}
console.log(position.line, position.character);
}
return Promise.resolve(null);
});

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

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { getLanguageModelCache } from '../languageModelCache';
import { LanguageService as HTMLLanguageService, HTMLDocument, DocumentContext, FormattingOptions, HTMLFormatConfiguration, Node } from 'vscode-html-languageservice';
import { LanguageService as HTMLLanguageService, HTMLDocument, DocumentContext, FormattingOptions, HTMLFormatConfiguration } from 'vscode-html-languageservice';
import { TextDocument, Position, Range, CompletionItem, FoldingRange } from 'vscode-languageserver-types';
import { LanguageMode, Workspace } from './languageModes';
import { getPathCompletionParticipant } from './pathCompletion';
@@ -16,26 +16,7 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace:
return 'html';
},
doSelection(document: TextDocument, position: Position): Range[] {
const htmlDocument = htmlDocuments.get(document);
let currNode = htmlDocument.findNodeAt(document.offsetAt(position));
let getNodeRanges = (n: Node) => {
if (n.startTagEnd && n.endTagStart && n.startTagEnd < n.endTagStart) {
return [
Range.create(document.positionAt(n.startTagEnd), document.positionAt(n.endTagStart)),
Range.create(document.positionAt(n.start), document.positionAt(n.end)),
];
}
return [Range.create(document.positionAt(n.start), document.positionAt(n.end))];
};
const result = [...getNodeRanges(currNode)];
while (currNode.parent) {
currNode = currNode.parent;
getNodeRanges(currNode).forEach(r => result.push(r));
}
return result;
return htmlLanguageService.getSelectionRanges(document, position);
},
doComplete(document: TextDocument, position: Position, settings = workspace.settings) {
let options = settings && settings.html && settings.html.suggest;