Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[css] adopt languageserver colorProvider.proposed protocol

Browse Source
This commit is contained in:
Martin Aeschlimann
2017-08-28 19:12:58 +02:00
parent d5ac84dd0c
commit aae74ede39
9 changed files with 67 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/css/server/npm-shrinkwrap.json generated
View File

@@ -3,9 +3,9 @@
"version": "1.0.0",
"dependencies": {
"vscode-css-languageservice": {
"version": "2.1.3",
"version": "2.1.4",
"from": "vscode-css-languageservice@next",
"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.1.3.tgz"
"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-2.1.4.tgz"
},
"vscode-jsonrpc": {
"version": "3.3.1",
@@ -18,9 +18,9 @@
"resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.4.0-next.6.tgz"
},
"vscode-languageserver-protocol": {
"version": "3.1.0",
"from": "vscode-languageserver-protocol@>=3.1.0 <4.0.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.1.0.tgz"
"version": "3.1.1",
"from": "vscode-languageserver-protocol@>=3.1.1 <4.0.0",
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.1.1.tgz"
},
"vscode-languageserver-types": {
"version": "3.3.0",

5
extensions/css/server/package.json
View File

@@ -8,8 +8,9 @@
"node": "*"
},
"dependencies": {
"vscode-css-languageservice": "^2.1.3",
"vscode-languageserver": "3.4.0-next.6"
"vscode-css-languageservice": "^2.1.4",
"vscode-languageserver": "3.4.0-next.6",
"vscode-languageserver-protocol": "^3.1.1"
},
"devDependencies": {
"@types/node": "^6.0.51"

41
extensions/css/server/src/cssServerMain.ts
View File

@@ -5,18 +5,15 @@
'use strict';
import {
createConnection, IConnection, Range,
TextDocuments, TextDocument, InitializeParams, InitializeResult, RequestType
createConnection, IConnection, TextDocuments, TextDocument, InitializeParams, InitializeResult, ServerCapabilities
} from 'vscode-languageserver';
import { GetConfigurationRequest } from 'vscode-languageserver-protocol/lib/protocol.configuration.proposed';
import { DocumentColorRequest, ServerCapabilities as CPServerCapabilities } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet } from 'vscode-css-languageservice';
import { getLanguageModelCache } from './languageModelCache';
namespace ColorSymbolRequest {
export const type: RequestType<string, Range[], any, any> = new RequestType('css/colorSymbols');
}
export interface Settings {
css: LanguageSettings;
less: LanguageSettings;
@@ -58,20 +55,20 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
}
let snippetSupport = hasClientCapability('textDocument.completion.completionItem.snippetSupport');
scopedSettingsSupport = hasClientCapability('workspace.configuration');
return {
capabilities: {
// Tell the client that the server works in FULL text document sync mode
textDocumentSync: documents.syncKind,
completionProvider: snippetSupport ? { resolveProvider: false } : null,
hoverProvider: true,
documentSymbolProvider: true,
referencesProvider: true,
definitionProvider: true,
documentHighlightProvider: true,
codeActionProvider: true,
renameProvider: true
}
let capabilities: ServerCapabilities & CPServerCapabilities = {
// Tell the client that the server works in FULL text document sync mode
textDocumentSync: documents.syncKind,
completionProvider: snippetSupport ? { resolveProvider: false } : null,
hoverProvider: true,
documentSymbolProvider: true,
referencesProvider: true,
definitionProvider: true,
documentHighlightProvider: true,
codeActionProvider: true,
renameProvider: true,
colorProvider: true
};
return { capabilities };
});
let languageServices: { [id: string]: LanguageService } = {
@@ -205,11 +202,11 @@ connection.onCodeAction(codeActionParams => {
return getLanguageService(document).doCodeActions(document, codeActionParams.range, codeActionParams.context, stylesheet);
});
connection.onRequest(ColorSymbolRequest.type, uri => {
let document = documents.get(uri);
connection.onRequest(DocumentColorRequest.type, params => {
let document = documents.get(params.textDocument.uri);
if (document) {
let stylesheet = stylesheets.get(document);
return getLanguageService(document).findColorSymbols(document, stylesheet);
return getLanguageService(document).findDocumentColors(document, stylesheet);
}
return [];
});