Skip to content

Commit 5ed577b

Browse files
aeschliaeschli
committed
[html] update server
1 parent 8326351 commit 5ed577b

8 files changed

Lines changed: 44 additions & 42 deletions

File tree

‎extensions/html/client/src/htmlMain.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ export function activate(context: ExtensionContext) {
8686
provideColorPresentations(color, context): Thenable<ColorPresentation[]> {
8787
let params: ColorPresentationParams = {
8888
textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(context.document),
89-
colorInfo: { range: client.code2ProtocolConverter.asRange(context.range), color }
89+
color,
90+
range: client.code2ProtocolConverter.asRange(context.range)
9091
};
9192
return client.sendRequest(ColorPresentationRequest.type, params).then(presentations => {
9293
return presentations.map(p => {

‎extensions/html/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/html/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
},
217217
"dependencies": {
218218
"vscode-extension-telemetry": "0.0.8",
219-
"vscode-languageclient": "3.5.0-next.3",
219+
"vscode-languageclient": "3.5.0-next.4",
220220
"vscode-nls": "2.0.2"
221221
},
222222
"devDependencies": {

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

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

‎extensions/html/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.11",
12-
"vscode-html-languageservice": "^2.0.10",
13-
"vscode-languageserver": "3.5.0-next.2",
11+
"vscode-css-languageservice": "3.0.0",
12+
"vscode-html-languageservice": "2.0.10",
13+
"vscode-languageserver": "3.5.0-next.6",
1414
"vscode-nls": "^2.0.2",
1515
"vscode-uri": "^1.0.1"
1616
},

‎extensions/html/server/src/htmlServerMain.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,9 @@ connection.onRequest(DocumentColorRequest.type, params => {
326326
connection.onRequest(ColorPresentationRequest.type, params => {
327327
let document = documents.get(params.textDocument.uri);
328328
if (document) {
329-
let mode = languageModes.getModeAtPosition(document, params.colorInfo.range.start);
329+
let mode = languageModes.getModeAtPosition(document, params.range.start);
330330
if (mode && mode.getColorPresentations) {
331-
return mode.getColorPresentations(document, params.colorInfo);
331+
return mode.getColorPresentations(document, params.color, params.range);
332332
}
333333
}
334334
return [];

‎extensions/html/server/src/modes/cssMode.ts‎

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

77
import { LanguageModelCache, getLanguageModelCache } from '../languageModelCache';
8-
import { TextDocument, Position } from 'vscode-languageserver-types';
8+
import { TextDocument, Position, Range } from 'vscode-languageserver-types';
99
import { getCSSLanguageService, Stylesheet } from 'vscode-css-languageservice';
10-
import { LanguageMode, Settings, ColorInformation } from './languageModes';
10+
import { LanguageMode, Settings } from './languageModes';
1111
import { HTMLDocumentRegions, CSS_STYLE_RULE } from './embeddedSupport';
12+
import { Color } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
1213

1314
export function getCSSMode(documentRegions: LanguageModelCache<HTMLDocumentRegions>): LanguageMode {
1415
let cssLanguageService = getCSSLanguageService();
@@ -54,9 +55,9 @@ export function getCSSMode(documentRegions: LanguageModelCache<HTMLDocumentRegio
5455
let embedded = embeddedCSSDocuments.get(document);
5556
return cssLanguageService.findDocumentColors(embedded, cssStylesheets.get(embedded));
5657
},
57-
getColorPresentations(document: TextDocument, colorInfo: ColorInformation) {
58+
getColorPresentations(document: TextDocument, color: Color, range: Range) {
5859
let embedded = embeddedCSSDocuments.get(document);
59-
return cssLanguageService.getColorPresentations(embedded, cssStylesheets.get(embedded), colorInfo);
60+
return cssLanguageService.getColorPresentations(embedded, cssStylesheets.get(embedded), color, range);
6061
},
6162
onDocumentRemoved(document: TextDocument) {
6263
embeddedCSSDocuments.onDocumentRemoved(document);

‎extensions/html/server/src/modes/languageModes.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import {
1010
Hover, DocumentHighlight, CompletionList, Position, FormattingOptions, SymbolInformation
1111
} from 'vscode-languageserver-types';
1212

13-
import { ColorInformation, ColorPresentation } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
13+
import { ColorInformation, ColorPresentation, Color } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
1414

1515
import { getLanguageModelCache, LanguageModelCache } from '../languageModelCache';
1616
import { getDocumentRegions, HTMLDocumentRegions } from './embeddedSupport';
1717
import { getCSSMode } from './cssMode';
1818
import { getJavascriptMode } from './javascriptMode';
1919
import { getHTMLMode } from './htmlMode';
2020

21-
export { ColorInformation, ColorPresentation };
21+
export { ColorInformation, ColorPresentation, Color };
2222

2323
export interface Settings {
2424
css?: any;
@@ -45,7 +45,7 @@ export interface LanguageMode {
4545
findReferences?: (document: TextDocument, position: Position) => Location[];
4646
format?: (document: TextDocument, range: Range, options: FormattingOptions, settings: Settings) => TextEdit[];
4747
findDocumentColors?: (document: TextDocument) => ColorInformation[];
48-
getColorPresentations?: (document: TextDocument, colorInfo: ColorInformation) => ColorPresentation[];
48+
getColorPresentations?: (document: TextDocument, color: Color, range: Range) => ColorPresentation[];
4949
doAutoClose?: (document: TextDocument, position: Position) => string;
5050
onDocumentRemoved(document: TextDocument): void;
5151
dispose(): void;

0 commit comments

Comments
 (0)