Extract a common DocumentHighlightAdapter

src/common/lspLanguageFeatures.ts

@@ -462,3 +462,56 @@ function toMarkedStringArray(
 }
 
 //#endregion
+
+//#region
+
+export interface ILanguageWorkerWithDocumentHighlights {
+	findDocumentHighlights(
+		uri: string,
+		position: lsTypes.Position
+	): Promise<lsTypes.DocumentHighlight[]>;
+}
+
+export class DocumentHighlightAdapter<T extends ILanguageWorkerWithDocumentHighlights>
+	implements languages.DocumentHighlightProvider
+{
+	constructor(private _worker: WorkerAccessor<T>) {}
+
+	public provideDocumentHighlights(
+		model: editor.IReadOnlyModel,
+		position: Position,
+		token: CancellationToken
+	): Promise<languages.DocumentHighlight[]> {
+		const resource = model.uri;
+
+		return this._worker(resource)
+			.then((worker) => worker.findDocumentHighlights(resource.toString(), fromPosition(position)))
+			.then((entries) => {
+				if (!entries) {
+					return;
+				}
+				return entries.map((entry) => {
+					return <languages.DocumentHighlight>{
+						range: toRange(entry.range),
+						kind: toDocumentHighlightKind(entry.kind)
+					};
+				});
+			});
+	}
+}
+
+function toDocumentHighlightKind(
+	kind: lsTypes.DocumentHighlightKind
+): languages.DocumentHighlightKind {
+	switch (kind) {
+		case lsTypes.DocumentHighlightKind.Read:
+			return languages.DocumentHighlightKind.Read;
+		case lsTypes.DocumentHighlightKind.Write:
+			return languages.DocumentHighlightKind.Write;
+		case lsTypes.DocumentHighlightKind.Text:
+			return languages.DocumentHighlightKind.Text;
+	}
+	return languages.DocumentHighlightKind.Text;
+}
+
+//#endregion

src/css/cssMode.ts

@@ -42,7 +42,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
 			providers.push(
 				languages.registerDocumentHighlightProvider(
 					languageId,
-					new languageFeatures.DocumentHighlightAdapter(worker)
+					new languageFeatures.CSSDocumentHighlightAdapter(worker)
 				)
 			);
 		}

src/css/languageFeatures.ts

@@ -14,7 +14,8 @@ import {
 	toTextEdit,
 	fromRange,
 	CompletionAdapter,
-	HoverAdapter
+	HoverAdapter,
+	DocumentHighlightAdapter
 } from '../common/lspLanguageFeatures';
 
 export interface WorkerAccessor {
@@ -35,47 +36,7 @@ export class CSSCompletionAdapter extends CompletionAdapter<CSSWorker> {
 
 export class CSSHoverAdapter extends HoverAdapter<CSSWorker> {}
 
-// --- document highlights ------
+export class CSSDocumentHighlightAdapter extends DocumentHighlightAdapter<CSSWorker> {}
-
-function toDocumentHighlightKind(
-	kind: lsTypes.DocumentHighlightKind
-): languages.DocumentHighlightKind {
-	switch (kind) {
-		case lsTypes.DocumentHighlightKind.Read:
-			return languages.DocumentHighlightKind.Read;
-		case lsTypes.DocumentHighlightKind.Write:
-			return languages.DocumentHighlightKind.Write;
-		case lsTypes.DocumentHighlightKind.Text:
-			return languages.DocumentHighlightKind.Text;
-	}
-	return languages.DocumentHighlightKind.Text;
-}
-
-export class DocumentHighlightAdapter implements languages.DocumentHighlightProvider {
-	constructor(private _worker: WorkerAccessor) {}
-
-	public provideDocumentHighlights(
-		model: editor.IReadOnlyModel,
-		position: Position,
-		token: CancellationToken
-	): Promise<languages.DocumentHighlight[]> {
-		const resource = model.uri;
-
-		return this._worker(resource)
-			.then((worker) => worker.findDocumentHighlights(resource.toString(), fromPosition(position)))
-			.then((entries) => {
-				if (!entries) {
-					return;
-				}
-				return entries.map((entry) => {
-					return <languages.DocumentHighlight>{
-						range: toRange(entry.range),
-						kind: toDocumentHighlightKind(entry.kind)
-					};
-				});
-			});
-	}
-}
 
 // --- definition ------
 

src/html/htmlMode.ts

@@ -27,7 +27,7 @@ export function setupMode1(defaults: LanguageServiceDefaults): void {
 
 	languages.registerDocumentHighlightProvider(
 		languageId,
-		new languageFeatures.DocumentHighlightAdapter(worker)
+		new languageFeatures.HTMLDocumentHighlightAdapter(worker)
 	);
 	languages.registerLinkProvider(languageId, new languageFeatures.DocumentLinkAdapter(worker));
 	languages.registerFoldingRangeProvider(
@@ -90,7 +90,7 @@ export function setupMode(defaults: LanguageServiceDefaults): IDisposable {
 			providers.push(
 				languages.registerDocumentHighlightProvider(
 					languageId,
-					new languageFeatures.DocumentHighlightAdapter(worker)
+					new languageFeatures.HTMLDocumentHighlightAdapter(worker)
 				)
 			);
 		}

src/html/languageFeatures.ts

@@ -19,7 +19,8 @@ import {
 	toTextEdit,
 	fromRange,
 	CompletionAdapter,
-	HoverAdapter
+	HoverAdapter,
+	DocumentHighlightAdapter
 } from '../common/lspLanguageFeatures';
 
 export interface WorkerAccessor {
@@ -36,45 +37,7 @@ export class HTMLHoverAdapter extends HoverAdapter<HTMLWorker> {}
 
 // --- document highlights ------
 
-function toDocumentHighlightKind(
+export class HTMLDocumentHighlightAdapter extends DocumentHighlightAdapter<HTMLWorker> {}
-	kind: lsTypes.DocumentHighlightKind
-): languages.DocumentHighlightKind {
-	switch (kind) {
-		case lsTypes.DocumentHighlightKind.Read:
-			return languages.DocumentHighlightKind.Read;
-		case lsTypes.DocumentHighlightKind.Write:
-			return languages.DocumentHighlightKind.Write;
-		case lsTypes.DocumentHighlightKind.Text:
-			return languages.DocumentHighlightKind.Text;
-	}
-	return languages.DocumentHighlightKind.Text;
-}
-
-export class DocumentHighlightAdapter implements languages.DocumentHighlightProvider {
-	constructor(private _worker: WorkerAccessor) {}
-
-	public provideDocumentHighlights(
-		model: editor.IReadOnlyModel,
-		position: Position,
-		token: CancellationToken
-	): Promise<languages.DocumentHighlight[]> {
-		const resource = model.uri;
-
-		return this._worker(resource)
-			.then((worker) => worker.findDocumentHighlights(resource.toString(), fromPosition(position)))
-			.then((entries) => {
-				if (!entries) {
-					return;
-				}
-				return entries.map((entry) => {
-					return <languages.DocumentHighlight>{
-						range: toRange(entry.range),
-						kind: toDocumentHighlightKind(entry.kind)
-					};
-				});
-			});
-	}
-}
 
 function toWorkspaceEdit(edit: lsTypes.WorkspaceEdit): languages.WorkspaceEdit {
 	if (!edit || !edit.changes) {