Skip to content

Commit 1cf7612

Browse files
aeschliaeschli
committed
[css] move colorpresentations to language server
1 parent 9b93a68 commit 1cf7612

6 files changed

Lines changed: 63 additions & 77 deletions

File tree

‎extensions/css/client/src/cssMain.ts‎

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66

77
import * as path from 'path';
88

9-
import { languages, window, commands, ExtensionContext, TextDocument, ColorInformation, ColorPresentation, Color, TextEdit as CodeTextEdit } from 'vscode';
9+
import { languages, window, commands, ExtensionContext, TextDocument, ColorInformation, ColorPresentation, Color } from 'vscode';
1010
import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, TextEdit } from 'vscode-languageclient';
1111

12-
import { ConfigurationFeature } from 'vscode-languageclient/lib/proposed';
13-
import { DocumentColorRequest } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
12+
import { ConfigurationFeature } from 'vscode-languageclient/lib/configuration.proposed';
13+
import { DocumentColorRequest, DocumentColorParams, ColorPresentationRequest, ColorPresentationParams } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
1414

1515
import * as nls from 'vscode-nls';
16-
import * as convert from 'color-convert';
1716
let localize = nls.loadMessageBundle();
1817

1918
// this method is called when vs code is activated
@@ -52,16 +51,13 @@ export function activate(context: ExtensionContext) {
5251
// client can be deactivated on extension deactivation
5352
context.subscriptions.push(disposable);
5453

55-
var _toTwoDigitHex = function (n: number): string {
56-
const r = n.toString(16);
57-
return r.length !== 2 ? '0' + r : r;
58-
};
59-
6054
client.onReady().then(_ => {
6155
// register color provider
6256
context.subscriptions.push(languages.registerColorProvider(documentSelector, {
6357
provideDocumentColors(document: TextDocument): Thenable<ColorInformation[]> {
64-
let params = client.code2ProtocolConverter.asDocumentSymbolParams(document);
58+
let params: DocumentColorParams = {
59+
textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document)
60+
};
6561
return client.sendRequest(DocumentColorRequest.type, params).then(symbols => {
6662
return symbols.map(symbol => {
6763
let range = client.protocol2CodeConverter.asRange(symbol.range);
@@ -71,34 +67,18 @@ export function activate(context: ExtensionContext) {
7167
});
7268
},
7369
provideColorPresentations(document: TextDocument, colorInfo: ColorInformation): ColorPresentation[] | Thenable<ColorPresentation[]> {
74-
let result: ColorPresentation[] = [];
75-
let color = colorInfo.color;
76-
let label;
77-
if (color.alpha === 1) {
78-
label = `rgb(${Math.round(color.red * 255)}, ${Math.round(color.green * 255)}, ${Math.round(color.blue * 255)})`;
79-
} else {
80-
label = `rgba(${Math.round(color.red * 255)}, ${Math.round(color.green * 255)}, ${Math.round(color.blue * 255)}, ${color.alpha})`;
81-
}
82-
83-
result.push({ label: label, textEdit: new CodeTextEdit(colorInfo.range, label) });
84-
85-
if (color.alpha === 1) {
86-
label = `#${_toTwoDigitHex(Math.round(color.red * 255))}${_toTwoDigitHex(Math.round(color.green * 255))}${_toTwoDigitHex(Math.round(color.blue * 255))}`;
87-
} else {
88-
label = `#${_toTwoDigitHex(Math.round(color.red * 255))}${_toTwoDigitHex(Math.round(color.green * 255))}${_toTwoDigitHex(Math.round(color.blue * 255))}${_toTwoDigitHex(Math.round(color.alpha * 255))}`;
89-
}
90-
91-
result.push({ label: label, textEdit: new CodeTextEdit(colorInfo.range, label) });
92-
93-
const hsl = convert.rgb.hsl(Math.round(color.red * 255), Math.round(color.green * 255), Math.round(color.blue * 255));
94-
if (color.alpha === 1) {
95-
label = `hsl(${hsl[0]}, ${hsl[1]}%, ${hsl[2]}%)`;
96-
} else {
97-
label = `hsla(${hsl[0]}, ${hsl[1]}%, ${hsl[2]}%, ${color.alpha})`;
98-
}
99-
100-
result.push({ label: label, textEdit: new CodeTextEdit(colorInfo.range, label) });
101-
return result;
70+
let params: ColorPresentationParams = {
71+
textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
72+
colorInfo: { range: client.code2ProtocolConverter.asRange(colorInfo.range), color: colorInfo.color }
73+
};
74+
return client.sendRequest(ColorPresentationRequest.type, params).then(presentations => {
75+
return presentations.map(p => {
76+
let presentation = new ColorPresentation(p.label);
77+
presentation.textEdit = p.textEdit && client.protocol2CodeConverter.asTextEdit(p.textEdit);
78+
presentation.additionalTextEdits = p.additionalTextEdits && client.protocol2CodeConverter.asTextEdits(p.additionalTextEdits);
79+
return presentation;
80+
});
81+
});
10282
}
10383
}));
10484
});

‎extensions/css/npm-shrinkwrap.json‎

Lines changed: 12 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extensions/css/package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -720,12 +720,11 @@
720720
]
721721
},
722722
"dependencies": {
723-
"color-convert": "^0.5.3",
724-
"vscode-languageclient": "3.4.0-next.17",
725-
"vscode-languageserver-protocol": "^3.1.1",
723+
"vscode-languageclient": "^3.4.2",
724+
"vscode-languageserver-protocol": "^3.4.2",
726725
"vscode-nls": "^2.0.2"
727726
},
728727
"devDependencies": {
729728
"@types/node": "^6.0.51"
730729
}
731-
}
730+
}

‎extensions/css/server/npm-shrinkwrap.json‎

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎extensions/css/server/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"node": "*"
99
},
1010
"dependencies": {
11-
"vscode-css-languageservice": "^2.1.6",
12-
"vscode-languageserver": "3.4.0-next.6",
13-
"vscode-languageserver-protocol": "^3.1.1"
11+
"vscode-css-languageservice": "^2.1.7",
12+
"vscode-languageserver": "^3.4.2",
13+
"vscode-languageserver-protocol": "^3.4.2"
1414
},
1515
"devDependencies": {
1616
"@types/node": "^6.0.51"

‎extensions/css/server/src/cssServerMain.ts‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
'use strict';
66

77
import {
8-
createConnection, IConnection, TextDocuments, TextDocument, InitializeParams, InitializeResult, ServerCapabilities
8+
createConnection, IConnection, TextDocuments, InitializeParams, InitializeResult, ServerCapabilities
99
} from 'vscode-languageserver';
1010

11-
import { GetConfigurationRequest } from 'vscode-languageserver-protocol/lib/protocol.configuration.proposed';
12-
import { DocumentColorRequest, ServerCapabilities as CPServerCapabilities } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
11+
import { TextDocument } from 'vscode-languageserver-types';
12+
13+
import { ConfigurationRequest } from 'vscode-languageserver-protocol/lib/protocol.configuration.proposed';
14+
import { DocumentColorRequest, ServerCapabilities as CPServerCapabilities, ColorPresentationRequest } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
1315

1416
import { getCSSLanguageService, getSCSSLanguageService, getLESSLanguageService, LanguageSettings, LanguageService, Stylesheet } from 'vscode-css-languageservice';
1517
import { getLanguageModelCache } from './languageModelCache';
@@ -96,7 +98,7 @@ function getDocumentSettings(textDocument: TextDocument): Thenable<LanguageSetti
9698
let promise = documentSettings[textDocument.uri];
9799
if (!promise) {
98100
let configRequestParam = { items: [{ scopeUri: textDocument.uri, section: textDocument.languageId }] };
99-
promise = connection.sendRequest(GetConfigurationRequest.type, configRequestParam).then(s => s[0]);
101+
promise = connection.sendRequest(ConfigurationRequest.type, configRequestParam).then(s => s[0]);
100102
documentSettings[textDocument.uri] = promise;
101103
}
102104
return promise;
@@ -211,6 +213,15 @@ connection.onRequest(DocumentColorRequest.type, params => {
211213
return [];
212214
});
213215

216+
connection.onRequest(ColorPresentationRequest.type, params => {
217+
let document = documents.get(params.textDocument.uri);
218+
if (document) {
219+
let stylesheet = stylesheets.get(document);
220+
return getLanguageService(document).getColorPresentations(document, stylesheet, params.colorInfo);
221+
}
222+
return [];
223+
});
224+
214225
connection.onRenameRequest(renameParameters => {
215226
let document = documents.get(renameParameters.textDocument.uri);
216227
let stylesheet = stylesheets.get(document);

0 commit comments

Comments
 (0)